diff --git a/.env.development b/.env.development
index debe1a8..f2fee42 100644
--- a/.env.development
+++ b/.env.development
@@ -4,7 +4,7 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
-VITE_APP_API_BASEURL = http://127.0.0.1:5909
+VITE_APP_API_BASEURL = http://192.168.8.101:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710

diff --git a/.env.development b/.env.development
index debe1a8..f2fee42 100644
--- a/.env.development
+++ b/.env.development
@@ -4,7 +4,7 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
-VITE_APP_API_BASEURL = http://127.0.0.1:5909
+VITE_APP_API_BASEURL = http://192.168.8.101:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..313fcf7 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://192.168.8.101:5909"
 }

diff --git a/.env.development b/.env.development
index debe1a8..f2fee42 100644
--- a/.env.development
+++ b/.env.development
@@ -4,7 +4,7 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
-VITE_APP_API_BASEURL = http://127.0.0.1:5909
+VITE_APP_API_BASEURL = http://192.168.8.101:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..313fcf7 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://192.168.8.101:5909"
 }
diff --git a/src/api/eqpt/device/model.ts b/src/api/eqpt/device/model.ts
new file mode 100644
index 0000000..a8fa0f1
--- /dev/null
+++ b/src/api/eqpt/device/model.ts
@@ -0,0 +1,61 @@
+/**
+ * 设备型号规格管理相关
+ */
+import request from '@/api/index'
+
+// 列表
+export function getModelList(params: any) {
+  return request({
+    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}`,
+    method: 'post',
+    data: params,
+  })
+}
+// 列表-不分页
+export function getModelAllList(params: any) {
+  return request({
+    url: '/equipment/model/list',
+    method: 'post',
+    data: params,
+  })
+}
+// 设备名称列表/equipment/model/listEquipmentName
+export function getDeviceNameList(params: any) {
+  return request({
+    url: '/equipment/model/listEquipmentName',
+    method: 'get',
+    params,
+  })
+}
+// 导出
+export function exportModelList(data: any) {
+  return request({
+    url: '/equipment/model/export',
+    method: 'post',
+    data,
+  })
+}
+// 新建或编辑
+export function handlerFunApi(type: string, data: any) {
+  if (type === 'create') {
+    return request({
+      url: '/equipment/model/add',
+      method: 'post',
+      data,
+    })
+  }
+  else if (type === 'update') {
+    return request({
+      url: '/equipment/model/update',
+      method: 'post',
+      data,
+    })
+  }
+}
+// 删除
+export function deleteModel(data: any) {
+  return request({
+    url: `/equipment/model/delete?id=${data.id}`,
+    method: 'post',
+  })
+}

diff --git a/.env.development b/.env.development
index debe1a8..f2fee42 100644
--- a/.env.development
+++ b/.env.development
@@ -4,7 +4,7 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
-VITE_APP_API_BASEURL = http://127.0.0.1:5909
+VITE_APP_API_BASEURL = http://192.168.8.101:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..313fcf7 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://192.168.8.101:5909"
 }
diff --git a/src/api/eqpt/device/model.ts b/src/api/eqpt/device/model.ts
new file mode 100644
index 0000000..a8fa0f1
--- /dev/null
+++ b/src/api/eqpt/device/model.ts
@@ -0,0 +1,61 @@
+/**
+ * 设备型号规格管理相关
+ */
+import request from '@/api/index'
+
+// 列表
+export function getModelList(params: any) {
+  return request({
+    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}`,
+    method: 'post',
+    data: params,
+  })
+}
+// 列表-不分页
+export function getModelAllList(params: any) {
+  return request({
+    url: '/equipment/model/list',
+    method: 'post',
+    data: params,
+  })
+}
+// 设备名称列表/equipment/model/listEquipmentName
+export function getDeviceNameList(params: any) {
+  return request({
+    url: '/equipment/model/listEquipmentName',
+    method: 'get',
+    params,
+  })
+}
+// 导出
+export function exportModelList(data: any) {
+  return request({
+    url: '/equipment/model/export',
+    method: 'post',
+    data,
+  })
+}
+// 新建或编辑
+export function handlerFunApi(type: string, data: any) {
+  if (type === 'create') {
+    return request({
+      url: '/equipment/model/add',
+      method: 'post',
+      data,
+    })
+  }
+  else if (type === 'update') {
+    return request({
+      url: '/equipment/model/update',
+      method: 'post',
+      data,
+    })
+  }
+}
+// 删除
+export function deleteModel(data: any) {
+  return request({
+    url: `/equipment/model/delete?id=${data.id}`,
+    method: 'post',
+  })
+}
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 14ec12e..64e6f48 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -55,11 +55,12 @@
   // listQuery.value.offset = 1
   // }
   fetchApproval({ processId: listQuery.value.processId }).then((response) => {
+    console.log(response.data, 'response')
     response.data.forEach((item: Array<IList>, index: number) => {
       item.forEach((i: any) => {
         list.value.push({
           cindex: index,
-          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[i.cindex].nodeNumber + 1,
+          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[index - 1].nodeNumber + 1,
           assigneeName: i.assigneeName, // 姓名
           approvalStatus: i.approvalStatus, // 审批类型
           finishTime: i.finishTime ? i.finishTime : '-', // 完成时间

diff --git a/.env.development b/.env.development
index debe1a8..f2fee42 100644
--- a/.env.development
+++ b/.env.development
@@ -4,7 +4,7 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
-VITE_APP_API_BASEURL = http://127.0.0.1:5909
+VITE_APP_API_BASEURL = http://192.168.8.101:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..313fcf7 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://192.168.8.101:5909"
 }
diff --git a/src/api/eqpt/device/model.ts b/src/api/eqpt/device/model.ts
new file mode 100644
index 0000000..a8fa0f1
--- /dev/null
+++ b/src/api/eqpt/device/model.ts
@@ -0,0 +1,61 @@
+/**
+ * 设备型号规格管理相关
+ */
+import request from '@/api/index'
+
+// 列表
+export function getModelList(params: any) {
+  return request({
+    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}`,
+    method: 'post',
+    data: params,
+  })
+}
+// 列表-不分页
+export function getModelAllList(params: any) {
+  return request({
+    url: '/equipment/model/list',
+    method: 'post',
+    data: params,
+  })
+}
+// 设备名称列表/equipment/model/listEquipmentName
+export function getDeviceNameList(params: any) {
+  return request({
+    url: '/equipment/model/listEquipmentName',
+    method: 'get',
+    params,
+  })
+}
+// 导出
+export function exportModelList(data: any) {
+  return request({
+    url: '/equipment/model/export',
+    method: 'post',
+    data,
+  })
+}
+// 新建或编辑
+export function handlerFunApi(type: string, data: any) {
+  if (type === 'create') {
+    return request({
+      url: '/equipment/model/add',
+      method: 'post',
+      data,
+    })
+  }
+  else if (type === 'update') {
+    return request({
+      url: '/equipment/model/update',
+      method: 'post',
+      data,
+    })
+  }
+}
+// 删除
+export function deleteModel(data: any) {
+  return request({
+    url: `/equipment/model/delete?id=${data.id}`,
+    method: 'post',
+  })
+}
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 14ec12e..64e6f48 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -55,11 +55,12 @@
   // listQuery.value.offset = 1
   // }
   fetchApproval({ processId: listQuery.value.processId }).then((response) => {
+    console.log(response.data, 'response')
     response.data.forEach((item: Array<IList>, index: number) => {
       item.forEach((i: any) => {
         list.value.push({
           cindex: index,
-          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[i.cindex].nodeNumber + 1,
+          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[index - 1].nodeNumber + 1,
           assigneeName: i.assigneeName, // 姓名
           approvalStatus: i.approvalStatus, // 审批类型
           finishTime: i.finishTime ? i.finishTime : '-', // 完成时间
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index f08078d..aefbd8b 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -90,8 +90,16 @@
     type: String,
     default: 'default',
   }, // 表格大小，默认，small,mini等，与el-table条件相同
+  // 排序
+  sort: {
+    type: Object,
+    default() {
+      return {
+      }
+    },
+  },
 })
-const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'multiSelect'])
+const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'multiSelect', 'sortChange'])
 // -------定义数据--------------
 interface columnsCheckInfo {
   text: string
@@ -139,6 +147,10 @@
 function selectionChange(selection: []) {
   emit('selectionChange', selection)
 }
+// 点击排序
+function sortClick(column: any, prop: any, order: any) {
+  emit('sortChange', { column, prop, order })
+}
 // 点击行
 function rowClick(row: object, column?: any, event?: any) {
   emit('rowClick', row)
@@ -196,11 +208,13 @@
       border
       stripe
       :size="size"
+      :default-sort="props.sort"
       :show-header="showHeader"
       style="width: 100%;"
       @selection-change="handleSelectionChange"
       @select="selectClick"
       @row-click="rowClick"
+      @sort-change="sortClick"
     >
       <slot name="preColumns" />
 
@@ -210,7 +224,7 @@
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
+      <el-table-column v-for="column of columns" :key="column.value" :sortable="column.sortable" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
           <span v-else :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ column.filter(scope.row) }}</span>

diff --git a/.env.development b/.env.development
index debe1a8..f2fee42 100644
--- a/.env.development
+++ b/.env.development
@@ -4,7 +4,7 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
-VITE_APP_API_BASEURL = http://127.0.0.1:5909
+VITE_APP_API_BASEURL = http://192.168.8.101:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..313fcf7 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://192.168.8.101:5909"
 }
diff --git a/src/api/eqpt/device/model.ts b/src/api/eqpt/device/model.ts
new file mode 100644
index 0000000..a8fa0f1
--- /dev/null
+++ b/src/api/eqpt/device/model.ts
@@ -0,0 +1,61 @@
+/**
+ * 设备型号规格管理相关
+ */
+import request from '@/api/index'
+
+// 列表
+export function getModelList(params: any) {
+  return request({
+    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}`,
+    method: 'post',
+    data: params,
+  })
+}
+// 列表-不分页
+export function getModelAllList(params: any) {
+  return request({
+    url: '/equipment/model/list',
+    method: 'post',
+    data: params,
+  })
+}
+// 设备名称列表/equipment/model/listEquipmentName
+export function getDeviceNameList(params: any) {
+  return request({
+    url: '/equipment/model/listEquipmentName',
+    method: 'get',
+    params,
+  })
+}
+// 导出
+export function exportModelList(data: any) {
+  return request({
+    url: '/equipment/model/export',
+    method: 'post',
+    data,
+  })
+}
+// 新建或编辑
+export function handlerFunApi(type: string, data: any) {
+  if (type === 'create') {
+    return request({
+      url: '/equipment/model/add',
+      method: 'post',
+      data,
+    })
+  }
+  else if (type === 'update') {
+    return request({
+      url: '/equipment/model/update',
+      method: 'post',
+      data,
+    })
+  }
+}
+// 删除
+export function deleteModel(data: any) {
+  return request({
+    url: `/equipment/model/delete?id=${data.id}`,
+    method: 'post',
+  })
+}
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 14ec12e..64e6f48 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -55,11 +55,12 @@
   // listQuery.value.offset = 1
   // }
   fetchApproval({ processId: listQuery.value.processId }).then((response) => {
+    console.log(response.data, 'response')
     response.data.forEach((item: Array<IList>, index: number) => {
       item.forEach((i: any) => {
         list.value.push({
           cindex: index,
-          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[i.cindex].nodeNumber + 1,
+          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[index - 1].nodeNumber + 1,
           assigneeName: i.assigneeName, // 姓名
           approvalStatus: i.approvalStatus, // 审批类型
           finishTime: i.finishTime ? i.finishTime : '-', // 完成时间
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index f08078d..aefbd8b 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -90,8 +90,16 @@
     type: String,
     default: 'default',
   }, // 表格大小，默认，small,mini等，与el-table条件相同
+  // 排序
+  sort: {
+    type: Object,
+    default() {
+      return {
+      }
+    },
+  },
 })
-const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'multiSelect'])
+const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'multiSelect', 'sortChange'])
 // -------定义数据--------------
 interface columnsCheckInfo {
   text: string
@@ -139,6 +147,10 @@
 function selectionChange(selection: []) {
   emit('selectionChange', selection)
 }
+// 点击排序
+function sortClick(column: any, prop: any, order: any) {
+  emit('sortChange', { column, prop, order })
+}
 // 点击行
 function rowClick(row: object, column?: any, event?: any) {
   emit('rowClick', row)
@@ -196,11 +208,13 @@
       border
       stripe
       :size="size"
+      :default-sort="props.sort"
       :show-header="showHeader"
       style="width: 100%;"
       @selection-change="handleSelectionChange"
       @select="selectClick"
       @row-click="rowClick"
+      @sort-change="sortClick"
     >
       <slot name="preColumns" />
 
@@ -210,7 +224,7 @@
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
+      <el-table-column v-for="column of columns" :key="column.value" :sortable="column.sortable" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
           <span v-else :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ column.filter(scope.row) }}</span>
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index 5cf6445..2cd73de 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -320,7 +320,7 @@
   {
     path: '/meteringdevice',
     component: Layout,
-    redirect: '/devicelist',
+    redirect: '/modellist',
     name: 'MeteringDevice',
     meta: {
       title: '设备台账',
@@ -329,6 +329,43 @@
     },
     children: [
       {
+        path: '/modellist',
+        component: Layout,
+        redirect: '/dmodel',
+        name: 'DeviceModel',
+        meta: {
+          title: '设备规格型号管理',
+          icon: 'ep:key',
+          auth: '/tested/device/model',
+        },
+        children: [
+          {
+            path: '/dmodel',
+            name: 'DeviceModelPage',
+            component: () => import('@/views/tested/device/model/index.vue'),
+            meta: {
+              title: '设备规格型号管理',
+              auth: '/tested/device/model',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/modellist',
+            },
+          },
+          {
+            path: '/dmodel/:type',
+            name: 'ModelEdit',
+            component: () => import('@/views/tested/device/model/components/edit.vue'),
+            meta: {
+              title: '设备规格型号管理',
+              auth: '/tested/device/model',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/modellist',
+            },
+          },
+        ],
+      },
+      {
         path: '/devicelist',
         component: Layout,
         redirect: '/dinfo',

diff --git a/.env.development b/.env.development
index debe1a8..f2fee42 100644
--- a/.env.development
+++ b/.env.development
@@ -4,7 +4,7 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
-VITE_APP_API_BASEURL = http://127.0.0.1:5909
+VITE_APP_API_BASEURL = http://192.168.8.101:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..313fcf7 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://192.168.8.101:5909"
 }
diff --git a/src/api/eqpt/device/model.ts b/src/api/eqpt/device/model.ts
new file mode 100644
index 0000000..a8fa0f1
--- /dev/null
+++ b/src/api/eqpt/device/model.ts
@@ -0,0 +1,61 @@
+/**
+ * 设备型号规格管理相关
+ */
+import request from '@/api/index'
+
+// 列表
+export function getModelList(params: any) {
+  return request({
+    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}`,
+    method: 'post',
+    data: params,
+  })
+}
+// 列表-不分页
+export function getModelAllList(params: any) {
+  return request({
+    url: '/equipment/model/list',
+    method: 'post',
+    data: params,
+  })
+}
+// 设备名称列表/equipment/model/listEquipmentName
+export function getDeviceNameList(params: any) {
+  return request({
+    url: '/equipment/model/listEquipmentName',
+    method: 'get',
+    params,
+  })
+}
+// 导出
+export function exportModelList(data: any) {
+  return request({
+    url: '/equipment/model/export',
+    method: 'post',
+    data,
+  })
+}
+// 新建或编辑
+export function handlerFunApi(type: string, data: any) {
+  if (type === 'create') {
+    return request({
+      url: '/equipment/model/add',
+      method: 'post',
+      data,
+    })
+  }
+  else if (type === 'update') {
+    return request({
+      url: '/equipment/model/update',
+      method: 'post',
+      data,
+    })
+  }
+}
+// 删除
+export function deleteModel(data: any) {
+  return request({
+    url: `/equipment/model/delete?id=${data.id}`,
+    method: 'post',
+  })
+}
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 14ec12e..64e6f48 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -55,11 +55,12 @@
   // listQuery.value.offset = 1
   // }
   fetchApproval({ processId: listQuery.value.processId }).then((response) => {
+    console.log(response.data, 'response')
     response.data.forEach((item: Array<IList>, index: number) => {
       item.forEach((i: any) => {
         list.value.push({
           cindex: index,
-          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[i.cindex].nodeNumber + 1,
+          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[index - 1].nodeNumber + 1,
           assigneeName: i.assigneeName, // 姓名
           approvalStatus: i.approvalStatus, // 审批类型
           finishTime: i.finishTime ? i.finishTime : '-', // 完成时间
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index f08078d..aefbd8b 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -90,8 +90,16 @@
     type: String,
     default: 'default',
   }, // 表格大小，默认，small,mini等，与el-table条件相同
+  // 排序
+  sort: {
+    type: Object,
+    default() {
+      return {
+      }
+    },
+  },
 })
-const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'multiSelect'])
+const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'multiSelect', 'sortChange'])
 // -------定义数据--------------
 interface columnsCheckInfo {
   text: string
@@ -139,6 +147,10 @@
 function selectionChange(selection: []) {
   emit('selectionChange', selection)
 }
+// 点击排序
+function sortClick(column: any, prop: any, order: any) {
+  emit('sortChange', { column, prop, order })
+}
 // 点击行
 function rowClick(row: object, column?: any, event?: any) {
   emit('rowClick', row)
@@ -196,11 +208,13 @@
       border
       stripe
       :size="size"
+      :default-sort="props.sort"
       :show-header="showHeader"
       style="width: 100%;"
       @selection-change="handleSelectionChange"
       @select="selectClick"
       @row-click="rowClick"
+      @sort-change="sortClick"
     >
       <slot name="preColumns" />
 
@@ -210,7 +224,7 @@
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
+      <el-table-column v-for="column of columns" :key="column.value" :sortable="column.sortable" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
           <span v-else :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ column.filter(scope.row) }}</span>
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index 5cf6445..2cd73de 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -320,7 +320,7 @@
   {
     path: '/meteringdevice',
     component: Layout,
-    redirect: '/devicelist',
+    redirect: '/modellist',
     name: 'MeteringDevice',
     meta: {
       title: '设备台账',
@@ -329,6 +329,43 @@
     },
     children: [
       {
+        path: '/modellist',
+        component: Layout,
+        redirect: '/dmodel',
+        name: 'DeviceModel',
+        meta: {
+          title: '设备规格型号管理',
+          icon: 'ep:key',
+          auth: '/tested/device/model',
+        },
+        children: [
+          {
+            path: '/dmodel',
+            name: 'DeviceModelPage',
+            component: () => import('@/views/tested/device/model/index.vue'),
+            meta: {
+              title: '设备规格型号管理',
+              auth: '/tested/device/model',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/modellist',
+            },
+          },
+          {
+            path: '/dmodel/:type',
+            name: 'ModelEdit',
+            component: () => import('@/views/tested/device/model/components/edit.vue'),
+            meta: {
+              title: '设备规格型号管理',
+              auth: '/tested/device/model',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/modellist',
+            },
+          },
+        ],
+      },
+      {
         path: '/devicelist',
         component: Layout,
         redirect: '/dinfo',
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 6c9383f..879a207 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -158,7 +158,11 @@
 }
 // 批量删除
 const batchDeleteLabel = () => {
-  if (selectList.value.length) {
+  if (selectList.value.filter(item => item.usageStatusName === '已使用').length) {
+    ElMessage.warning('请选择未使用的标签')
+    return
+  }
+  if (selectList.value.filter(item => item.usageStatusName !== '已使用').length) {
     ElMessageBox.confirm(
       '确认删除所选数据吗？',
       '提示',

diff --git a/.env.development b/.env.development
index debe1a8..f2fee42 100644
--- a/.env.development
+++ b/.env.development
@@ -4,7 +4,7 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
-VITE_APP_API_BASEURL = http://127.0.0.1:5909
+VITE_APP_API_BASEURL = http://192.168.8.101:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..313fcf7 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://192.168.8.101:5909"
 }
diff --git a/src/api/eqpt/device/model.ts b/src/api/eqpt/device/model.ts
new file mode 100644
index 0000000..a8fa0f1
--- /dev/null
+++ b/src/api/eqpt/device/model.ts
@@ -0,0 +1,61 @@
+/**
+ * 设备型号规格管理相关
+ */
+import request from '@/api/index'
+
+// 列表
+export function getModelList(params: any) {
+  return request({
+    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}`,
+    method: 'post',
+    data: params,
+  })
+}
+// 列表-不分页
+export function getModelAllList(params: any) {
+  return request({
+    url: '/equipment/model/list',
+    method: 'post',
+    data: params,
+  })
+}
+// 设备名称列表/equipment/model/listEquipmentName
+export function getDeviceNameList(params: any) {
+  return request({
+    url: '/equipment/model/listEquipmentName',
+    method: 'get',
+    params,
+  })
+}
+// 导出
+export function exportModelList(data: any) {
+  return request({
+    url: '/equipment/model/export',
+    method: 'post',
+    data,
+  })
+}
+// 新建或编辑
+export function handlerFunApi(type: string, data: any) {
+  if (type === 'create') {
+    return request({
+      url: '/equipment/model/add',
+      method: 'post',
+      data,
+    })
+  }
+  else if (type === 'update') {
+    return request({
+      url: '/equipment/model/update',
+      method: 'post',
+      data,
+    })
+  }
+}
+// 删除
+export function deleteModel(data: any) {
+  return request({
+    url: `/equipment/model/delete?id=${data.id}`,
+    method: 'post',
+  })
+}
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 14ec12e..64e6f48 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -55,11 +55,12 @@
   // listQuery.value.offset = 1
   // }
   fetchApproval({ processId: listQuery.value.processId }).then((response) => {
+    console.log(response.data, 'response')
     response.data.forEach((item: Array<IList>, index: number) => {
       item.forEach((i: any) => {
         list.value.push({
           cindex: index,
-          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[i.cindex].nodeNumber + 1,
+          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[index - 1].nodeNumber + 1,
           assigneeName: i.assigneeName, // 姓名
           approvalStatus: i.approvalStatus, // 审批类型
           finishTime: i.finishTime ? i.finishTime : '-', // 完成时间
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index f08078d..aefbd8b 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -90,8 +90,16 @@
     type: String,
     default: 'default',
   }, // 表格大小，默认，small,mini等，与el-table条件相同
+  // 排序
+  sort: {
+    type: Object,
+    default() {
+      return {
+      }
+    },
+  },
 })
-const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'multiSelect'])
+const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'multiSelect', 'sortChange'])
 // -------定义数据--------------
 interface columnsCheckInfo {
   text: string
@@ -139,6 +147,10 @@
 function selectionChange(selection: []) {
   emit('selectionChange', selection)
 }
+// 点击排序
+function sortClick(column: any, prop: any, order: any) {
+  emit('sortChange', { column, prop, order })
+}
 // 点击行
 function rowClick(row: object, column?: any, event?: any) {
   emit('rowClick', row)
@@ -196,11 +208,13 @@
       border
       stripe
       :size="size"
+      :default-sort="props.sort"
       :show-header="showHeader"
       style="width: 100%;"
       @selection-change="handleSelectionChange"
       @select="selectClick"
       @row-click="rowClick"
+      @sort-change="sortClick"
     >
       <slot name="preColumns" />
 
@@ -210,7 +224,7 @@
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
+      <el-table-column v-for="column of columns" :key="column.value" :sortable="column.sortable" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
           <span v-else :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ column.filter(scope.row) }}</span>
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index 5cf6445..2cd73de 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -320,7 +320,7 @@
   {
     path: '/meteringdevice',
     component: Layout,
-    redirect: '/devicelist',
+    redirect: '/modellist',
     name: 'MeteringDevice',
     meta: {
       title: '设备台账',
@@ -329,6 +329,43 @@
     },
     children: [
       {
+        path: '/modellist',
+        component: Layout,
+        redirect: '/dmodel',
+        name: 'DeviceModel',
+        meta: {
+          title: '设备规格型号管理',
+          icon: 'ep:key',
+          auth: '/tested/device/model',
+        },
+        children: [
+          {
+            path: '/dmodel',
+            name: 'DeviceModelPage',
+            component: () => import('@/views/tested/device/model/index.vue'),
+            meta: {
+              title: '设备规格型号管理',
+              auth: '/tested/device/model',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/modellist',
+            },
+          },
+          {
+            path: '/dmodel/:type',
+            name: 'ModelEdit',
+            component: () => import('@/views/tested/device/model/components/edit.vue'),
+            meta: {
+              title: '设备规格型号管理',
+              auth: '/tested/device/model',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/modellist',
+            },
+          },
+        ],
+      },
+      {
         path: '/devicelist',
         component: Layout,
         redirect: '/dinfo',
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 6c9383f..879a207 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -158,7 +158,11 @@
 }
 // 批量删除
 const batchDeleteLabel = () => {
-  if (selectList.value.length) {
+  if (selectList.value.filter(item => item.usageStatusName === '已使用').length) {
+    ElMessage.warning('请选择未使用的标签')
+    return
+  }
+  if (selectList.value.filter(item => item.usageStatusName !== '已使用').length) {
     ElMessageBox.confirm(
       '确认删除所选数据吗？',
       '提示',
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index 60d55d6..ba91cbf 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -25,7 +25,7 @@
   offset: 1,
 }) // 查询参数
 watch(() => noticeTime.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     searchQuery.noticeStartTime = `${newVal[0]} 00:00:00`
     searchQuery.noticeEndTime = `${newVal[1]} 23:59:59`
   }

diff --git a/.env.development b/.env.development
index debe1a8..f2fee42 100644
--- a/.env.development
+++ b/.env.development
@@ -4,7 +4,7 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
-VITE_APP_API_BASEURL = http://127.0.0.1:5909
+VITE_APP_API_BASEURL = http://192.168.8.101:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..313fcf7 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://192.168.8.101:5909"
 }
diff --git a/src/api/eqpt/device/model.ts b/src/api/eqpt/device/model.ts
new file mode 100644
index 0000000..a8fa0f1
--- /dev/null
+++ b/src/api/eqpt/device/model.ts
@@ -0,0 +1,61 @@
+/**
+ * 设备型号规格管理相关
+ */
+import request from '@/api/index'
+
+// 列表
+export function getModelList(params: any) {
+  return request({
+    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}`,
+    method: 'post',
+    data: params,
+  })
+}
+// 列表-不分页
+export function getModelAllList(params: any) {
+  return request({
+    url: '/equipment/model/list',
+    method: 'post',
+    data: params,
+  })
+}
+// 设备名称列表/equipment/model/listEquipmentName
+export function getDeviceNameList(params: any) {
+  return request({
+    url: '/equipment/model/listEquipmentName',
+    method: 'get',
+    params,
+  })
+}
+// 导出
+export function exportModelList(data: any) {
+  return request({
+    url: '/equipment/model/export',
+    method: 'post',
+    data,
+  })
+}
+// 新建或编辑
+export function handlerFunApi(type: string, data: any) {
+  if (type === 'create') {
+    return request({
+      url: '/equipment/model/add',
+      method: 'post',
+      data,
+    })
+  }
+  else if (type === 'update') {
+    return request({
+      url: '/equipment/model/update',
+      method: 'post',
+      data,
+    })
+  }
+}
+// 删除
+export function deleteModel(data: any) {
+  return request({
+    url: `/equipment/model/delete?id=${data.id}`,
+    method: 'post',
+  })
+}
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 14ec12e..64e6f48 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -55,11 +55,12 @@
   // listQuery.value.offset = 1
   // }
   fetchApproval({ processId: listQuery.value.processId }).then((response) => {
+    console.log(response.data, 'response')
     response.data.forEach((item: Array<IList>, index: number) => {
       item.forEach((i: any) => {
         list.value.push({
           cindex: index,
-          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[i.cindex].nodeNumber + 1,
+          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[index - 1].nodeNumber + 1,
           assigneeName: i.assigneeName, // 姓名
           approvalStatus: i.approvalStatus, // 审批类型
           finishTime: i.finishTime ? i.finishTime : '-', // 完成时间
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index f08078d..aefbd8b 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -90,8 +90,16 @@
     type: String,
     default: 'default',
   }, // 表格大小，默认，small,mini等，与el-table条件相同
+  // 排序
+  sort: {
+    type: Object,
+    default() {
+      return {
+      }
+    },
+  },
 })
-const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'multiSelect'])
+const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'multiSelect', 'sortChange'])
 // -------定义数据--------------
 interface columnsCheckInfo {
   text: string
@@ -139,6 +147,10 @@
 function selectionChange(selection: []) {
   emit('selectionChange', selection)
 }
+// 点击排序
+function sortClick(column: any, prop: any, order: any) {
+  emit('sortChange', { column, prop, order })
+}
 // 点击行
 function rowClick(row: object, column?: any, event?: any) {
   emit('rowClick', row)
@@ -196,11 +208,13 @@
       border
       stripe
       :size="size"
+      :default-sort="props.sort"
       :show-header="showHeader"
       style="width: 100%;"
       @selection-change="handleSelectionChange"
       @select="selectClick"
       @row-click="rowClick"
+      @sort-change="sortClick"
     >
       <slot name="preColumns" />
 
@@ -210,7 +224,7 @@
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
+      <el-table-column v-for="column of columns" :key="column.value" :sortable="column.sortable" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
           <span v-else :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ column.filter(scope.row) }}</span>
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index 5cf6445..2cd73de 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -320,7 +320,7 @@
   {
     path: '/meteringdevice',
     component: Layout,
-    redirect: '/devicelist',
+    redirect: '/modellist',
     name: 'MeteringDevice',
     meta: {
       title: '设备台账',
@@ -329,6 +329,43 @@
     },
     children: [
       {
+        path: '/modellist',
+        component: Layout,
+        redirect: '/dmodel',
+        name: 'DeviceModel',
+        meta: {
+          title: '设备规格型号管理',
+          icon: 'ep:key',
+          auth: '/tested/device/model',
+        },
+        children: [
+          {
+            path: '/dmodel',
+            name: 'DeviceModelPage',
+            component: () => import('@/views/tested/device/model/index.vue'),
+            meta: {
+              title: '设备规格型号管理',
+              auth: '/tested/device/model',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/modellist',
+            },
+          },
+          {
+            path: '/dmodel/:type',
+            name: 'ModelEdit',
+            component: () => import('@/views/tested/device/model/components/edit.vue'),
+            meta: {
+              title: '设备规格型号管理',
+              auth: '/tested/device/model',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/modellist',
+            },
+          },
+        ],
+      },
+      {
         path: '/devicelist',
         component: Layout,
         redirect: '/dinfo',
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 6c9383f..879a207 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -158,7 +158,11 @@
 }
 // 批量删除
 const batchDeleteLabel = () => {
-  if (selectList.value.length) {
+  if (selectList.value.filter(item => item.usageStatusName === '已使用').length) {
+    ElMessage.warning('请选择未使用的标签')
+    return
+  }
+  if (selectList.value.filter(item => item.usageStatusName !== '已使用').length) {
     ElMessageBox.confirm(
       '确认删除所选数据吗？',
       '提示',
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index 60d55d6..ba91cbf 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -25,7 +25,7 @@
   offset: 1,
 }) // 查询参数
 watch(() => noticeTime.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     searchQuery.noticeStartTime = `${newVal[0]} 00:00:00`
     searchQuery.noticeEndTime = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/system/signature/autograph.vue b/src/views/system/signature/autograph.vue
index e5a32c8..9c1d0ca 100644
--- a/src/views/system/signature/autograph.vue
+++ b/src/views/system/signature/autograph.vue
@@ -23,7 +23,7 @@
   ids: [],
 }) // 查询参数
 watch(() => createTime.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     searchQuery.createStartTime = `${newVal[0]} 00:00:00`
     searchQuery.createEndTime = `${newVal[1]} 23:59:59`
   }

diff --git a/.env.development b/.env.development
index debe1a8..f2fee42 100644
--- a/.env.development
+++ b/.env.development
@@ -4,7 +4,7 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
-VITE_APP_API_BASEURL = http://127.0.0.1:5909
+VITE_APP_API_BASEURL = http://192.168.8.101:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..313fcf7 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://192.168.8.101:5909"
 }
diff --git a/src/api/eqpt/device/model.ts b/src/api/eqpt/device/model.ts
new file mode 100644
index 0000000..a8fa0f1
--- /dev/null
+++ b/src/api/eqpt/device/model.ts
@@ -0,0 +1,61 @@
+/**
+ * 设备型号规格管理相关
+ */
+import request from '@/api/index'
+
+// 列表
+export function getModelList(params: any) {
+  return request({
+    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}`,
+    method: 'post',
+    data: params,
+  })
+}
+// 列表-不分页
+export function getModelAllList(params: any) {
+  return request({
+    url: '/equipment/model/list',
+    method: 'post',
+    data: params,
+  })
+}
+// 设备名称列表/equipment/model/listEquipmentName
+export function getDeviceNameList(params: any) {
+  return request({
+    url: '/equipment/model/listEquipmentName',
+    method: 'get',
+    params,
+  })
+}
+// 导出
+export function exportModelList(data: any) {
+  return request({
+    url: '/equipment/model/export',
+    method: 'post',
+    data,
+  })
+}
+// 新建或编辑
+export function handlerFunApi(type: string, data: any) {
+  if (type === 'create') {
+    return request({
+      url: '/equipment/model/add',
+      method: 'post',
+      data,
+    })
+  }
+  else if (type === 'update') {
+    return request({
+      url: '/equipment/model/update',
+      method: 'post',
+      data,
+    })
+  }
+}
+// 删除
+export function deleteModel(data: any) {
+  return request({
+    url: `/equipment/model/delete?id=${data.id}`,
+    method: 'post',
+  })
+}
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 14ec12e..64e6f48 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -55,11 +55,12 @@
   // listQuery.value.offset = 1
   // }
   fetchApproval({ processId: listQuery.value.processId }).then((response) => {
+    console.log(response.data, 'response')
     response.data.forEach((item: Array<IList>, index: number) => {
       item.forEach((i: any) => {
         list.value.push({
           cindex: index,
-          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[i.cindex].nodeNumber + 1,
+          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[index - 1].nodeNumber + 1,
           assigneeName: i.assigneeName, // 姓名
           approvalStatus: i.approvalStatus, // 审批类型
           finishTime: i.finishTime ? i.finishTime : '-', // 完成时间
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index f08078d..aefbd8b 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -90,8 +90,16 @@
     type: String,
     default: 'default',
   }, // 表格大小，默认，small,mini等，与el-table条件相同
+  // 排序
+  sort: {
+    type: Object,
+    default() {
+      return {
+      }
+    },
+  },
 })
-const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'multiSelect'])
+const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'multiSelect', 'sortChange'])
 // -------定义数据--------------
 interface columnsCheckInfo {
   text: string
@@ -139,6 +147,10 @@
 function selectionChange(selection: []) {
   emit('selectionChange', selection)
 }
+// 点击排序
+function sortClick(column: any, prop: any, order: any) {
+  emit('sortChange', { column, prop, order })
+}
 // 点击行
 function rowClick(row: object, column?: any, event?: any) {
   emit('rowClick', row)
@@ -196,11 +208,13 @@
       border
       stripe
       :size="size"
+      :default-sort="props.sort"
       :show-header="showHeader"
       style="width: 100%;"
       @selection-change="handleSelectionChange"
       @select="selectClick"
       @row-click="rowClick"
+      @sort-change="sortClick"
     >
       <slot name="preColumns" />
 
@@ -210,7 +224,7 @@
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
+      <el-table-column v-for="column of columns" :key="column.value" :sortable="column.sortable" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
           <span v-else :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ column.filter(scope.row) }}</span>
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index 5cf6445..2cd73de 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -320,7 +320,7 @@
   {
     path: '/meteringdevice',
     component: Layout,
-    redirect: '/devicelist',
+    redirect: '/modellist',
     name: 'MeteringDevice',
     meta: {
       title: '设备台账',
@@ -329,6 +329,43 @@
     },
     children: [
       {
+        path: '/modellist',
+        component: Layout,
+        redirect: '/dmodel',
+        name: 'DeviceModel',
+        meta: {
+          title: '设备规格型号管理',
+          icon: 'ep:key',
+          auth: '/tested/device/model',
+        },
+        children: [
+          {
+            path: '/dmodel',
+            name: 'DeviceModelPage',
+            component: () => import('@/views/tested/device/model/index.vue'),
+            meta: {
+              title: '设备规格型号管理',
+              auth: '/tested/device/model',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/modellist',
+            },
+          },
+          {
+            path: '/dmodel/:type',
+            name: 'ModelEdit',
+            component: () => import('@/views/tested/device/model/components/edit.vue'),
+            meta: {
+              title: '设备规格型号管理',
+              auth: '/tested/device/model',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/modellist',
+            },
+          },
+        ],
+      },
+      {
         path: '/devicelist',
         component: Layout,
         redirect: '/dinfo',
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 6c9383f..879a207 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -158,7 +158,11 @@
 }
 // 批量删除
 const batchDeleteLabel = () => {
-  if (selectList.value.length) {
+  if (selectList.value.filter(item => item.usageStatusName === '已使用').length) {
+    ElMessage.warning('请选择未使用的标签')
+    return
+  }
+  if (selectList.value.filter(item => item.usageStatusName !== '已使用').length) {
     ElMessageBox.confirm(
       '确认删除所选数据吗？',
       '提示',
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index 60d55d6..ba91cbf 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -25,7 +25,7 @@
   offset: 1,
 }) // 查询参数
 watch(() => noticeTime.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     searchQuery.noticeStartTime = `${newVal[0]} 00:00:00`
     searchQuery.noticeEndTime = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/system/signature/autograph.vue b/src/views/system/signature/autograph.vue
index e5a32c8..9c1d0ca 100644
--- a/src/views/system/signature/autograph.vue
+++ b/src/views/system/signature/autograph.vue
@@ -23,7 +23,7 @@
   ids: [],
 }) // 查询参数
 watch(() => createTime.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     searchQuery.createStartTime = `${newVal[0]} 00:00:00`
     searchQuery.createEndTime = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 5f57089..b557683 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -16,7 +16,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }

diff --git a/.env.development b/.env.development
index debe1a8..f2fee42 100644
--- a/.env.development
+++ b/.env.development
@@ -4,7 +4,7 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
-VITE_APP_API_BASEURL = http://127.0.0.1:5909
+VITE_APP_API_BASEURL = http://192.168.8.101:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..313fcf7 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://192.168.8.101:5909"
 }
diff --git a/src/api/eqpt/device/model.ts b/src/api/eqpt/device/model.ts
new file mode 100644
index 0000000..a8fa0f1
--- /dev/null
+++ b/src/api/eqpt/device/model.ts
@@ -0,0 +1,61 @@
+/**
+ * 设备型号规格管理相关
+ */
+import request from '@/api/index'
+
+// 列表
+export function getModelList(params: any) {
+  return request({
+    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}`,
+    method: 'post',
+    data: params,
+  })
+}
+// 列表-不分页
+export function getModelAllList(params: any) {
+  return request({
+    url: '/equipment/model/list',
+    method: 'post',
+    data: params,
+  })
+}
+// 设备名称列表/equipment/model/listEquipmentName
+export function getDeviceNameList(params: any) {
+  return request({
+    url: '/equipment/model/listEquipmentName',
+    method: 'get',
+    params,
+  })
+}
+// 导出
+export function exportModelList(data: any) {
+  return request({
+    url: '/equipment/model/export',
+    method: 'post',
+    data,
+  })
+}
+// 新建或编辑
+export function handlerFunApi(type: string, data: any) {
+  if (type === 'create') {
+    return request({
+      url: '/equipment/model/add',
+      method: 'post',
+      data,
+    })
+  }
+  else if (type === 'update') {
+    return request({
+      url: '/equipment/model/update',
+      method: 'post',
+      data,
+    })
+  }
+}
+// 删除
+export function deleteModel(data: any) {
+  return request({
+    url: `/equipment/model/delete?id=${data.id}`,
+    method: 'post',
+  })
+}
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 14ec12e..64e6f48 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -55,11 +55,12 @@
   // listQuery.value.offset = 1
   // }
   fetchApproval({ processId: listQuery.value.processId }).then((response) => {
+    console.log(response.data, 'response')
     response.data.forEach((item: Array<IList>, index: number) => {
       item.forEach((i: any) => {
         list.value.push({
           cindex: index,
-          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[i.cindex].nodeNumber + 1,
+          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[index - 1].nodeNumber + 1,
           assigneeName: i.assigneeName, // 姓名
           approvalStatus: i.approvalStatus, // 审批类型
           finishTime: i.finishTime ? i.finishTime : '-', // 完成时间
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index f08078d..aefbd8b 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -90,8 +90,16 @@
     type: String,
     default: 'default',
   }, // 表格大小，默认，small,mini等，与el-table条件相同
+  // 排序
+  sort: {
+    type: Object,
+    default() {
+      return {
+      }
+    },
+  },
 })
-const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'multiSelect'])
+const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'multiSelect', 'sortChange'])
 // -------定义数据--------------
 interface columnsCheckInfo {
   text: string
@@ -139,6 +147,10 @@
 function selectionChange(selection: []) {
   emit('selectionChange', selection)
 }
+// 点击排序
+function sortClick(column: any, prop: any, order: any) {
+  emit('sortChange', { column, prop, order })
+}
 // 点击行
 function rowClick(row: object, column?: any, event?: any) {
   emit('rowClick', row)
@@ -196,11 +208,13 @@
       border
       stripe
       :size="size"
+      :default-sort="props.sort"
       :show-header="showHeader"
       style="width: 100%;"
       @selection-change="handleSelectionChange"
       @select="selectClick"
       @row-click="rowClick"
+      @sort-change="sortClick"
     >
       <slot name="preColumns" />
 
@@ -210,7 +224,7 @@
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
+      <el-table-column v-for="column of columns" :key="column.value" :sortable="column.sortable" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
           <span v-else :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ column.filter(scope.row) }}</span>
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index 5cf6445..2cd73de 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -320,7 +320,7 @@
   {
     path: '/meteringdevice',
     component: Layout,
-    redirect: '/devicelist',
+    redirect: '/modellist',
     name: 'MeteringDevice',
     meta: {
       title: '设备台账',
@@ -329,6 +329,43 @@
     },
     children: [
       {
+        path: '/modellist',
+        component: Layout,
+        redirect: '/dmodel',
+        name: 'DeviceModel',
+        meta: {
+          title: '设备规格型号管理',
+          icon: 'ep:key',
+          auth: '/tested/device/model',
+        },
+        children: [
+          {
+            path: '/dmodel',
+            name: 'DeviceModelPage',
+            component: () => import('@/views/tested/device/model/index.vue'),
+            meta: {
+              title: '设备规格型号管理',
+              auth: '/tested/device/model',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/modellist',
+            },
+          },
+          {
+            path: '/dmodel/:type',
+            name: 'ModelEdit',
+            component: () => import('@/views/tested/device/model/components/edit.vue'),
+            meta: {
+              title: '设备规格型号管理',
+              auth: '/tested/device/model',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/modellist',
+            },
+          },
+        ],
+      },
+      {
         path: '/devicelist',
         component: Layout,
         redirect: '/dinfo',
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 6c9383f..879a207 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -158,7 +158,11 @@
 }
 // 批量删除
 const batchDeleteLabel = () => {
-  if (selectList.value.length) {
+  if (selectList.value.filter(item => item.usageStatusName === '已使用').length) {
+    ElMessage.warning('请选择未使用的标签')
+    return
+  }
+  if (selectList.value.filter(item => item.usageStatusName !== '已使用').length) {
     ElMessageBox.confirm(
       '确认删除所选数据吗？',
       '提示',
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index 60d55d6..ba91cbf 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -25,7 +25,7 @@
   offset: 1,
 }) // 查询参数
 watch(() => noticeTime.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     searchQuery.noticeStartTime = `${newVal[0]} 00:00:00`
     searchQuery.noticeEndTime = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/system/signature/autograph.vue b/src/views/system/signature/autograph.vue
index e5a32c8..9c1d0ca 100644
--- a/src/views/system/signature/autograph.vue
+++ b/src/views/system/signature/autograph.vue
@@ -23,7 +23,7 @@
   ids: [],
 }) // 查询参数
 watch(() => createTime.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     searchQuery.createStartTime = `${newVal[0]} 00:00:00`
     searchQuery.createEndTime = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 5f57089..b557683 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -16,7 +16,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index 8f31905..e140eaa 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.applicantTimeStart = `${newVal[0]} 00:00:00`
     listQuery.applicantTimeEnd = `${newVal[1]} 23:59:59`
   }

diff --git a/.env.development b/.env.development
index debe1a8..f2fee42 100644
--- a/.env.development
+++ b/.env.development
@@ -4,7 +4,7 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
-VITE_APP_API_BASEURL = http://127.0.0.1:5909
+VITE_APP_API_BASEURL = http://192.168.8.101:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..313fcf7 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://192.168.8.101:5909"
 }
diff --git a/src/api/eqpt/device/model.ts b/src/api/eqpt/device/model.ts
new file mode 100644
index 0000000..a8fa0f1
--- /dev/null
+++ b/src/api/eqpt/device/model.ts
@@ -0,0 +1,61 @@
+/**
+ * 设备型号规格管理相关
+ */
+import request from '@/api/index'
+
+// 列表
+export function getModelList(params: any) {
+  return request({
+    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}`,
+    method: 'post',
+    data: params,
+  })
+}
+// 列表-不分页
+export function getModelAllList(params: any) {
+  return request({
+    url: '/equipment/model/list',
+    method: 'post',
+    data: params,
+  })
+}
+// 设备名称列表/equipment/model/listEquipmentName
+export function getDeviceNameList(params: any) {
+  return request({
+    url: '/equipment/model/listEquipmentName',
+    method: 'get',
+    params,
+  })
+}
+// 导出
+export function exportModelList(data: any) {
+  return request({
+    url: '/equipment/model/export',
+    method: 'post',
+    data,
+  })
+}
+// 新建或编辑
+export function handlerFunApi(type: string, data: any) {
+  if (type === 'create') {
+    return request({
+      url: '/equipment/model/add',
+      method: 'post',
+      data,
+    })
+  }
+  else if (type === 'update') {
+    return request({
+      url: '/equipment/model/update',
+      method: 'post',
+      data,
+    })
+  }
+}
+// 删除
+export function deleteModel(data: any) {
+  return request({
+    url: `/equipment/model/delete?id=${data.id}`,
+    method: 'post',
+  })
+}
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 14ec12e..64e6f48 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -55,11 +55,12 @@
   // listQuery.value.offset = 1
   // }
   fetchApproval({ processId: listQuery.value.processId }).then((response) => {
+    console.log(response.data, 'response')
     response.data.forEach((item: Array<IList>, index: number) => {
       item.forEach((i: any) => {
         list.value.push({
           cindex: index,
-          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[i.cindex].nodeNumber + 1,
+          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[index - 1].nodeNumber + 1,
           assigneeName: i.assigneeName, // 姓名
           approvalStatus: i.approvalStatus, // 审批类型
           finishTime: i.finishTime ? i.finishTime : '-', // 完成时间
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index f08078d..aefbd8b 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -90,8 +90,16 @@
     type: String,
     default: 'default',
   }, // 表格大小，默认，small,mini等，与el-table条件相同
+  // 排序
+  sort: {
+    type: Object,
+    default() {
+      return {
+      }
+    },
+  },
 })
-const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'multiSelect'])
+const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'multiSelect', 'sortChange'])
 // -------定义数据--------------
 interface columnsCheckInfo {
   text: string
@@ -139,6 +147,10 @@
 function selectionChange(selection: []) {
   emit('selectionChange', selection)
 }
+// 点击排序
+function sortClick(column: any, prop: any, order: any) {
+  emit('sortChange', { column, prop, order })
+}
 // 点击行
 function rowClick(row: object, column?: any, event?: any) {
   emit('rowClick', row)
@@ -196,11 +208,13 @@
       border
       stripe
       :size="size"
+      :default-sort="props.sort"
       :show-header="showHeader"
       style="width: 100%;"
       @selection-change="handleSelectionChange"
       @select="selectClick"
       @row-click="rowClick"
+      @sort-change="sortClick"
     >
       <slot name="preColumns" />
 
@@ -210,7 +224,7 @@
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
+      <el-table-column v-for="column of columns" :key="column.value" :sortable="column.sortable" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
           <span v-else :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ column.filter(scope.row) }}</span>
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index 5cf6445..2cd73de 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -320,7 +320,7 @@
   {
     path: '/meteringdevice',
     component: Layout,
-    redirect: '/devicelist',
+    redirect: '/modellist',
     name: 'MeteringDevice',
     meta: {
       title: '设备台账',
@@ -329,6 +329,43 @@
     },
     children: [
       {
+        path: '/modellist',
+        component: Layout,
+        redirect: '/dmodel',
+        name: 'DeviceModel',
+        meta: {
+          title: '设备规格型号管理',
+          icon: 'ep:key',
+          auth: '/tested/device/model',
+        },
+        children: [
+          {
+            path: '/dmodel',
+            name: 'DeviceModelPage',
+            component: () => import('@/views/tested/device/model/index.vue'),
+            meta: {
+              title: '设备规格型号管理',
+              auth: '/tested/device/model',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/modellist',
+            },
+          },
+          {
+            path: '/dmodel/:type',
+            name: 'ModelEdit',
+            component: () => import('@/views/tested/device/model/components/edit.vue'),
+            meta: {
+              title: '设备规格型号管理',
+              auth: '/tested/device/model',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/modellist',
+            },
+          },
+        ],
+      },
+      {
         path: '/devicelist',
         component: Layout,
         redirect: '/dinfo',
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 6c9383f..879a207 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -158,7 +158,11 @@
 }
 // 批量删除
 const batchDeleteLabel = () => {
-  if (selectList.value.length) {
+  if (selectList.value.filter(item => item.usageStatusName === '已使用').length) {
+    ElMessage.warning('请选择未使用的标签')
+    return
+  }
+  if (selectList.value.filter(item => item.usageStatusName !== '已使用').length) {
     ElMessageBox.confirm(
       '确认删除所选数据吗？',
       '提示',
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index 60d55d6..ba91cbf 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -25,7 +25,7 @@
   offset: 1,
 }) // 查询参数
 watch(() => noticeTime.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     searchQuery.noticeStartTime = `${newVal[0]} 00:00:00`
     searchQuery.noticeEndTime = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/system/signature/autograph.vue b/src/views/system/signature/autograph.vue
index e5a32c8..9c1d0ca 100644
--- a/src/views/system/signature/autograph.vue
+++ b/src/views/system/signature/autograph.vue
@@ -23,7 +23,7 @@
   ids: [],
 }) // 查询参数
 watch(() => createTime.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     searchQuery.createStartTime = `${newVal[0]} 00:00:00`
     searchQuery.createEndTime = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 5f57089..b557683 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -16,7 +16,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index 8f31905..e140eaa 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.applicantTimeStart = `${newVal[0]} 00:00:00`
     listQuery.applicantTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/opinion/index.vue b/src/views/tested/MeasurementBusiness/opinion/index.vue
index 6c7e13c..c6683c0 100644
--- a/src/views/tested/MeasurementBusiness/opinion/index.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }

diff --git a/.env.development b/.env.development
index debe1a8..f2fee42 100644
--- a/.env.development
+++ b/.env.development
@@ -4,7 +4,7 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
-VITE_APP_API_BASEURL = http://127.0.0.1:5909
+VITE_APP_API_BASEURL = http://192.168.8.101:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..313fcf7 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://192.168.8.101:5909"
 }
diff --git a/src/api/eqpt/device/model.ts b/src/api/eqpt/device/model.ts
new file mode 100644
index 0000000..a8fa0f1
--- /dev/null
+++ b/src/api/eqpt/device/model.ts
@@ -0,0 +1,61 @@
+/**
+ * 设备型号规格管理相关
+ */
+import request from '@/api/index'
+
+// 列表
+export function getModelList(params: any) {
+  return request({
+    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}`,
+    method: 'post',
+    data: params,
+  })
+}
+// 列表-不分页
+export function getModelAllList(params: any) {
+  return request({
+    url: '/equipment/model/list',
+    method: 'post',
+    data: params,
+  })
+}
+// 设备名称列表/equipment/model/listEquipmentName
+export function getDeviceNameList(params: any) {
+  return request({
+    url: '/equipment/model/listEquipmentName',
+    method: 'get',
+    params,
+  })
+}
+// 导出
+export function exportModelList(data: any) {
+  return request({
+    url: '/equipment/model/export',
+    method: 'post',
+    data,
+  })
+}
+// 新建或编辑
+export function handlerFunApi(type: string, data: any) {
+  if (type === 'create') {
+    return request({
+      url: '/equipment/model/add',
+      method: 'post',
+      data,
+    })
+  }
+  else if (type === 'update') {
+    return request({
+      url: '/equipment/model/update',
+      method: 'post',
+      data,
+    })
+  }
+}
+// 删除
+export function deleteModel(data: any) {
+  return request({
+    url: `/equipment/model/delete?id=${data.id}`,
+    method: 'post',
+  })
+}
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 14ec12e..64e6f48 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -55,11 +55,12 @@
   // listQuery.value.offset = 1
   // }
   fetchApproval({ processId: listQuery.value.processId }).then((response) => {
+    console.log(response.data, 'response')
     response.data.forEach((item: Array<IList>, index: number) => {
       item.forEach((i: any) => {
         list.value.push({
           cindex: index,
-          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[i.cindex].nodeNumber + 1,
+          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[index - 1].nodeNumber + 1,
           assigneeName: i.assigneeName, // 姓名
           approvalStatus: i.approvalStatus, // 审批类型
           finishTime: i.finishTime ? i.finishTime : '-', // 完成时间
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index f08078d..aefbd8b 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -90,8 +90,16 @@
     type: String,
     default: 'default',
   }, // 表格大小，默认，small,mini等，与el-table条件相同
+  // 排序
+  sort: {
+    type: Object,
+    default() {
+      return {
+      }
+    },
+  },
 })
-const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'multiSelect'])
+const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'multiSelect', 'sortChange'])
 // -------定义数据--------------
 interface columnsCheckInfo {
   text: string
@@ -139,6 +147,10 @@
 function selectionChange(selection: []) {
   emit('selectionChange', selection)
 }
+// 点击排序
+function sortClick(column: any, prop: any, order: any) {
+  emit('sortChange', { column, prop, order })
+}
 // 点击行
 function rowClick(row: object, column?: any, event?: any) {
   emit('rowClick', row)
@@ -196,11 +208,13 @@
       border
       stripe
       :size="size"
+      :default-sort="props.sort"
       :show-header="showHeader"
       style="width: 100%;"
       @selection-change="handleSelectionChange"
       @select="selectClick"
       @row-click="rowClick"
+      @sort-change="sortClick"
     >
       <slot name="preColumns" />
 
@@ -210,7 +224,7 @@
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
+      <el-table-column v-for="column of columns" :key="column.value" :sortable="column.sortable" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
           <span v-else :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ column.filter(scope.row) }}</span>
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index 5cf6445..2cd73de 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -320,7 +320,7 @@
   {
     path: '/meteringdevice',
     component: Layout,
-    redirect: '/devicelist',
+    redirect: '/modellist',
     name: 'MeteringDevice',
     meta: {
       title: '设备台账',
@@ -329,6 +329,43 @@
     },
     children: [
       {
+        path: '/modellist',
+        component: Layout,
+        redirect: '/dmodel',
+        name: 'DeviceModel',
+        meta: {
+          title: '设备规格型号管理',
+          icon: 'ep:key',
+          auth: '/tested/device/model',
+        },
+        children: [
+          {
+            path: '/dmodel',
+            name: 'DeviceModelPage',
+            component: () => import('@/views/tested/device/model/index.vue'),
+            meta: {
+              title: '设备规格型号管理',
+              auth: '/tested/device/model',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/modellist',
+            },
+          },
+          {
+            path: '/dmodel/:type',
+            name: 'ModelEdit',
+            component: () => import('@/views/tested/device/model/components/edit.vue'),
+            meta: {
+              title: '设备规格型号管理',
+              auth: '/tested/device/model',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/modellist',
+            },
+          },
+        ],
+      },
+      {
         path: '/devicelist',
         component: Layout,
         redirect: '/dinfo',
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 6c9383f..879a207 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -158,7 +158,11 @@
 }
 // 批量删除
 const batchDeleteLabel = () => {
-  if (selectList.value.length) {
+  if (selectList.value.filter(item => item.usageStatusName === '已使用').length) {
+    ElMessage.warning('请选择未使用的标签')
+    return
+  }
+  if (selectList.value.filter(item => item.usageStatusName !== '已使用').length) {
     ElMessageBox.confirm(
       '确认删除所选数据吗？',
       '提示',
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index 60d55d6..ba91cbf 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -25,7 +25,7 @@
   offset: 1,
 }) // 查询参数
 watch(() => noticeTime.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     searchQuery.noticeStartTime = `${newVal[0]} 00:00:00`
     searchQuery.noticeEndTime = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/system/signature/autograph.vue b/src/views/system/signature/autograph.vue
index e5a32c8..9c1d0ca 100644
--- a/src/views/system/signature/autograph.vue
+++ b/src/views/system/signature/autograph.vue
@@ -23,7 +23,7 @@
   ids: [],
 }) // 查询参数
 watch(() => createTime.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     searchQuery.createStartTime = `${newVal[0]} 00:00:00`
     searchQuery.createEndTime = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 5f57089..b557683 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -16,7 +16,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index 8f31905..e140eaa 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.applicantTimeStart = `${newVal[0]} 00:00:00`
     listQuery.applicantTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/opinion/index.vue b/src/views/tested/MeasurementBusiness/opinion/index.vue
index 6c7e13c..c6683c0 100644
--- a/src/views/tested/MeasurementBusiness/opinion/index.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue
index b15f27b..e204a69 100644
--- a/src/views/tested/MeasurementBusiness/review/index.vue
+++ b/src/views/tested/MeasurementBusiness/review/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
@@ -76,21 +76,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
-  // getListPage(listQuery).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   listLoading.value = false
-  // })
-  list.value = [{
-    formNo: '12345',
-    formName: '评审表1',
-    labCode: '海口实验室',
-    groupCode: '组别1',
-    signStatusName: '同意',
-    createUserName: '张三',
-    createTime: '2023-09-05',
-  }]
-  listLoading.value = false
+  getListPage(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  })
 }
 fetchData()
 // 查询数据

diff --git a/.env.development b/.env.development
index debe1a8..f2fee42 100644
--- a/.env.development
+++ b/.env.development
@@ -4,7 +4,7 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
-VITE_APP_API_BASEURL = http://127.0.0.1:5909
+VITE_APP_API_BASEURL = http://192.168.8.101:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..313fcf7 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://192.168.8.101:5909"
 }
diff --git a/src/api/eqpt/device/model.ts b/src/api/eqpt/device/model.ts
new file mode 100644
index 0000000..a8fa0f1
--- /dev/null
+++ b/src/api/eqpt/device/model.ts
@@ -0,0 +1,61 @@
+/**
+ * 设备型号规格管理相关
+ */
+import request from '@/api/index'
+
+// 列表
+export function getModelList(params: any) {
+  return request({
+    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}`,
+    method: 'post',
+    data: params,
+  })
+}
+// 列表-不分页
+export function getModelAllList(params: any) {
+  return request({
+    url: '/equipment/model/list',
+    method: 'post',
+    data: params,
+  })
+}
+// 设备名称列表/equipment/model/listEquipmentName
+export function getDeviceNameList(params: any) {
+  return request({
+    url: '/equipment/model/listEquipmentName',
+    method: 'get',
+    params,
+  })
+}
+// 导出
+export function exportModelList(data: any) {
+  return request({
+    url: '/equipment/model/export',
+    method: 'post',
+    data,
+  })
+}
+// 新建或编辑
+export function handlerFunApi(type: string, data: any) {
+  if (type === 'create') {
+    return request({
+      url: '/equipment/model/add',
+      method: 'post',
+      data,
+    })
+  }
+  else if (type === 'update') {
+    return request({
+      url: '/equipment/model/update',
+      method: 'post',
+      data,
+    })
+  }
+}
+// 删除
+export function deleteModel(data: any) {
+  return request({
+    url: `/equipment/model/delete?id=${data.id}`,
+    method: 'post',
+  })
+}
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 14ec12e..64e6f48 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -55,11 +55,12 @@
   // listQuery.value.offset = 1
   // }
   fetchApproval({ processId: listQuery.value.processId }).then((response) => {
+    console.log(response.data, 'response')
     response.data.forEach((item: Array<IList>, index: number) => {
       item.forEach((i: any) => {
         list.value.push({
           cindex: index,
-          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[i.cindex].nodeNumber + 1,
+          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[index - 1].nodeNumber + 1,
           assigneeName: i.assigneeName, // 姓名
           approvalStatus: i.approvalStatus, // 审批类型
           finishTime: i.finishTime ? i.finishTime : '-', // 完成时间
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index f08078d..aefbd8b 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -90,8 +90,16 @@
     type: String,
     default: 'default',
   }, // 表格大小，默认，small,mini等，与el-table条件相同
+  // 排序
+  sort: {
+    type: Object,
+    default() {
+      return {
+      }
+    },
+  },
 })
-const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'multiSelect'])
+const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'multiSelect', 'sortChange'])
 // -------定义数据--------------
 interface columnsCheckInfo {
   text: string
@@ -139,6 +147,10 @@
 function selectionChange(selection: []) {
   emit('selectionChange', selection)
 }
+// 点击排序
+function sortClick(column: any, prop: any, order: any) {
+  emit('sortChange', { column, prop, order })
+}
 // 点击行
 function rowClick(row: object, column?: any, event?: any) {
   emit('rowClick', row)
@@ -196,11 +208,13 @@
       border
       stripe
       :size="size"
+      :default-sort="props.sort"
       :show-header="showHeader"
       style="width: 100%;"
       @selection-change="handleSelectionChange"
       @select="selectClick"
       @row-click="rowClick"
+      @sort-change="sortClick"
     >
       <slot name="preColumns" />
 
@@ -210,7 +224,7 @@
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
+      <el-table-column v-for="column of columns" :key="column.value" :sortable="column.sortable" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
           <span v-else :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ column.filter(scope.row) }}</span>
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index 5cf6445..2cd73de 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -320,7 +320,7 @@
   {
     path: '/meteringdevice',
     component: Layout,
-    redirect: '/devicelist',
+    redirect: '/modellist',
     name: 'MeteringDevice',
     meta: {
       title: '设备台账',
@@ -329,6 +329,43 @@
     },
     children: [
       {
+        path: '/modellist',
+        component: Layout,
+        redirect: '/dmodel',
+        name: 'DeviceModel',
+        meta: {
+          title: '设备规格型号管理',
+          icon: 'ep:key',
+          auth: '/tested/device/model',
+        },
+        children: [
+          {
+            path: '/dmodel',
+            name: 'DeviceModelPage',
+            component: () => import('@/views/tested/device/model/index.vue'),
+            meta: {
+              title: '设备规格型号管理',
+              auth: '/tested/device/model',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/modellist',
+            },
+          },
+          {
+            path: '/dmodel/:type',
+            name: 'ModelEdit',
+            component: () => import('@/views/tested/device/model/components/edit.vue'),
+            meta: {
+              title: '设备规格型号管理',
+              auth: '/tested/device/model',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/modellist',
+            },
+          },
+        ],
+      },
+      {
         path: '/devicelist',
         component: Layout,
         redirect: '/dinfo',
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 6c9383f..879a207 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -158,7 +158,11 @@
 }
 // 批量删除
 const batchDeleteLabel = () => {
-  if (selectList.value.length) {
+  if (selectList.value.filter(item => item.usageStatusName === '已使用').length) {
+    ElMessage.warning('请选择未使用的标签')
+    return
+  }
+  if (selectList.value.filter(item => item.usageStatusName !== '已使用').length) {
     ElMessageBox.confirm(
       '确认删除所选数据吗？',
       '提示',
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index 60d55d6..ba91cbf 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -25,7 +25,7 @@
   offset: 1,
 }) // 查询参数
 watch(() => noticeTime.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     searchQuery.noticeStartTime = `${newVal[0]} 00:00:00`
     searchQuery.noticeEndTime = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/system/signature/autograph.vue b/src/views/system/signature/autograph.vue
index e5a32c8..9c1d0ca 100644
--- a/src/views/system/signature/autograph.vue
+++ b/src/views/system/signature/autograph.vue
@@ -23,7 +23,7 @@
   ids: [],
 }) // 查询参数
 watch(() => createTime.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     searchQuery.createStartTime = `${newVal[0]} 00:00:00`
     searchQuery.createEndTime = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 5f57089..b557683 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -16,7 +16,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index 8f31905..e140eaa 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.applicantTimeStart = `${newVal[0]} 00:00:00`
     listQuery.applicantTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/opinion/index.vue b/src/views/tested/MeasurementBusiness/opinion/index.vue
index 6c7e13c..c6683c0 100644
--- a/src/views/tested/MeasurementBusiness/opinion/index.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue
index b15f27b..e204a69 100644
--- a/src/views/tested/MeasurementBusiness/review/index.vue
+++ b/src/views/tested/MeasurementBusiness/review/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
@@ -76,21 +76,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
-  // getListPage(listQuery).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   listLoading.value = false
-  // })
-  list.value = [{
-    formNo: '12345',
-    formName: '评审表1',
-    labCode: '海口实验室',
-    groupCode: '组别1',
-    signStatusName: '同意',
-    createUserName: '张三',
-    createTime: '2023-09-05',
-  }]
-  listLoading.value = false
+  getListPage(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  })
 }
 fetchData()
 // 查询数据
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 0e2fd1c..217365a 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -14,7 +14,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.sendTimeStart = `${newVal[0]} 00:00:00`
     listQuery.sendTimeEnd = `${newVal[1]} 23:59:59`
   }

diff --git a/.env.development b/.env.development
index debe1a8..f2fee42 100644
--- a/.env.development
+++ b/.env.development
@@ -4,7 +4,7 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
-VITE_APP_API_BASEURL = http://127.0.0.1:5909
+VITE_APP_API_BASEURL = http://192.168.8.101:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..313fcf7 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://192.168.8.101:5909"
 }
diff --git a/src/api/eqpt/device/model.ts b/src/api/eqpt/device/model.ts
new file mode 100644
index 0000000..a8fa0f1
--- /dev/null
+++ b/src/api/eqpt/device/model.ts
@@ -0,0 +1,61 @@
+/**
+ * 设备型号规格管理相关
+ */
+import request from '@/api/index'
+
+// 列表
+export function getModelList(params: any) {
+  return request({
+    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}`,
+    method: 'post',
+    data: params,
+  })
+}
+// 列表-不分页
+export function getModelAllList(params: any) {
+  return request({
+    url: '/equipment/model/list',
+    method: 'post',
+    data: params,
+  })
+}
+// 设备名称列表/equipment/model/listEquipmentName
+export function getDeviceNameList(params: any) {
+  return request({
+    url: '/equipment/model/listEquipmentName',
+    method: 'get',
+    params,
+  })
+}
+// 导出
+export function exportModelList(data: any) {
+  return request({
+    url: '/equipment/model/export',
+    method: 'post',
+    data,
+  })
+}
+// 新建或编辑
+export function handlerFunApi(type: string, data: any) {
+  if (type === 'create') {
+    return request({
+      url: '/equipment/model/add',
+      method: 'post',
+      data,
+    })
+  }
+  else if (type === 'update') {
+    return request({
+      url: '/equipment/model/update',
+      method: 'post',
+      data,
+    })
+  }
+}
+// 删除
+export function deleteModel(data: any) {
+  return request({
+    url: `/equipment/model/delete?id=${data.id}`,
+    method: 'post',
+  })
+}
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 14ec12e..64e6f48 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -55,11 +55,12 @@
   // listQuery.value.offset = 1
   // }
   fetchApproval({ processId: listQuery.value.processId }).then((response) => {
+    console.log(response.data, 'response')
     response.data.forEach((item: Array<IList>, index: number) => {
       item.forEach((i: any) => {
         list.value.push({
           cindex: index,
-          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[i.cindex].nodeNumber + 1,
+          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[index - 1].nodeNumber + 1,
           assigneeName: i.assigneeName, // 姓名
           approvalStatus: i.approvalStatus, // 审批类型
           finishTime: i.finishTime ? i.finishTime : '-', // 完成时间
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index f08078d..aefbd8b 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -90,8 +90,16 @@
     type: String,
     default: 'default',
   }, // 表格大小，默认，small,mini等，与el-table条件相同
+  // 排序
+  sort: {
+    type: Object,
+    default() {
+      return {
+      }
+    },
+  },
 })
-const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'multiSelect'])
+const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'multiSelect', 'sortChange'])
 // -------定义数据--------------
 interface columnsCheckInfo {
   text: string
@@ -139,6 +147,10 @@
 function selectionChange(selection: []) {
   emit('selectionChange', selection)
 }
+// 点击排序
+function sortClick(column: any, prop: any, order: any) {
+  emit('sortChange', { column, prop, order })
+}
 // 点击行
 function rowClick(row: object, column?: any, event?: any) {
   emit('rowClick', row)
@@ -196,11 +208,13 @@
       border
       stripe
       :size="size"
+      :default-sort="props.sort"
       :show-header="showHeader"
       style="width: 100%;"
       @selection-change="handleSelectionChange"
       @select="selectClick"
       @row-click="rowClick"
+      @sort-change="sortClick"
     >
       <slot name="preColumns" />
 
@@ -210,7 +224,7 @@
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
+      <el-table-column v-for="column of columns" :key="column.value" :sortable="column.sortable" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
           <span v-else :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ column.filter(scope.row) }}</span>
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index 5cf6445..2cd73de 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -320,7 +320,7 @@
   {
     path: '/meteringdevice',
     component: Layout,
-    redirect: '/devicelist',
+    redirect: '/modellist',
     name: 'MeteringDevice',
     meta: {
       title: '设备台账',
@@ -329,6 +329,43 @@
     },
     children: [
       {
+        path: '/modellist',
+        component: Layout,
+        redirect: '/dmodel',
+        name: 'DeviceModel',
+        meta: {
+          title: '设备规格型号管理',
+          icon: 'ep:key',
+          auth: '/tested/device/model',
+        },
+        children: [
+          {
+            path: '/dmodel',
+            name: 'DeviceModelPage',
+            component: () => import('@/views/tested/device/model/index.vue'),
+            meta: {
+              title: '设备规格型号管理',
+              auth: '/tested/device/model',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/modellist',
+            },
+          },
+          {
+            path: '/dmodel/:type',
+            name: 'ModelEdit',
+            component: () => import('@/views/tested/device/model/components/edit.vue'),
+            meta: {
+              title: '设备规格型号管理',
+              auth: '/tested/device/model',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/modellist',
+            },
+          },
+        ],
+      },
+      {
         path: '/devicelist',
         component: Layout,
         redirect: '/dinfo',
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 6c9383f..879a207 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -158,7 +158,11 @@
 }
 // 批量删除
 const batchDeleteLabel = () => {
-  if (selectList.value.length) {
+  if (selectList.value.filter(item => item.usageStatusName === '已使用').length) {
+    ElMessage.warning('请选择未使用的标签')
+    return
+  }
+  if (selectList.value.filter(item => item.usageStatusName !== '已使用').length) {
     ElMessageBox.confirm(
       '确认删除所选数据吗？',
       '提示',
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index 60d55d6..ba91cbf 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -25,7 +25,7 @@
   offset: 1,
 }) // 查询参数
 watch(() => noticeTime.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     searchQuery.noticeStartTime = `${newVal[0]} 00:00:00`
     searchQuery.noticeEndTime = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/system/signature/autograph.vue b/src/views/system/signature/autograph.vue
index e5a32c8..9c1d0ca 100644
--- a/src/views/system/signature/autograph.vue
+++ b/src/views/system/signature/autograph.vue
@@ -23,7 +23,7 @@
   ids: [],
 }) // 查询参数
 watch(() => createTime.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     searchQuery.createStartTime = `${newVal[0]} 00:00:00`
     searchQuery.createEndTime = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 5f57089..b557683 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -16,7 +16,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index 8f31905..e140eaa 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.applicantTimeStart = `${newVal[0]} 00:00:00`
     listQuery.applicantTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/opinion/index.vue b/src/views/tested/MeasurementBusiness/opinion/index.vue
index 6c7e13c..c6683c0 100644
--- a/src/views/tested/MeasurementBusiness/opinion/index.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue
index b15f27b..e204a69 100644
--- a/src/views/tested/MeasurementBusiness/review/index.vue
+++ b/src/views/tested/MeasurementBusiness/review/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
@@ -76,21 +76,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
-  // getListPage(listQuery).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   listLoading.value = false
-  // })
-  list.value = [{
-    formNo: '12345',
-    formName: '评审表1',
-    labCode: '海口实验室',
-    groupCode: '组别1',
-    signStatusName: '同意',
-    createUserName: '张三',
-    createTime: '2023-09-05',
-  }]
-  listLoading.value = false
+  getListPage(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  })
 }
 fetchData()
 // 查询数据
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 0e2fd1c..217365a 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -14,7 +14,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.sendTimeStart = `${newVal[0]} 00:00:00`
     listQuery.sendTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index e117705..e2d0ea2 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -12,6 +12,7 @@
     required: true,
   },
 })
+const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
 const userStore = useUserStore()
 const listQuery = reactive({
@@ -20,8 +21,8 @@
   createTimeEnd: '',
   createTimeStart: '',
   notifyType: $props.notifyType, // 通知类型(负责人/部门，字典值)
-  notifyDept: userStore.deptId,
-  notifyUser: userStore.id,
+  notifyDept: $route.path.includes('curatorpage') ? '' : userStore.deptId,
+  notifyUser: $route.path.includes('curatorpage') ? userStore.id : '',
   offset: 1,
   limit: 20,
 })
@@ -30,7 +31,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }

diff --git a/.env.development b/.env.development
index debe1a8..f2fee42 100644
--- a/.env.development
+++ b/.env.development
@@ -4,7 +4,7 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
-VITE_APP_API_BASEURL = http://127.0.0.1:5909
+VITE_APP_API_BASEURL = http://192.168.8.101:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..313fcf7 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://192.168.8.101:5909"
 }
diff --git a/src/api/eqpt/device/model.ts b/src/api/eqpt/device/model.ts
new file mode 100644
index 0000000..a8fa0f1
--- /dev/null
+++ b/src/api/eqpt/device/model.ts
@@ -0,0 +1,61 @@
+/**
+ * 设备型号规格管理相关
+ */
+import request from '@/api/index'
+
+// 列表
+export function getModelList(params: any) {
+  return request({
+    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}`,
+    method: 'post',
+    data: params,
+  })
+}
+// 列表-不分页
+export function getModelAllList(params: any) {
+  return request({
+    url: '/equipment/model/list',
+    method: 'post',
+    data: params,
+  })
+}
+// 设备名称列表/equipment/model/listEquipmentName
+export function getDeviceNameList(params: any) {
+  return request({
+    url: '/equipment/model/listEquipmentName',
+    method: 'get',
+    params,
+  })
+}
+// 导出
+export function exportModelList(data: any) {
+  return request({
+    url: '/equipment/model/export',
+    method: 'post',
+    data,
+  })
+}
+// 新建或编辑
+export function handlerFunApi(type: string, data: any) {
+  if (type === 'create') {
+    return request({
+      url: '/equipment/model/add',
+      method: 'post',
+      data,
+    })
+  }
+  else if (type === 'update') {
+    return request({
+      url: '/equipment/model/update',
+      method: 'post',
+      data,
+    })
+  }
+}
+// 删除
+export function deleteModel(data: any) {
+  return request({
+    url: `/equipment/model/delete?id=${data.id}`,
+    method: 'post',
+  })
+}
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 14ec12e..64e6f48 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -55,11 +55,12 @@
   // listQuery.value.offset = 1
   // }
   fetchApproval({ processId: listQuery.value.processId }).then((response) => {
+    console.log(response.data, 'response')
     response.data.forEach((item: Array<IList>, index: number) => {
       item.forEach((i: any) => {
         list.value.push({
           cindex: index,
-          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[i.cindex].nodeNumber + 1,
+          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[index - 1].nodeNumber + 1,
           assigneeName: i.assigneeName, // 姓名
           approvalStatus: i.approvalStatus, // 审批类型
           finishTime: i.finishTime ? i.finishTime : '-', // 完成时间
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index f08078d..aefbd8b 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -90,8 +90,16 @@
     type: String,
     default: 'default',
   }, // 表格大小，默认，small,mini等，与el-table条件相同
+  // 排序
+  sort: {
+    type: Object,
+    default() {
+      return {
+      }
+    },
+  },
 })
-const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'multiSelect'])
+const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'multiSelect', 'sortChange'])
 // -------定义数据--------------
 interface columnsCheckInfo {
   text: string
@@ -139,6 +147,10 @@
 function selectionChange(selection: []) {
   emit('selectionChange', selection)
 }
+// 点击排序
+function sortClick(column: any, prop: any, order: any) {
+  emit('sortChange', { column, prop, order })
+}
 // 点击行
 function rowClick(row: object, column?: any, event?: any) {
   emit('rowClick', row)
@@ -196,11 +208,13 @@
       border
       stripe
       :size="size"
+      :default-sort="props.sort"
       :show-header="showHeader"
       style="width: 100%;"
       @selection-change="handleSelectionChange"
       @select="selectClick"
       @row-click="rowClick"
+      @sort-change="sortClick"
     >
       <slot name="preColumns" />
 
@@ -210,7 +224,7 @@
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
+      <el-table-column v-for="column of columns" :key="column.value" :sortable="column.sortable" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
           <span v-else :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ column.filter(scope.row) }}</span>
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index 5cf6445..2cd73de 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -320,7 +320,7 @@
   {
     path: '/meteringdevice',
     component: Layout,
-    redirect: '/devicelist',
+    redirect: '/modellist',
     name: 'MeteringDevice',
     meta: {
       title: '设备台账',
@@ -329,6 +329,43 @@
     },
     children: [
       {
+        path: '/modellist',
+        component: Layout,
+        redirect: '/dmodel',
+        name: 'DeviceModel',
+        meta: {
+          title: '设备规格型号管理',
+          icon: 'ep:key',
+          auth: '/tested/device/model',
+        },
+        children: [
+          {
+            path: '/dmodel',
+            name: 'DeviceModelPage',
+            component: () => import('@/views/tested/device/model/index.vue'),
+            meta: {
+              title: '设备规格型号管理',
+              auth: '/tested/device/model',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/modellist',
+            },
+          },
+          {
+            path: '/dmodel/:type',
+            name: 'ModelEdit',
+            component: () => import('@/views/tested/device/model/components/edit.vue'),
+            meta: {
+              title: '设备规格型号管理',
+              auth: '/tested/device/model',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/modellist',
+            },
+          },
+        ],
+      },
+      {
         path: '/devicelist',
         component: Layout,
         redirect: '/dinfo',
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 6c9383f..879a207 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -158,7 +158,11 @@
 }
 // 批量删除
 const batchDeleteLabel = () => {
-  if (selectList.value.length) {
+  if (selectList.value.filter(item => item.usageStatusName === '已使用').length) {
+    ElMessage.warning('请选择未使用的标签')
+    return
+  }
+  if (selectList.value.filter(item => item.usageStatusName !== '已使用').length) {
     ElMessageBox.confirm(
       '确认删除所选数据吗？',
       '提示',
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index 60d55d6..ba91cbf 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -25,7 +25,7 @@
   offset: 1,
 }) // 查询参数
 watch(() => noticeTime.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     searchQuery.noticeStartTime = `${newVal[0]} 00:00:00`
     searchQuery.noticeEndTime = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/system/signature/autograph.vue b/src/views/system/signature/autograph.vue
index e5a32c8..9c1d0ca 100644
--- a/src/views/system/signature/autograph.vue
+++ b/src/views/system/signature/autograph.vue
@@ -23,7 +23,7 @@
   ids: [],
 }) // 查询参数
 watch(() => createTime.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     searchQuery.createStartTime = `${newVal[0]} 00:00:00`
     searchQuery.createEndTime = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 5f57089..b557683 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -16,7 +16,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index 8f31905..e140eaa 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.applicantTimeStart = `${newVal[0]} 00:00:00`
     listQuery.applicantTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/opinion/index.vue b/src/views/tested/MeasurementBusiness/opinion/index.vue
index 6c7e13c..c6683c0 100644
--- a/src/views/tested/MeasurementBusiness/opinion/index.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue
index b15f27b..e204a69 100644
--- a/src/views/tested/MeasurementBusiness/review/index.vue
+++ b/src/views/tested/MeasurementBusiness/review/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
@@ -76,21 +76,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
-  // getListPage(listQuery).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   listLoading.value = false
-  // })
-  list.value = [{
-    formNo: '12345',
-    formName: '评审表1',
-    labCode: '海口实验室',
-    groupCode: '组别1',
-    signStatusName: '同意',
-    createUserName: '张三',
-    createTime: '2023-09-05',
-  }]
-  listLoading.value = false
+  getListPage(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  })
 }
 fetchData()
 // 查询数据
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 0e2fd1c..217365a 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -14,7 +14,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.sendTimeStart = `${newVal[0]} 00:00:00`
     listQuery.sendTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index e117705..e2d0ea2 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -12,6 +12,7 @@
     required: true,
   },
 })
+const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
 const userStore = useUserStore()
 const listQuery = reactive({
@@ -20,8 +21,8 @@
   createTimeEnd: '',
   createTimeStart: '',
   notifyType: $props.notifyType, // 通知类型(负责人/部门，字典值)
-  notifyDept: userStore.deptId,
-  notifyUser: userStore.id,
+  notifyDept: $route.path.includes('curatorpage') ? '' : userStore.deptId,
+  notifyUser: $route.path.includes('curatorpage') ? userStore.id : '',
   offset: 1,
   limit: 20,
 })
@@ -30,7 +31,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/dept/index.vue b/src/views/tested/MeasurementPlan/dept/index.vue
index aafe5e1..a25835f 100644
--- a/src/views/tested/MeasurementPlan/dept/index.vue
+++ b/src/views/tested/MeasurementPlan/dept/index.vue
@@ -5,5 +5,5 @@
 
 <template>
   <!-- notifyType 通知类型(负责人/部门，字典值) -->
-  <page notify-type="1" />
+  <page notify-type="2" />
 </template>

diff --git a/.env.development b/.env.development
index debe1a8..f2fee42 100644
--- a/.env.development
+++ b/.env.development
@@ -4,7 +4,7 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
-VITE_APP_API_BASEURL = http://127.0.0.1:5909
+VITE_APP_API_BASEURL = http://192.168.8.101:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..313fcf7 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://192.168.8.101:5909"
 }
diff --git a/src/api/eqpt/device/model.ts b/src/api/eqpt/device/model.ts
new file mode 100644
index 0000000..a8fa0f1
--- /dev/null
+++ b/src/api/eqpt/device/model.ts
@@ -0,0 +1,61 @@
+/**
+ * 设备型号规格管理相关
+ */
+import request from '@/api/index'
+
+// 列表
+export function getModelList(params: any) {
+  return request({
+    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}`,
+    method: 'post',
+    data: params,
+  })
+}
+// 列表-不分页
+export function getModelAllList(params: any) {
+  return request({
+    url: '/equipment/model/list',
+    method: 'post',
+    data: params,
+  })
+}
+// 设备名称列表/equipment/model/listEquipmentName
+export function getDeviceNameList(params: any) {
+  return request({
+    url: '/equipment/model/listEquipmentName',
+    method: 'get',
+    params,
+  })
+}
+// 导出
+export function exportModelList(data: any) {
+  return request({
+    url: '/equipment/model/export',
+    method: 'post',
+    data,
+  })
+}
+// 新建或编辑
+export function handlerFunApi(type: string, data: any) {
+  if (type === 'create') {
+    return request({
+      url: '/equipment/model/add',
+      method: 'post',
+      data,
+    })
+  }
+  else if (type === 'update') {
+    return request({
+      url: '/equipment/model/update',
+      method: 'post',
+      data,
+    })
+  }
+}
+// 删除
+export function deleteModel(data: any) {
+  return request({
+    url: `/equipment/model/delete?id=${data.id}`,
+    method: 'post',
+  })
+}
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 14ec12e..64e6f48 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -55,11 +55,12 @@
   // listQuery.value.offset = 1
   // }
   fetchApproval({ processId: listQuery.value.processId }).then((response) => {
+    console.log(response.data, 'response')
     response.data.forEach((item: Array<IList>, index: number) => {
       item.forEach((i: any) => {
         list.value.push({
           cindex: index,
-          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[i.cindex].nodeNumber + 1,
+          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[index - 1].nodeNumber + 1,
           assigneeName: i.assigneeName, // 姓名
           approvalStatus: i.approvalStatus, // 审批类型
           finishTime: i.finishTime ? i.finishTime : '-', // 完成时间
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index f08078d..aefbd8b 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -90,8 +90,16 @@
     type: String,
     default: 'default',
   }, // 表格大小，默认，small,mini等，与el-table条件相同
+  // 排序
+  sort: {
+    type: Object,
+    default() {
+      return {
+      }
+    },
+  },
 })
-const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'multiSelect'])
+const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'multiSelect', 'sortChange'])
 // -------定义数据--------------
 interface columnsCheckInfo {
   text: string
@@ -139,6 +147,10 @@
 function selectionChange(selection: []) {
   emit('selectionChange', selection)
 }
+// 点击排序
+function sortClick(column: any, prop: any, order: any) {
+  emit('sortChange', { column, prop, order })
+}
 // 点击行
 function rowClick(row: object, column?: any, event?: any) {
   emit('rowClick', row)
@@ -196,11 +208,13 @@
       border
       stripe
       :size="size"
+      :default-sort="props.sort"
       :show-header="showHeader"
       style="width: 100%;"
       @selection-change="handleSelectionChange"
       @select="selectClick"
       @row-click="rowClick"
+      @sort-change="sortClick"
     >
       <slot name="preColumns" />
 
@@ -210,7 +224,7 @@
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
+      <el-table-column v-for="column of columns" :key="column.value" :sortable="column.sortable" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
           <span v-else :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ column.filter(scope.row) }}</span>
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index 5cf6445..2cd73de 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -320,7 +320,7 @@
   {
     path: '/meteringdevice',
     component: Layout,
-    redirect: '/devicelist',
+    redirect: '/modellist',
     name: 'MeteringDevice',
     meta: {
       title: '设备台账',
@@ -329,6 +329,43 @@
     },
     children: [
       {
+        path: '/modellist',
+        component: Layout,
+        redirect: '/dmodel',
+        name: 'DeviceModel',
+        meta: {
+          title: '设备规格型号管理',
+          icon: 'ep:key',
+          auth: '/tested/device/model',
+        },
+        children: [
+          {
+            path: '/dmodel',
+            name: 'DeviceModelPage',
+            component: () => import('@/views/tested/device/model/index.vue'),
+            meta: {
+              title: '设备规格型号管理',
+              auth: '/tested/device/model',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/modellist',
+            },
+          },
+          {
+            path: '/dmodel/:type',
+            name: 'ModelEdit',
+            component: () => import('@/views/tested/device/model/components/edit.vue'),
+            meta: {
+              title: '设备规格型号管理',
+              auth: '/tested/device/model',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/modellist',
+            },
+          },
+        ],
+      },
+      {
         path: '/devicelist',
         component: Layout,
         redirect: '/dinfo',
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 6c9383f..879a207 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -158,7 +158,11 @@
 }
 // 批量删除
 const batchDeleteLabel = () => {
-  if (selectList.value.length) {
+  if (selectList.value.filter(item => item.usageStatusName === '已使用').length) {
+    ElMessage.warning('请选择未使用的标签')
+    return
+  }
+  if (selectList.value.filter(item => item.usageStatusName !== '已使用').length) {
     ElMessageBox.confirm(
       '确认删除所选数据吗？',
       '提示',
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index 60d55d6..ba91cbf 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -25,7 +25,7 @@
   offset: 1,
 }) // 查询参数
 watch(() => noticeTime.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     searchQuery.noticeStartTime = `${newVal[0]} 00:00:00`
     searchQuery.noticeEndTime = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/system/signature/autograph.vue b/src/views/system/signature/autograph.vue
index e5a32c8..9c1d0ca 100644
--- a/src/views/system/signature/autograph.vue
+++ b/src/views/system/signature/autograph.vue
@@ -23,7 +23,7 @@
   ids: [],
 }) // 查询参数
 watch(() => createTime.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     searchQuery.createStartTime = `${newVal[0]} 00:00:00`
     searchQuery.createEndTime = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 5f57089..b557683 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -16,7 +16,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index 8f31905..e140eaa 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.applicantTimeStart = `${newVal[0]} 00:00:00`
     listQuery.applicantTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/opinion/index.vue b/src/views/tested/MeasurementBusiness/opinion/index.vue
index 6c7e13c..c6683c0 100644
--- a/src/views/tested/MeasurementBusiness/opinion/index.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue
index b15f27b..e204a69 100644
--- a/src/views/tested/MeasurementBusiness/review/index.vue
+++ b/src/views/tested/MeasurementBusiness/review/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
@@ -76,21 +76,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
-  // getListPage(listQuery).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   listLoading.value = false
-  // })
-  list.value = [{
-    formNo: '12345',
-    formName: '评审表1',
-    labCode: '海口实验室',
-    groupCode: '组别1',
-    signStatusName: '同意',
-    createUserName: '张三',
-    createTime: '2023-09-05',
-  }]
-  listLoading.value = false
+  getListPage(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  })
 }
 fetchData()
 // 查询数据
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 0e2fd1c..217365a 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -14,7 +14,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.sendTimeStart = `${newVal[0]} 00:00:00`
     listQuery.sendTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index e117705..e2d0ea2 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -12,6 +12,7 @@
     required: true,
   },
 })
+const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
 const userStore = useUserStore()
 const listQuery = reactive({
@@ -20,8 +21,8 @@
   createTimeEnd: '',
   createTimeStart: '',
   notifyType: $props.notifyType, // 通知类型(负责人/部门，字典值)
-  notifyDept: userStore.deptId,
-  notifyUser: userStore.id,
+  notifyDept: $route.path.includes('curatorpage') ? '' : userStore.deptId,
+  notifyUser: $route.path.includes('curatorpage') ? userStore.id : '',
   offset: 1,
   limit: 20,
 })
@@ -30,7 +31,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/dept/index.vue b/src/views/tested/MeasurementPlan/dept/index.vue
index aafe5e1..a25835f 100644
--- a/src/views/tested/MeasurementPlan/dept/index.vue
+++ b/src/views/tested/MeasurementPlan/dept/index.vue
@@ -5,5 +5,5 @@
 
 <template>
   <!-- notifyType 通知类型(负责人/部门，字典值) -->
-  <page notify-type="1" />
+  <page notify-type="2" />
 </template>
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 3cdecdc..429acf5 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -53,7 +53,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }

diff --git a/.env.development b/.env.development
index debe1a8..f2fee42 100644
--- a/.env.development
+++ b/.env.development
@@ -4,7 +4,7 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
-VITE_APP_API_BASEURL = http://127.0.0.1:5909
+VITE_APP_API_BASEURL = http://192.168.8.101:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..313fcf7 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://192.168.8.101:5909"
 }
diff --git a/src/api/eqpt/device/model.ts b/src/api/eqpt/device/model.ts
new file mode 100644
index 0000000..a8fa0f1
--- /dev/null
+++ b/src/api/eqpt/device/model.ts
@@ -0,0 +1,61 @@
+/**
+ * 设备型号规格管理相关
+ */
+import request from '@/api/index'
+
+// 列表
+export function getModelList(params: any) {
+  return request({
+    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}`,
+    method: 'post',
+    data: params,
+  })
+}
+// 列表-不分页
+export function getModelAllList(params: any) {
+  return request({
+    url: '/equipment/model/list',
+    method: 'post',
+    data: params,
+  })
+}
+// 设备名称列表/equipment/model/listEquipmentName
+export function getDeviceNameList(params: any) {
+  return request({
+    url: '/equipment/model/listEquipmentName',
+    method: 'get',
+    params,
+  })
+}
+// 导出
+export function exportModelList(data: any) {
+  return request({
+    url: '/equipment/model/export',
+    method: 'post',
+    data,
+  })
+}
+// 新建或编辑
+export function handlerFunApi(type: string, data: any) {
+  if (type === 'create') {
+    return request({
+      url: '/equipment/model/add',
+      method: 'post',
+      data,
+    })
+  }
+  else if (type === 'update') {
+    return request({
+      url: '/equipment/model/update',
+      method: 'post',
+      data,
+    })
+  }
+}
+// 删除
+export function deleteModel(data: any) {
+  return request({
+    url: `/equipment/model/delete?id=${data.id}`,
+    method: 'post',
+  })
+}
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 14ec12e..64e6f48 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -55,11 +55,12 @@
   // listQuery.value.offset = 1
   // }
   fetchApproval({ processId: listQuery.value.processId }).then((response) => {
+    console.log(response.data, 'response')
     response.data.forEach((item: Array<IList>, index: number) => {
       item.forEach((i: any) => {
         list.value.push({
           cindex: index,
-          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[i.cindex].nodeNumber + 1,
+          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[index - 1].nodeNumber + 1,
           assigneeName: i.assigneeName, // 姓名
           approvalStatus: i.approvalStatus, // 审批类型
           finishTime: i.finishTime ? i.finishTime : '-', // 完成时间
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index f08078d..aefbd8b 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -90,8 +90,16 @@
     type: String,
     default: 'default',
   }, // 表格大小，默认，small,mini等，与el-table条件相同
+  // 排序
+  sort: {
+    type: Object,
+    default() {
+      return {
+      }
+    },
+  },
 })
-const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'multiSelect'])
+const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'multiSelect', 'sortChange'])
 // -------定义数据--------------
 interface columnsCheckInfo {
   text: string
@@ -139,6 +147,10 @@
 function selectionChange(selection: []) {
   emit('selectionChange', selection)
 }
+// 点击排序
+function sortClick(column: any, prop: any, order: any) {
+  emit('sortChange', { column, prop, order })
+}
 // 点击行
 function rowClick(row: object, column?: any, event?: any) {
   emit('rowClick', row)
@@ -196,11 +208,13 @@
       border
       stripe
       :size="size"
+      :default-sort="props.sort"
       :show-header="showHeader"
       style="width: 100%;"
       @selection-change="handleSelectionChange"
       @select="selectClick"
       @row-click="rowClick"
+      @sort-change="sortClick"
     >
       <slot name="preColumns" />
 
@@ -210,7 +224,7 @@
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
+      <el-table-column v-for="column of columns" :key="column.value" :sortable="column.sortable" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
           <span v-else :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ column.filter(scope.row) }}</span>
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index 5cf6445..2cd73de 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -320,7 +320,7 @@
   {
     path: '/meteringdevice',
     component: Layout,
-    redirect: '/devicelist',
+    redirect: '/modellist',
     name: 'MeteringDevice',
     meta: {
       title: '设备台账',
@@ -329,6 +329,43 @@
     },
     children: [
       {
+        path: '/modellist',
+        component: Layout,
+        redirect: '/dmodel',
+        name: 'DeviceModel',
+        meta: {
+          title: '设备规格型号管理',
+          icon: 'ep:key',
+          auth: '/tested/device/model',
+        },
+        children: [
+          {
+            path: '/dmodel',
+            name: 'DeviceModelPage',
+            component: () => import('@/views/tested/device/model/index.vue'),
+            meta: {
+              title: '设备规格型号管理',
+              auth: '/tested/device/model',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/modellist',
+            },
+          },
+          {
+            path: '/dmodel/:type',
+            name: 'ModelEdit',
+            component: () => import('@/views/tested/device/model/components/edit.vue'),
+            meta: {
+              title: '设备规格型号管理',
+              auth: '/tested/device/model',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/modellist',
+            },
+          },
+        ],
+      },
+      {
         path: '/devicelist',
         component: Layout,
         redirect: '/dinfo',
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 6c9383f..879a207 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -158,7 +158,11 @@
 }
 // 批量删除
 const batchDeleteLabel = () => {
-  if (selectList.value.length) {
+  if (selectList.value.filter(item => item.usageStatusName === '已使用').length) {
+    ElMessage.warning('请选择未使用的标签')
+    return
+  }
+  if (selectList.value.filter(item => item.usageStatusName !== '已使用').length) {
     ElMessageBox.confirm(
       '确认删除所选数据吗？',
       '提示',
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index 60d55d6..ba91cbf 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -25,7 +25,7 @@
   offset: 1,
 }) // 查询参数
 watch(() => noticeTime.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     searchQuery.noticeStartTime = `${newVal[0]} 00:00:00`
     searchQuery.noticeEndTime = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/system/signature/autograph.vue b/src/views/system/signature/autograph.vue
index e5a32c8..9c1d0ca 100644
--- a/src/views/system/signature/autograph.vue
+++ b/src/views/system/signature/autograph.vue
@@ -23,7 +23,7 @@
   ids: [],
 }) // 查询参数
 watch(() => createTime.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     searchQuery.createStartTime = `${newVal[0]} 00:00:00`
     searchQuery.createEndTime = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 5f57089..b557683 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -16,7 +16,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index 8f31905..e140eaa 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.applicantTimeStart = `${newVal[0]} 00:00:00`
     listQuery.applicantTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/opinion/index.vue b/src/views/tested/MeasurementBusiness/opinion/index.vue
index 6c7e13c..c6683c0 100644
--- a/src/views/tested/MeasurementBusiness/opinion/index.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue
index b15f27b..e204a69 100644
--- a/src/views/tested/MeasurementBusiness/review/index.vue
+++ b/src/views/tested/MeasurementBusiness/review/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
@@ -76,21 +76,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
-  // getListPage(listQuery).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   listLoading.value = false
-  // })
-  list.value = [{
-    formNo: '12345',
-    formName: '评审表1',
-    labCode: '海口实验室',
-    groupCode: '组别1',
-    signStatusName: '同意',
-    createUserName: '张三',
-    createTime: '2023-09-05',
-  }]
-  listLoading.value = false
+  getListPage(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  })
 }
 fetchData()
 // 查询数据
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 0e2fd1c..217365a 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -14,7 +14,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.sendTimeStart = `${newVal[0]} 00:00:00`
     listQuery.sendTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index e117705..e2d0ea2 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -12,6 +12,7 @@
     required: true,
   },
 })
+const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
 const userStore = useUserStore()
 const listQuery = reactive({
@@ -20,8 +21,8 @@
   createTimeEnd: '',
   createTimeStart: '',
   notifyType: $props.notifyType, // 通知类型(负责人/部门，字典值)
-  notifyDept: userStore.deptId,
-  notifyUser: userStore.id,
+  notifyDept: $route.path.includes('curatorpage') ? '' : userStore.deptId,
+  notifyUser: $route.path.includes('curatorpage') ? userStore.id : '',
   offset: 1,
   limit: 20,
 })
@@ -30,7 +31,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/dept/index.vue b/src/views/tested/MeasurementPlan/dept/index.vue
index aafe5e1..a25835f 100644
--- a/src/views/tested/MeasurementPlan/dept/index.vue
+++ b/src/views/tested/MeasurementPlan/dept/index.vue
@@ -5,5 +5,5 @@
 
 <template>
   <!-- notifyType 通知类型(负责人/部门，字典值) -->
-  <page notify-type="1" />
+  <page notify-type="2" />
 </template>
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 3cdecdc..429acf5 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -53,7 +53,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index f599508..2c53a36 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -24,7 +24,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }

diff --git a/.env.development b/.env.development
index debe1a8..f2fee42 100644
--- a/.env.development
+++ b/.env.development
@@ -4,7 +4,7 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
-VITE_APP_API_BASEURL = http://127.0.0.1:5909
+VITE_APP_API_BASEURL = http://192.168.8.101:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..313fcf7 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://192.168.8.101:5909"
 }
diff --git a/src/api/eqpt/device/model.ts b/src/api/eqpt/device/model.ts
new file mode 100644
index 0000000..a8fa0f1
--- /dev/null
+++ b/src/api/eqpt/device/model.ts
@@ -0,0 +1,61 @@
+/**
+ * 设备型号规格管理相关
+ */
+import request from '@/api/index'
+
+// 列表
+export function getModelList(params: any) {
+  return request({
+    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}`,
+    method: 'post',
+    data: params,
+  })
+}
+// 列表-不分页
+export function getModelAllList(params: any) {
+  return request({
+    url: '/equipment/model/list',
+    method: 'post',
+    data: params,
+  })
+}
+// 设备名称列表/equipment/model/listEquipmentName
+export function getDeviceNameList(params: any) {
+  return request({
+    url: '/equipment/model/listEquipmentName',
+    method: 'get',
+    params,
+  })
+}
+// 导出
+export function exportModelList(data: any) {
+  return request({
+    url: '/equipment/model/export',
+    method: 'post',
+    data,
+  })
+}
+// 新建或编辑
+export function handlerFunApi(type: string, data: any) {
+  if (type === 'create') {
+    return request({
+      url: '/equipment/model/add',
+      method: 'post',
+      data,
+    })
+  }
+  else if (type === 'update') {
+    return request({
+      url: '/equipment/model/update',
+      method: 'post',
+      data,
+    })
+  }
+}
+// 删除
+export function deleteModel(data: any) {
+  return request({
+    url: `/equipment/model/delete?id=${data.id}`,
+    method: 'post',
+  })
+}
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 14ec12e..64e6f48 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -55,11 +55,12 @@
   // listQuery.value.offset = 1
   // }
   fetchApproval({ processId: listQuery.value.processId }).then((response) => {
+    console.log(response.data, 'response')
     response.data.forEach((item: Array<IList>, index: number) => {
       item.forEach((i: any) => {
         list.value.push({
           cindex: index,
-          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[i.cindex].nodeNumber + 1,
+          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[index - 1].nodeNumber + 1,
           assigneeName: i.assigneeName, // 姓名
           approvalStatus: i.approvalStatus, // 审批类型
           finishTime: i.finishTime ? i.finishTime : '-', // 完成时间
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index f08078d..aefbd8b 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -90,8 +90,16 @@
     type: String,
     default: 'default',
   }, // 表格大小，默认，small,mini等，与el-table条件相同
+  // 排序
+  sort: {
+    type: Object,
+    default() {
+      return {
+      }
+    },
+  },
 })
-const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'multiSelect'])
+const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'multiSelect', 'sortChange'])
 // -------定义数据--------------
 interface columnsCheckInfo {
   text: string
@@ -139,6 +147,10 @@
 function selectionChange(selection: []) {
   emit('selectionChange', selection)
 }
+// 点击排序
+function sortClick(column: any, prop: any, order: any) {
+  emit('sortChange', { column, prop, order })
+}
 // 点击行
 function rowClick(row: object, column?: any, event?: any) {
   emit('rowClick', row)
@@ -196,11 +208,13 @@
       border
       stripe
       :size="size"
+      :default-sort="props.sort"
       :show-header="showHeader"
       style="width: 100%;"
       @selection-change="handleSelectionChange"
       @select="selectClick"
       @row-click="rowClick"
+      @sort-change="sortClick"
     >
       <slot name="preColumns" />
 
@@ -210,7 +224,7 @@
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
+      <el-table-column v-for="column of columns" :key="column.value" :sortable="column.sortable" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
           <span v-else :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ column.filter(scope.row) }}</span>
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index 5cf6445..2cd73de 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -320,7 +320,7 @@
   {
     path: '/meteringdevice',
     component: Layout,
-    redirect: '/devicelist',
+    redirect: '/modellist',
     name: 'MeteringDevice',
     meta: {
       title: '设备台账',
@@ -329,6 +329,43 @@
     },
     children: [
       {
+        path: '/modellist',
+        component: Layout,
+        redirect: '/dmodel',
+        name: 'DeviceModel',
+        meta: {
+          title: '设备规格型号管理',
+          icon: 'ep:key',
+          auth: '/tested/device/model',
+        },
+        children: [
+          {
+            path: '/dmodel',
+            name: 'DeviceModelPage',
+            component: () => import('@/views/tested/device/model/index.vue'),
+            meta: {
+              title: '设备规格型号管理',
+              auth: '/tested/device/model',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/modellist',
+            },
+          },
+          {
+            path: '/dmodel/:type',
+            name: 'ModelEdit',
+            component: () => import('@/views/tested/device/model/components/edit.vue'),
+            meta: {
+              title: '设备规格型号管理',
+              auth: '/tested/device/model',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/modellist',
+            },
+          },
+        ],
+      },
+      {
         path: '/devicelist',
         component: Layout,
         redirect: '/dinfo',
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 6c9383f..879a207 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -158,7 +158,11 @@
 }
 // 批量删除
 const batchDeleteLabel = () => {
-  if (selectList.value.length) {
+  if (selectList.value.filter(item => item.usageStatusName === '已使用').length) {
+    ElMessage.warning('请选择未使用的标签')
+    return
+  }
+  if (selectList.value.filter(item => item.usageStatusName !== '已使用').length) {
     ElMessageBox.confirm(
       '确认删除所选数据吗？',
       '提示',
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index 60d55d6..ba91cbf 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -25,7 +25,7 @@
   offset: 1,
 }) // 查询参数
 watch(() => noticeTime.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     searchQuery.noticeStartTime = `${newVal[0]} 00:00:00`
     searchQuery.noticeEndTime = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/system/signature/autograph.vue b/src/views/system/signature/autograph.vue
index e5a32c8..9c1d0ca 100644
--- a/src/views/system/signature/autograph.vue
+++ b/src/views/system/signature/autograph.vue
@@ -23,7 +23,7 @@
   ids: [],
 }) // 查询参数
 watch(() => createTime.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     searchQuery.createStartTime = `${newVal[0]} 00:00:00`
     searchQuery.createEndTime = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 5f57089..b557683 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -16,7 +16,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index 8f31905..e140eaa 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.applicantTimeStart = `${newVal[0]} 00:00:00`
     listQuery.applicantTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/opinion/index.vue b/src/views/tested/MeasurementBusiness/opinion/index.vue
index 6c7e13c..c6683c0 100644
--- a/src/views/tested/MeasurementBusiness/opinion/index.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue
index b15f27b..e204a69 100644
--- a/src/views/tested/MeasurementBusiness/review/index.vue
+++ b/src/views/tested/MeasurementBusiness/review/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
@@ -76,21 +76,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
-  // getListPage(listQuery).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   listLoading.value = false
-  // })
-  list.value = [{
-    formNo: '12345',
-    formName: '评审表1',
-    labCode: '海口实验室',
-    groupCode: '组别1',
-    signStatusName: '同意',
-    createUserName: '张三',
-    createTime: '2023-09-05',
-  }]
-  listLoading.value = false
+  getListPage(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  })
 }
 fetchData()
 // 查询数据
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 0e2fd1c..217365a 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -14,7 +14,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.sendTimeStart = `${newVal[0]} 00:00:00`
     listQuery.sendTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index e117705..e2d0ea2 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -12,6 +12,7 @@
     required: true,
   },
 })
+const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
 const userStore = useUserStore()
 const listQuery = reactive({
@@ -20,8 +21,8 @@
   createTimeEnd: '',
   createTimeStart: '',
   notifyType: $props.notifyType, // 通知类型(负责人/部门，字典值)
-  notifyDept: userStore.deptId,
-  notifyUser: userStore.id,
+  notifyDept: $route.path.includes('curatorpage') ? '' : userStore.deptId,
+  notifyUser: $route.path.includes('curatorpage') ? userStore.id : '',
   offset: 1,
   limit: 20,
 })
@@ -30,7 +31,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/dept/index.vue b/src/views/tested/MeasurementPlan/dept/index.vue
index aafe5e1..a25835f 100644
--- a/src/views/tested/MeasurementPlan/dept/index.vue
+++ b/src/views/tested/MeasurementPlan/dept/index.vue
@@ -5,5 +5,5 @@
 
 <template>
   <!-- notifyType 通知类型(负责人/部门，字典值) -->
-  <page notify-type="1" />
+  <page notify-type="2" />
 </template>
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 3cdecdc..429acf5 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -53,7 +53,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index f599508..2c53a36 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -24,7 +24,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index 6af790b..f17af59 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -39,7 +39,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }

diff --git a/.env.development b/.env.development
index debe1a8..f2fee42 100644
--- a/.env.development
+++ b/.env.development
@@ -4,7 +4,7 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
-VITE_APP_API_BASEURL = http://127.0.0.1:5909
+VITE_APP_API_BASEURL = http://192.168.8.101:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..313fcf7 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://192.168.8.101:5909"
 }
diff --git a/src/api/eqpt/device/model.ts b/src/api/eqpt/device/model.ts
new file mode 100644
index 0000000..a8fa0f1
--- /dev/null
+++ b/src/api/eqpt/device/model.ts
@@ -0,0 +1,61 @@
+/**
+ * 设备型号规格管理相关
+ */
+import request from '@/api/index'
+
+// 列表
+export function getModelList(params: any) {
+  return request({
+    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}`,
+    method: 'post',
+    data: params,
+  })
+}
+// 列表-不分页
+export function getModelAllList(params: any) {
+  return request({
+    url: '/equipment/model/list',
+    method: 'post',
+    data: params,
+  })
+}
+// 设备名称列表/equipment/model/listEquipmentName
+export function getDeviceNameList(params: any) {
+  return request({
+    url: '/equipment/model/listEquipmentName',
+    method: 'get',
+    params,
+  })
+}
+// 导出
+export function exportModelList(data: any) {
+  return request({
+    url: '/equipment/model/export',
+    method: 'post',
+    data,
+  })
+}
+// 新建或编辑
+export function handlerFunApi(type: string, data: any) {
+  if (type === 'create') {
+    return request({
+      url: '/equipment/model/add',
+      method: 'post',
+      data,
+    })
+  }
+  else if (type === 'update') {
+    return request({
+      url: '/equipment/model/update',
+      method: 'post',
+      data,
+    })
+  }
+}
+// 删除
+export function deleteModel(data: any) {
+  return request({
+    url: `/equipment/model/delete?id=${data.id}`,
+    method: 'post',
+  })
+}
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 14ec12e..64e6f48 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -55,11 +55,12 @@
   // listQuery.value.offset = 1
   // }
   fetchApproval({ processId: listQuery.value.processId }).then((response) => {
+    console.log(response.data, 'response')
     response.data.forEach((item: Array<IList>, index: number) => {
       item.forEach((i: any) => {
         list.value.push({
           cindex: index,
-          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[i.cindex].nodeNumber + 1,
+          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[index - 1].nodeNumber + 1,
           assigneeName: i.assigneeName, // 姓名
           approvalStatus: i.approvalStatus, // 审批类型
           finishTime: i.finishTime ? i.finishTime : '-', // 完成时间
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index f08078d..aefbd8b 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -90,8 +90,16 @@
     type: String,
     default: 'default',
   }, // 表格大小，默认，small,mini等，与el-table条件相同
+  // 排序
+  sort: {
+    type: Object,
+    default() {
+      return {
+      }
+    },
+  },
 })
-const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'multiSelect'])
+const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'multiSelect', 'sortChange'])
 // -------定义数据--------------
 interface columnsCheckInfo {
   text: string
@@ -139,6 +147,10 @@
 function selectionChange(selection: []) {
   emit('selectionChange', selection)
 }
+// 点击排序
+function sortClick(column: any, prop: any, order: any) {
+  emit('sortChange', { column, prop, order })
+}
 // 点击行
 function rowClick(row: object, column?: any, event?: any) {
   emit('rowClick', row)
@@ -196,11 +208,13 @@
       border
       stripe
       :size="size"
+      :default-sort="props.sort"
       :show-header="showHeader"
       style="width: 100%;"
       @selection-change="handleSelectionChange"
       @select="selectClick"
       @row-click="rowClick"
+      @sort-change="sortClick"
     >
       <slot name="preColumns" />
 
@@ -210,7 +224,7 @@
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
+      <el-table-column v-for="column of columns" :key="column.value" :sortable="column.sortable" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
           <span v-else :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ column.filter(scope.row) }}</span>
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index 5cf6445..2cd73de 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -320,7 +320,7 @@
   {
     path: '/meteringdevice',
     component: Layout,
-    redirect: '/devicelist',
+    redirect: '/modellist',
     name: 'MeteringDevice',
     meta: {
       title: '设备台账',
@@ -329,6 +329,43 @@
     },
     children: [
       {
+        path: '/modellist',
+        component: Layout,
+        redirect: '/dmodel',
+        name: 'DeviceModel',
+        meta: {
+          title: '设备规格型号管理',
+          icon: 'ep:key',
+          auth: '/tested/device/model',
+        },
+        children: [
+          {
+            path: '/dmodel',
+            name: 'DeviceModelPage',
+            component: () => import('@/views/tested/device/model/index.vue'),
+            meta: {
+              title: '设备规格型号管理',
+              auth: '/tested/device/model',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/modellist',
+            },
+          },
+          {
+            path: '/dmodel/:type',
+            name: 'ModelEdit',
+            component: () => import('@/views/tested/device/model/components/edit.vue'),
+            meta: {
+              title: '设备规格型号管理',
+              auth: '/tested/device/model',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/modellist',
+            },
+          },
+        ],
+      },
+      {
         path: '/devicelist',
         component: Layout,
         redirect: '/dinfo',
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 6c9383f..879a207 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -158,7 +158,11 @@
 }
 // 批量删除
 const batchDeleteLabel = () => {
-  if (selectList.value.length) {
+  if (selectList.value.filter(item => item.usageStatusName === '已使用').length) {
+    ElMessage.warning('请选择未使用的标签')
+    return
+  }
+  if (selectList.value.filter(item => item.usageStatusName !== '已使用').length) {
     ElMessageBox.confirm(
       '确认删除所选数据吗？',
       '提示',
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index 60d55d6..ba91cbf 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -25,7 +25,7 @@
   offset: 1,
 }) // 查询参数
 watch(() => noticeTime.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     searchQuery.noticeStartTime = `${newVal[0]} 00:00:00`
     searchQuery.noticeEndTime = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/system/signature/autograph.vue b/src/views/system/signature/autograph.vue
index e5a32c8..9c1d0ca 100644
--- a/src/views/system/signature/autograph.vue
+++ b/src/views/system/signature/autograph.vue
@@ -23,7 +23,7 @@
   ids: [],
 }) // 查询参数
 watch(() => createTime.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     searchQuery.createStartTime = `${newVal[0]} 00:00:00`
     searchQuery.createEndTime = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 5f57089..b557683 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -16,7 +16,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index 8f31905..e140eaa 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.applicantTimeStart = `${newVal[0]} 00:00:00`
     listQuery.applicantTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/opinion/index.vue b/src/views/tested/MeasurementBusiness/opinion/index.vue
index 6c7e13c..c6683c0 100644
--- a/src/views/tested/MeasurementBusiness/opinion/index.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue
index b15f27b..e204a69 100644
--- a/src/views/tested/MeasurementBusiness/review/index.vue
+++ b/src/views/tested/MeasurementBusiness/review/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
@@ -76,21 +76,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
-  // getListPage(listQuery).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   listLoading.value = false
-  // })
-  list.value = [{
-    formNo: '12345',
-    formName: '评审表1',
-    labCode: '海口实验室',
-    groupCode: '组别1',
-    signStatusName: '同意',
-    createUserName: '张三',
-    createTime: '2023-09-05',
-  }]
-  listLoading.value = false
+  getListPage(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  })
 }
 fetchData()
 // 查询数据
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 0e2fd1c..217365a 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -14,7 +14,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.sendTimeStart = `${newVal[0]} 00:00:00`
     listQuery.sendTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index e117705..e2d0ea2 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -12,6 +12,7 @@
     required: true,
   },
 })
+const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
 const userStore = useUserStore()
 const listQuery = reactive({
@@ -20,8 +21,8 @@
   createTimeEnd: '',
   createTimeStart: '',
   notifyType: $props.notifyType, // 通知类型(负责人/部门，字典值)
-  notifyDept: userStore.deptId,
-  notifyUser: userStore.id,
+  notifyDept: $route.path.includes('curatorpage') ? '' : userStore.deptId,
+  notifyUser: $route.path.includes('curatorpage') ? userStore.id : '',
   offset: 1,
   limit: 20,
 })
@@ -30,7 +31,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/dept/index.vue b/src/views/tested/MeasurementPlan/dept/index.vue
index aafe5e1..a25835f 100644
--- a/src/views/tested/MeasurementPlan/dept/index.vue
+++ b/src/views/tested/MeasurementPlan/dept/index.vue
@@ -5,5 +5,5 @@
 
 <template>
   <!-- notifyType 通知类型(负责人/部门，字典值) -->
-  <page notify-type="1" />
+  <page notify-type="2" />
 </template>
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 3cdecdc..429acf5 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -53,7 +53,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index f599508..2c53a36 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -24,7 +24,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index 6af790b..f17af59 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -39,7 +39,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 6fa4355..d0e9936 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -27,7 +27,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.value.certificateValidStart = `${newVal[0]} 00:00:00`
     listQuery.value.certificateValidEnd = `${newVal[1]} 23:59:59`
   }

diff --git a/.env.development b/.env.development
index debe1a8..f2fee42 100644
--- a/.env.development
+++ b/.env.development
@@ -4,7 +4,7 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
-VITE_APP_API_BASEURL = http://127.0.0.1:5909
+VITE_APP_API_BASEURL = http://192.168.8.101:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..313fcf7 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://192.168.8.101:5909"
 }
diff --git a/src/api/eqpt/device/model.ts b/src/api/eqpt/device/model.ts
new file mode 100644
index 0000000..a8fa0f1
--- /dev/null
+++ b/src/api/eqpt/device/model.ts
@@ -0,0 +1,61 @@
+/**
+ * 设备型号规格管理相关
+ */
+import request from '@/api/index'
+
+// 列表
+export function getModelList(params: any) {
+  return request({
+    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}`,
+    method: 'post',
+    data: params,
+  })
+}
+// 列表-不分页
+export function getModelAllList(params: any) {
+  return request({
+    url: '/equipment/model/list',
+    method: 'post',
+    data: params,
+  })
+}
+// 设备名称列表/equipment/model/listEquipmentName
+export function getDeviceNameList(params: any) {
+  return request({
+    url: '/equipment/model/listEquipmentName',
+    method: 'get',
+    params,
+  })
+}
+// 导出
+export function exportModelList(data: any) {
+  return request({
+    url: '/equipment/model/export',
+    method: 'post',
+    data,
+  })
+}
+// 新建或编辑
+export function handlerFunApi(type: string, data: any) {
+  if (type === 'create') {
+    return request({
+      url: '/equipment/model/add',
+      method: 'post',
+      data,
+    })
+  }
+  else if (type === 'update') {
+    return request({
+      url: '/equipment/model/update',
+      method: 'post',
+      data,
+    })
+  }
+}
+// 删除
+export function deleteModel(data: any) {
+  return request({
+    url: `/equipment/model/delete?id=${data.id}`,
+    method: 'post',
+  })
+}
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 14ec12e..64e6f48 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -55,11 +55,12 @@
   // listQuery.value.offset = 1
   // }
   fetchApproval({ processId: listQuery.value.processId }).then((response) => {
+    console.log(response.data, 'response')
     response.data.forEach((item: Array<IList>, index: number) => {
       item.forEach((i: any) => {
         list.value.push({
           cindex: index,
-          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[i.cindex].nodeNumber + 1,
+          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[index - 1].nodeNumber + 1,
           assigneeName: i.assigneeName, // 姓名
           approvalStatus: i.approvalStatus, // 审批类型
           finishTime: i.finishTime ? i.finishTime : '-', // 完成时间
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index f08078d..aefbd8b 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -90,8 +90,16 @@
     type: String,
     default: 'default',
   }, // 表格大小，默认，small,mini等，与el-table条件相同
+  // 排序
+  sort: {
+    type: Object,
+    default() {
+      return {
+      }
+    },
+  },
 })
-const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'multiSelect'])
+const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'multiSelect', 'sortChange'])
 // -------定义数据--------------
 interface columnsCheckInfo {
   text: string
@@ -139,6 +147,10 @@
 function selectionChange(selection: []) {
   emit('selectionChange', selection)
 }
+// 点击排序
+function sortClick(column: any, prop: any, order: any) {
+  emit('sortChange', { column, prop, order })
+}
 // 点击行
 function rowClick(row: object, column?: any, event?: any) {
   emit('rowClick', row)
@@ -196,11 +208,13 @@
       border
       stripe
       :size="size"
+      :default-sort="props.sort"
       :show-header="showHeader"
       style="width: 100%;"
       @selection-change="handleSelectionChange"
       @select="selectClick"
       @row-click="rowClick"
+      @sort-change="sortClick"
     >
       <slot name="preColumns" />
 
@@ -210,7 +224,7 @@
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
+      <el-table-column v-for="column of columns" :key="column.value" :sortable="column.sortable" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
           <span v-else :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ column.filter(scope.row) }}</span>
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index 5cf6445..2cd73de 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -320,7 +320,7 @@
   {
     path: '/meteringdevice',
     component: Layout,
-    redirect: '/devicelist',
+    redirect: '/modellist',
     name: 'MeteringDevice',
     meta: {
       title: '设备台账',
@@ -329,6 +329,43 @@
     },
     children: [
       {
+        path: '/modellist',
+        component: Layout,
+        redirect: '/dmodel',
+        name: 'DeviceModel',
+        meta: {
+          title: '设备规格型号管理',
+          icon: 'ep:key',
+          auth: '/tested/device/model',
+        },
+        children: [
+          {
+            path: '/dmodel',
+            name: 'DeviceModelPage',
+            component: () => import('@/views/tested/device/model/index.vue'),
+            meta: {
+              title: '设备规格型号管理',
+              auth: '/tested/device/model',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/modellist',
+            },
+          },
+          {
+            path: '/dmodel/:type',
+            name: 'ModelEdit',
+            component: () => import('@/views/tested/device/model/components/edit.vue'),
+            meta: {
+              title: '设备规格型号管理',
+              auth: '/tested/device/model',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/modellist',
+            },
+          },
+        ],
+      },
+      {
         path: '/devicelist',
         component: Layout,
         redirect: '/dinfo',
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 6c9383f..879a207 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -158,7 +158,11 @@
 }
 // 批量删除
 const batchDeleteLabel = () => {
-  if (selectList.value.length) {
+  if (selectList.value.filter(item => item.usageStatusName === '已使用').length) {
+    ElMessage.warning('请选择未使用的标签')
+    return
+  }
+  if (selectList.value.filter(item => item.usageStatusName !== '已使用').length) {
     ElMessageBox.confirm(
       '确认删除所选数据吗？',
       '提示',
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index 60d55d6..ba91cbf 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -25,7 +25,7 @@
   offset: 1,
 }) // 查询参数
 watch(() => noticeTime.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     searchQuery.noticeStartTime = `${newVal[0]} 00:00:00`
     searchQuery.noticeEndTime = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/system/signature/autograph.vue b/src/views/system/signature/autograph.vue
index e5a32c8..9c1d0ca 100644
--- a/src/views/system/signature/autograph.vue
+++ b/src/views/system/signature/autograph.vue
@@ -23,7 +23,7 @@
   ids: [],
 }) // 查询参数
 watch(() => createTime.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     searchQuery.createStartTime = `${newVal[0]} 00:00:00`
     searchQuery.createEndTime = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 5f57089..b557683 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -16,7 +16,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index 8f31905..e140eaa 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.applicantTimeStart = `${newVal[0]} 00:00:00`
     listQuery.applicantTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/opinion/index.vue b/src/views/tested/MeasurementBusiness/opinion/index.vue
index 6c7e13c..c6683c0 100644
--- a/src/views/tested/MeasurementBusiness/opinion/index.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue
index b15f27b..e204a69 100644
--- a/src/views/tested/MeasurementBusiness/review/index.vue
+++ b/src/views/tested/MeasurementBusiness/review/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
@@ -76,21 +76,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
-  // getListPage(listQuery).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   listLoading.value = false
-  // })
-  list.value = [{
-    formNo: '12345',
-    formName: '评审表1',
-    labCode: '海口实验室',
-    groupCode: '组别1',
-    signStatusName: '同意',
-    createUserName: '张三',
-    createTime: '2023-09-05',
-  }]
-  listLoading.value = false
+  getListPage(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  })
 }
 fetchData()
 // 查询数据
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 0e2fd1c..217365a 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -14,7 +14,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.sendTimeStart = `${newVal[0]} 00:00:00`
     listQuery.sendTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index e117705..e2d0ea2 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -12,6 +12,7 @@
     required: true,
   },
 })
+const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
 const userStore = useUserStore()
 const listQuery = reactive({
@@ -20,8 +21,8 @@
   createTimeEnd: '',
   createTimeStart: '',
   notifyType: $props.notifyType, // 通知类型(负责人/部门，字典值)
-  notifyDept: userStore.deptId,
-  notifyUser: userStore.id,
+  notifyDept: $route.path.includes('curatorpage') ? '' : userStore.deptId,
+  notifyUser: $route.path.includes('curatorpage') ? userStore.id : '',
   offset: 1,
   limit: 20,
 })
@@ -30,7 +31,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/dept/index.vue b/src/views/tested/MeasurementPlan/dept/index.vue
index aafe5e1..a25835f 100644
--- a/src/views/tested/MeasurementPlan/dept/index.vue
+++ b/src/views/tested/MeasurementPlan/dept/index.vue
@@ -5,5 +5,5 @@
 
 <template>
   <!-- notifyType 通知类型(负责人/部门，字典值) -->
-  <page notify-type="1" />
+  <page notify-type="2" />
 </template>
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 3cdecdc..429acf5 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -53,7 +53,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index f599508..2c53a36 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -24,7 +24,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index 6af790b..f17af59 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -39,7 +39,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 6fa4355..d0e9936 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -27,7 +27,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.value.certificateValidStart = `${newVal[0]} 00:00:00`
     listQuery.value.certificateValidEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/task/index.vue b/src/views/tested/MeasurementPlan/task/index.vue
index 4ab62d9..aa759a8 100644
--- a/src/views/tested/MeasurementPlan/task/index.vue
+++ b/src/views/tested/MeasurementPlan/task/index.vue
@@ -17,7 +17,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createStartTime = `${newVal[0]} 00:00:00`
     listQuery.createEndTime = `${newVal[1]} 23:59:59`
   }

diff --git a/.env.development b/.env.development
index debe1a8..f2fee42 100644
--- a/.env.development
+++ b/.env.development
@@ -4,7 +4,7 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
-VITE_APP_API_BASEURL = http://127.0.0.1:5909
+VITE_APP_API_BASEURL = http://192.168.8.101:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..313fcf7 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://192.168.8.101:5909"
 }
diff --git a/src/api/eqpt/device/model.ts b/src/api/eqpt/device/model.ts
new file mode 100644
index 0000000..a8fa0f1
--- /dev/null
+++ b/src/api/eqpt/device/model.ts
@@ -0,0 +1,61 @@
+/**
+ * 设备型号规格管理相关
+ */
+import request from '@/api/index'
+
+// 列表
+export function getModelList(params: any) {
+  return request({
+    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}`,
+    method: 'post',
+    data: params,
+  })
+}
+// 列表-不分页
+export function getModelAllList(params: any) {
+  return request({
+    url: '/equipment/model/list',
+    method: 'post',
+    data: params,
+  })
+}
+// 设备名称列表/equipment/model/listEquipmentName
+export function getDeviceNameList(params: any) {
+  return request({
+    url: '/equipment/model/listEquipmentName',
+    method: 'get',
+    params,
+  })
+}
+// 导出
+export function exportModelList(data: any) {
+  return request({
+    url: '/equipment/model/export',
+    method: 'post',
+    data,
+  })
+}
+// 新建或编辑
+export function handlerFunApi(type: string, data: any) {
+  if (type === 'create') {
+    return request({
+      url: '/equipment/model/add',
+      method: 'post',
+      data,
+    })
+  }
+  else if (type === 'update') {
+    return request({
+      url: '/equipment/model/update',
+      method: 'post',
+      data,
+    })
+  }
+}
+// 删除
+export function deleteModel(data: any) {
+  return request({
+    url: `/equipment/model/delete?id=${data.id}`,
+    method: 'post',
+  })
+}
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 14ec12e..64e6f48 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -55,11 +55,12 @@
   // listQuery.value.offset = 1
   // }
   fetchApproval({ processId: listQuery.value.processId }).then((response) => {
+    console.log(response.data, 'response')
     response.data.forEach((item: Array<IList>, index: number) => {
       item.forEach((i: any) => {
         list.value.push({
           cindex: index,
-          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[i.cindex].nodeNumber + 1,
+          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[index - 1].nodeNumber + 1,
           assigneeName: i.assigneeName, // 姓名
           approvalStatus: i.approvalStatus, // 审批类型
           finishTime: i.finishTime ? i.finishTime : '-', // 完成时间
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index f08078d..aefbd8b 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -90,8 +90,16 @@
     type: String,
     default: 'default',
   }, // 表格大小，默认，small,mini等，与el-table条件相同
+  // 排序
+  sort: {
+    type: Object,
+    default() {
+      return {
+      }
+    },
+  },
 })
-const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'multiSelect'])
+const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'multiSelect', 'sortChange'])
 // -------定义数据--------------
 interface columnsCheckInfo {
   text: string
@@ -139,6 +147,10 @@
 function selectionChange(selection: []) {
   emit('selectionChange', selection)
 }
+// 点击排序
+function sortClick(column: any, prop: any, order: any) {
+  emit('sortChange', { column, prop, order })
+}
 // 点击行
 function rowClick(row: object, column?: any, event?: any) {
   emit('rowClick', row)
@@ -196,11 +208,13 @@
       border
       stripe
       :size="size"
+      :default-sort="props.sort"
       :show-header="showHeader"
       style="width: 100%;"
       @selection-change="handleSelectionChange"
       @select="selectClick"
       @row-click="rowClick"
+      @sort-change="sortClick"
     >
       <slot name="preColumns" />
 
@@ -210,7 +224,7 @@
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
+      <el-table-column v-for="column of columns" :key="column.value" :sortable="column.sortable" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
           <span v-else :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ column.filter(scope.row) }}</span>
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index 5cf6445..2cd73de 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -320,7 +320,7 @@
   {
     path: '/meteringdevice',
     component: Layout,
-    redirect: '/devicelist',
+    redirect: '/modellist',
     name: 'MeteringDevice',
     meta: {
       title: '设备台账',
@@ -329,6 +329,43 @@
     },
     children: [
       {
+        path: '/modellist',
+        component: Layout,
+        redirect: '/dmodel',
+        name: 'DeviceModel',
+        meta: {
+          title: '设备规格型号管理',
+          icon: 'ep:key',
+          auth: '/tested/device/model',
+        },
+        children: [
+          {
+            path: '/dmodel',
+            name: 'DeviceModelPage',
+            component: () => import('@/views/tested/device/model/index.vue'),
+            meta: {
+              title: '设备规格型号管理',
+              auth: '/tested/device/model',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/modellist',
+            },
+          },
+          {
+            path: '/dmodel/:type',
+            name: 'ModelEdit',
+            component: () => import('@/views/tested/device/model/components/edit.vue'),
+            meta: {
+              title: '设备规格型号管理',
+              auth: '/tested/device/model',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/modellist',
+            },
+          },
+        ],
+      },
+      {
         path: '/devicelist',
         component: Layout,
         redirect: '/dinfo',
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 6c9383f..879a207 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -158,7 +158,11 @@
 }
 // 批量删除
 const batchDeleteLabel = () => {
-  if (selectList.value.length) {
+  if (selectList.value.filter(item => item.usageStatusName === '已使用').length) {
+    ElMessage.warning('请选择未使用的标签')
+    return
+  }
+  if (selectList.value.filter(item => item.usageStatusName !== '已使用').length) {
     ElMessageBox.confirm(
       '确认删除所选数据吗？',
       '提示',
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index 60d55d6..ba91cbf 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -25,7 +25,7 @@
   offset: 1,
 }) // 查询参数
 watch(() => noticeTime.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     searchQuery.noticeStartTime = `${newVal[0]} 00:00:00`
     searchQuery.noticeEndTime = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/system/signature/autograph.vue b/src/views/system/signature/autograph.vue
index e5a32c8..9c1d0ca 100644
--- a/src/views/system/signature/autograph.vue
+++ b/src/views/system/signature/autograph.vue
@@ -23,7 +23,7 @@
   ids: [],
 }) // 查询参数
 watch(() => createTime.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     searchQuery.createStartTime = `${newVal[0]} 00:00:00`
     searchQuery.createEndTime = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 5f57089..b557683 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -16,7 +16,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index 8f31905..e140eaa 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.applicantTimeStart = `${newVal[0]} 00:00:00`
     listQuery.applicantTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/opinion/index.vue b/src/views/tested/MeasurementBusiness/opinion/index.vue
index 6c7e13c..c6683c0 100644
--- a/src/views/tested/MeasurementBusiness/opinion/index.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue
index b15f27b..e204a69 100644
--- a/src/views/tested/MeasurementBusiness/review/index.vue
+++ b/src/views/tested/MeasurementBusiness/review/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
@@ -76,21 +76,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
-  // getListPage(listQuery).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   listLoading.value = false
-  // })
-  list.value = [{
-    formNo: '12345',
-    formName: '评审表1',
-    labCode: '海口实验室',
-    groupCode: '组别1',
-    signStatusName: '同意',
-    createUserName: '张三',
-    createTime: '2023-09-05',
-  }]
-  listLoading.value = false
+  getListPage(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  })
 }
 fetchData()
 // 查询数据
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 0e2fd1c..217365a 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -14,7 +14,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.sendTimeStart = `${newVal[0]} 00:00:00`
     listQuery.sendTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index e117705..e2d0ea2 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -12,6 +12,7 @@
     required: true,
   },
 })
+const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
 const userStore = useUserStore()
 const listQuery = reactive({
@@ -20,8 +21,8 @@
   createTimeEnd: '',
   createTimeStart: '',
   notifyType: $props.notifyType, // 通知类型(负责人/部门，字典值)
-  notifyDept: userStore.deptId,
-  notifyUser: userStore.id,
+  notifyDept: $route.path.includes('curatorpage') ? '' : userStore.deptId,
+  notifyUser: $route.path.includes('curatorpage') ? userStore.id : '',
   offset: 1,
   limit: 20,
 })
@@ -30,7 +31,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/dept/index.vue b/src/views/tested/MeasurementPlan/dept/index.vue
index aafe5e1..a25835f 100644
--- a/src/views/tested/MeasurementPlan/dept/index.vue
+++ b/src/views/tested/MeasurementPlan/dept/index.vue
@@ -5,5 +5,5 @@
 
 <template>
   <!-- notifyType 通知类型(负责人/部门，字典值) -->
-  <page notify-type="1" />
+  <page notify-type="2" />
 </template>
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 3cdecdc..429acf5 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -53,7 +53,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index f599508..2c53a36 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -24,7 +24,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index 6af790b..f17af59 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -39,7 +39,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 6fa4355..d0e9936 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -27,7 +27,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.value.certificateValidStart = `${newVal[0]} 00:00:00`
     listQuery.value.certificateValidEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/task/index.vue b/src/views/tested/MeasurementPlan/task/index.vue
index 4ab62d9..aa759a8 100644
--- a/src/views/tested/MeasurementPlan/task/index.vue
+++ b/src/views/tested/MeasurementPlan/task/index.vue
@@ -17,7 +17,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createStartTime = `${newVal[0]} 00:00:00`
     listQuery.createEndTime = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index c7d63b8..67b4dac 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -99,7 +99,7 @@
 }
 const range = ref()
 watch(() => range.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.certificateValidStart = `${newVal[0]} 00:00:00`
     listQuery.certificateValidEnd = `${newVal[1]} 23:59:59`
   }

diff --git a/.env.development b/.env.development
index debe1a8..f2fee42 100644
--- a/.env.development
+++ b/.env.development
@@ -4,7 +4,7 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
-VITE_APP_API_BASEURL = http://127.0.0.1:5909
+VITE_APP_API_BASEURL = http://192.168.8.101:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..313fcf7 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://192.168.8.101:5909"
 }
diff --git a/src/api/eqpt/device/model.ts b/src/api/eqpt/device/model.ts
new file mode 100644
index 0000000..a8fa0f1
--- /dev/null
+++ b/src/api/eqpt/device/model.ts
@@ -0,0 +1,61 @@
+/**
+ * 设备型号规格管理相关
+ */
+import request from '@/api/index'
+
+// 列表
+export function getModelList(params: any) {
+  return request({
+    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}`,
+    method: 'post',
+    data: params,
+  })
+}
+// 列表-不分页
+export function getModelAllList(params: any) {
+  return request({
+    url: '/equipment/model/list',
+    method: 'post',
+    data: params,
+  })
+}
+// 设备名称列表/equipment/model/listEquipmentName
+export function getDeviceNameList(params: any) {
+  return request({
+    url: '/equipment/model/listEquipmentName',
+    method: 'get',
+    params,
+  })
+}
+// 导出
+export function exportModelList(data: any) {
+  return request({
+    url: '/equipment/model/export',
+    method: 'post',
+    data,
+  })
+}
+// 新建或编辑
+export function handlerFunApi(type: string, data: any) {
+  if (type === 'create') {
+    return request({
+      url: '/equipment/model/add',
+      method: 'post',
+      data,
+    })
+  }
+  else if (type === 'update') {
+    return request({
+      url: '/equipment/model/update',
+      method: 'post',
+      data,
+    })
+  }
+}
+// 删除
+export function deleteModel(data: any) {
+  return request({
+    url: `/equipment/model/delete?id=${data.id}`,
+    method: 'post',
+  })
+}
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 14ec12e..64e6f48 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -55,11 +55,12 @@
   // listQuery.value.offset = 1
   // }
   fetchApproval({ processId: listQuery.value.processId }).then((response) => {
+    console.log(response.data, 'response')
     response.data.forEach((item: Array<IList>, index: number) => {
       item.forEach((i: any) => {
         list.value.push({
           cindex: index,
-          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[i.cindex].nodeNumber + 1,
+          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[index - 1].nodeNumber + 1,
           assigneeName: i.assigneeName, // 姓名
           approvalStatus: i.approvalStatus, // 审批类型
           finishTime: i.finishTime ? i.finishTime : '-', // 完成时间
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index f08078d..aefbd8b 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -90,8 +90,16 @@
     type: String,
     default: 'default',
   }, // 表格大小，默认，small,mini等，与el-table条件相同
+  // 排序
+  sort: {
+    type: Object,
+    default() {
+      return {
+      }
+    },
+  },
 })
-const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'multiSelect'])
+const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'multiSelect', 'sortChange'])
 // -------定义数据--------------
 interface columnsCheckInfo {
   text: string
@@ -139,6 +147,10 @@
 function selectionChange(selection: []) {
   emit('selectionChange', selection)
 }
+// 点击排序
+function sortClick(column: any, prop: any, order: any) {
+  emit('sortChange', { column, prop, order })
+}
 // 点击行
 function rowClick(row: object, column?: any, event?: any) {
   emit('rowClick', row)
@@ -196,11 +208,13 @@
       border
       stripe
       :size="size"
+      :default-sort="props.sort"
       :show-header="showHeader"
       style="width: 100%;"
       @selection-change="handleSelectionChange"
       @select="selectClick"
       @row-click="rowClick"
+      @sort-change="sortClick"
     >
       <slot name="preColumns" />
 
@@ -210,7 +224,7 @@
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
+      <el-table-column v-for="column of columns" :key="column.value" :sortable="column.sortable" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
           <span v-else :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ column.filter(scope.row) }}</span>
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index 5cf6445..2cd73de 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -320,7 +320,7 @@
   {
     path: '/meteringdevice',
     component: Layout,
-    redirect: '/devicelist',
+    redirect: '/modellist',
     name: 'MeteringDevice',
     meta: {
       title: '设备台账',
@@ -329,6 +329,43 @@
     },
     children: [
       {
+        path: '/modellist',
+        component: Layout,
+        redirect: '/dmodel',
+        name: 'DeviceModel',
+        meta: {
+          title: '设备规格型号管理',
+          icon: 'ep:key',
+          auth: '/tested/device/model',
+        },
+        children: [
+          {
+            path: '/dmodel',
+            name: 'DeviceModelPage',
+            component: () => import('@/views/tested/device/model/index.vue'),
+            meta: {
+              title: '设备规格型号管理',
+              auth: '/tested/device/model',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/modellist',
+            },
+          },
+          {
+            path: '/dmodel/:type',
+            name: 'ModelEdit',
+            component: () => import('@/views/tested/device/model/components/edit.vue'),
+            meta: {
+              title: '设备规格型号管理',
+              auth: '/tested/device/model',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/modellist',
+            },
+          },
+        ],
+      },
+      {
         path: '/devicelist',
         component: Layout,
         redirect: '/dinfo',
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 6c9383f..879a207 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -158,7 +158,11 @@
 }
 // 批量删除
 const batchDeleteLabel = () => {
-  if (selectList.value.length) {
+  if (selectList.value.filter(item => item.usageStatusName === '已使用').length) {
+    ElMessage.warning('请选择未使用的标签')
+    return
+  }
+  if (selectList.value.filter(item => item.usageStatusName !== '已使用').length) {
     ElMessageBox.confirm(
       '确认删除所选数据吗？',
       '提示',
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index 60d55d6..ba91cbf 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -25,7 +25,7 @@
   offset: 1,
 }) // 查询参数
 watch(() => noticeTime.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     searchQuery.noticeStartTime = `${newVal[0]} 00:00:00`
     searchQuery.noticeEndTime = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/system/signature/autograph.vue b/src/views/system/signature/autograph.vue
index e5a32c8..9c1d0ca 100644
--- a/src/views/system/signature/autograph.vue
+++ b/src/views/system/signature/autograph.vue
@@ -23,7 +23,7 @@
   ids: [],
 }) // 查询参数
 watch(() => createTime.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     searchQuery.createStartTime = `${newVal[0]} 00:00:00`
     searchQuery.createEndTime = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 5f57089..b557683 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -16,7 +16,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index 8f31905..e140eaa 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.applicantTimeStart = `${newVal[0]} 00:00:00`
     listQuery.applicantTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/opinion/index.vue b/src/views/tested/MeasurementBusiness/opinion/index.vue
index 6c7e13c..c6683c0 100644
--- a/src/views/tested/MeasurementBusiness/opinion/index.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue
index b15f27b..e204a69 100644
--- a/src/views/tested/MeasurementBusiness/review/index.vue
+++ b/src/views/tested/MeasurementBusiness/review/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
@@ -76,21 +76,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
-  // getListPage(listQuery).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   listLoading.value = false
-  // })
-  list.value = [{
-    formNo: '12345',
-    formName: '评审表1',
-    labCode: '海口实验室',
-    groupCode: '组别1',
-    signStatusName: '同意',
-    createUserName: '张三',
-    createTime: '2023-09-05',
-  }]
-  listLoading.value = false
+  getListPage(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  })
 }
 fetchData()
 // 查询数据
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 0e2fd1c..217365a 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -14,7 +14,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.sendTimeStart = `${newVal[0]} 00:00:00`
     listQuery.sendTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index e117705..e2d0ea2 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -12,6 +12,7 @@
     required: true,
   },
 })
+const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
 const userStore = useUserStore()
 const listQuery = reactive({
@@ -20,8 +21,8 @@
   createTimeEnd: '',
   createTimeStart: '',
   notifyType: $props.notifyType, // 通知类型(负责人/部门，字典值)
-  notifyDept: userStore.deptId,
-  notifyUser: userStore.id,
+  notifyDept: $route.path.includes('curatorpage') ? '' : userStore.deptId,
+  notifyUser: $route.path.includes('curatorpage') ? userStore.id : '',
   offset: 1,
   limit: 20,
 })
@@ -30,7 +31,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/dept/index.vue b/src/views/tested/MeasurementPlan/dept/index.vue
index aafe5e1..a25835f 100644
--- a/src/views/tested/MeasurementPlan/dept/index.vue
+++ b/src/views/tested/MeasurementPlan/dept/index.vue
@@ -5,5 +5,5 @@
 
 <template>
   <!-- notifyType 通知类型(负责人/部门，字典值) -->
-  <page notify-type="1" />
+  <page notify-type="2" />
 </template>
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 3cdecdc..429acf5 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -53,7 +53,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index f599508..2c53a36 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -24,7 +24,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index 6af790b..f17af59 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -39,7 +39,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 6fa4355..d0e9936 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -27,7 +27,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.value.certificateValidStart = `${newVal[0]} 00:00:00`
     listQuery.value.certificateValidEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/task/index.vue b/src/views/tested/MeasurementPlan/task/index.vue
index 4ab62d9..aa759a8 100644
--- a/src/views/tested/MeasurementPlan/task/index.vue
+++ b/src/views/tested/MeasurementPlan/task/index.vue
@@ -17,7 +17,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createStartTime = `${newVal[0]} 00:00:00`
     listQuery.createEndTime = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index c7d63b8..67b4dac 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -99,7 +99,7 @@
 }
 const range = ref()
 watch(() => range.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.certificateValidStart = `${newVal[0]} 00:00:00`
     listQuery.certificateValidEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index 5d8d328..af479a6 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -41,7 +41,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.value.certificateValidStart = `${newVal[0]} 00:00:00`
     listQuery.value.certificateValidEnd = `${newVal[1]} 23:59:59`
   }

diff --git a/.env.development b/.env.development
index debe1a8..f2fee42 100644
--- a/.env.development
+++ b/.env.development
@@ -4,7 +4,7 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
-VITE_APP_API_BASEURL = http://127.0.0.1:5909
+VITE_APP_API_BASEURL = http://192.168.8.101:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..313fcf7 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://192.168.8.101:5909"
 }
diff --git a/src/api/eqpt/device/model.ts b/src/api/eqpt/device/model.ts
new file mode 100644
index 0000000..a8fa0f1
--- /dev/null
+++ b/src/api/eqpt/device/model.ts
@@ -0,0 +1,61 @@
+/**
+ * 设备型号规格管理相关
+ */
+import request from '@/api/index'
+
+// 列表
+export function getModelList(params: any) {
+  return request({
+    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}`,
+    method: 'post',
+    data: params,
+  })
+}
+// 列表-不分页
+export function getModelAllList(params: any) {
+  return request({
+    url: '/equipment/model/list',
+    method: 'post',
+    data: params,
+  })
+}
+// 设备名称列表/equipment/model/listEquipmentName
+export function getDeviceNameList(params: any) {
+  return request({
+    url: '/equipment/model/listEquipmentName',
+    method: 'get',
+    params,
+  })
+}
+// 导出
+export function exportModelList(data: any) {
+  return request({
+    url: '/equipment/model/export',
+    method: 'post',
+    data,
+  })
+}
+// 新建或编辑
+export function handlerFunApi(type: string, data: any) {
+  if (type === 'create') {
+    return request({
+      url: '/equipment/model/add',
+      method: 'post',
+      data,
+    })
+  }
+  else if (type === 'update') {
+    return request({
+      url: '/equipment/model/update',
+      method: 'post',
+      data,
+    })
+  }
+}
+// 删除
+export function deleteModel(data: any) {
+  return request({
+    url: `/equipment/model/delete?id=${data.id}`,
+    method: 'post',
+  })
+}
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 14ec12e..64e6f48 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -55,11 +55,12 @@
   // listQuery.value.offset = 1
   // }
   fetchApproval({ processId: listQuery.value.processId }).then((response) => {
+    console.log(response.data, 'response')
     response.data.forEach((item: Array<IList>, index: number) => {
       item.forEach((i: any) => {
         list.value.push({
           cindex: index,
-          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[i.cindex].nodeNumber + 1,
+          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[index - 1].nodeNumber + 1,
           assigneeName: i.assigneeName, // 姓名
           approvalStatus: i.approvalStatus, // 审批类型
           finishTime: i.finishTime ? i.finishTime : '-', // 完成时间
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index f08078d..aefbd8b 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -90,8 +90,16 @@
     type: String,
     default: 'default',
   }, // 表格大小，默认，small,mini等，与el-table条件相同
+  // 排序
+  sort: {
+    type: Object,
+    default() {
+      return {
+      }
+    },
+  },
 })
-const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'multiSelect'])
+const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'multiSelect', 'sortChange'])
 // -------定义数据--------------
 interface columnsCheckInfo {
   text: string
@@ -139,6 +147,10 @@
 function selectionChange(selection: []) {
   emit('selectionChange', selection)
 }
+// 点击排序
+function sortClick(column: any, prop: any, order: any) {
+  emit('sortChange', { column, prop, order })
+}
 // 点击行
 function rowClick(row: object, column?: any, event?: any) {
   emit('rowClick', row)
@@ -196,11 +208,13 @@
       border
       stripe
       :size="size"
+      :default-sort="props.sort"
       :show-header="showHeader"
       style="width: 100%;"
       @selection-change="handleSelectionChange"
       @select="selectClick"
       @row-click="rowClick"
+      @sort-change="sortClick"
     >
       <slot name="preColumns" />
 
@@ -210,7 +224,7 @@
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
+      <el-table-column v-for="column of columns" :key="column.value" :sortable="column.sortable" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
           <span v-else :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ column.filter(scope.row) }}</span>
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index 5cf6445..2cd73de 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -320,7 +320,7 @@
   {
     path: '/meteringdevice',
     component: Layout,
-    redirect: '/devicelist',
+    redirect: '/modellist',
     name: 'MeteringDevice',
     meta: {
       title: '设备台账',
@@ -329,6 +329,43 @@
     },
     children: [
       {
+        path: '/modellist',
+        component: Layout,
+        redirect: '/dmodel',
+        name: 'DeviceModel',
+        meta: {
+          title: '设备规格型号管理',
+          icon: 'ep:key',
+          auth: '/tested/device/model',
+        },
+        children: [
+          {
+            path: '/dmodel',
+            name: 'DeviceModelPage',
+            component: () => import('@/views/tested/device/model/index.vue'),
+            meta: {
+              title: '设备规格型号管理',
+              auth: '/tested/device/model',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/modellist',
+            },
+          },
+          {
+            path: '/dmodel/:type',
+            name: 'ModelEdit',
+            component: () => import('@/views/tested/device/model/components/edit.vue'),
+            meta: {
+              title: '设备规格型号管理',
+              auth: '/tested/device/model',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/modellist',
+            },
+          },
+        ],
+      },
+      {
         path: '/devicelist',
         component: Layout,
         redirect: '/dinfo',
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 6c9383f..879a207 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -158,7 +158,11 @@
 }
 // 批量删除
 const batchDeleteLabel = () => {
-  if (selectList.value.length) {
+  if (selectList.value.filter(item => item.usageStatusName === '已使用').length) {
+    ElMessage.warning('请选择未使用的标签')
+    return
+  }
+  if (selectList.value.filter(item => item.usageStatusName !== '已使用').length) {
     ElMessageBox.confirm(
       '确认删除所选数据吗？',
       '提示',
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index 60d55d6..ba91cbf 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -25,7 +25,7 @@
   offset: 1,
 }) // 查询参数
 watch(() => noticeTime.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     searchQuery.noticeStartTime = `${newVal[0]} 00:00:00`
     searchQuery.noticeEndTime = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/system/signature/autograph.vue b/src/views/system/signature/autograph.vue
index e5a32c8..9c1d0ca 100644
--- a/src/views/system/signature/autograph.vue
+++ b/src/views/system/signature/autograph.vue
@@ -23,7 +23,7 @@
   ids: [],
 }) // 查询参数
 watch(() => createTime.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     searchQuery.createStartTime = `${newVal[0]} 00:00:00`
     searchQuery.createEndTime = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 5f57089..b557683 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -16,7 +16,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index 8f31905..e140eaa 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.applicantTimeStart = `${newVal[0]} 00:00:00`
     listQuery.applicantTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/opinion/index.vue b/src/views/tested/MeasurementBusiness/opinion/index.vue
index 6c7e13c..c6683c0 100644
--- a/src/views/tested/MeasurementBusiness/opinion/index.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue
index b15f27b..e204a69 100644
--- a/src/views/tested/MeasurementBusiness/review/index.vue
+++ b/src/views/tested/MeasurementBusiness/review/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
@@ -76,21 +76,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
-  // getListPage(listQuery).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   listLoading.value = false
-  // })
-  list.value = [{
-    formNo: '12345',
-    formName: '评审表1',
-    labCode: '海口实验室',
-    groupCode: '组别1',
-    signStatusName: '同意',
-    createUserName: '张三',
-    createTime: '2023-09-05',
-  }]
-  listLoading.value = false
+  getListPage(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  })
 }
 fetchData()
 // 查询数据
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 0e2fd1c..217365a 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -14,7 +14,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.sendTimeStart = `${newVal[0]} 00:00:00`
     listQuery.sendTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index e117705..e2d0ea2 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -12,6 +12,7 @@
     required: true,
   },
 })
+const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
 const userStore = useUserStore()
 const listQuery = reactive({
@@ -20,8 +21,8 @@
   createTimeEnd: '',
   createTimeStart: '',
   notifyType: $props.notifyType, // 通知类型(负责人/部门，字典值)
-  notifyDept: userStore.deptId,
-  notifyUser: userStore.id,
+  notifyDept: $route.path.includes('curatorpage') ? '' : userStore.deptId,
+  notifyUser: $route.path.includes('curatorpage') ? userStore.id : '',
   offset: 1,
   limit: 20,
 })
@@ -30,7 +31,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/dept/index.vue b/src/views/tested/MeasurementPlan/dept/index.vue
index aafe5e1..a25835f 100644
--- a/src/views/tested/MeasurementPlan/dept/index.vue
+++ b/src/views/tested/MeasurementPlan/dept/index.vue
@@ -5,5 +5,5 @@
 
 <template>
   <!-- notifyType 通知类型(负责人/部门，字典值) -->
-  <page notify-type="1" />
+  <page notify-type="2" />
 </template>
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 3cdecdc..429acf5 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -53,7 +53,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index f599508..2c53a36 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -24,7 +24,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index 6af790b..f17af59 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -39,7 +39,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 6fa4355..d0e9936 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -27,7 +27,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.value.certificateValidStart = `${newVal[0]} 00:00:00`
     listQuery.value.certificateValidEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/task/index.vue b/src/views/tested/MeasurementPlan/task/index.vue
index 4ab62d9..aa759a8 100644
--- a/src/views/tested/MeasurementPlan/task/index.vue
+++ b/src/views/tested/MeasurementPlan/task/index.vue
@@ -17,7 +17,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createStartTime = `${newVal[0]} 00:00:00`
     listQuery.createEndTime = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index c7d63b8..67b4dac 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -99,7 +99,7 @@
 }
 const range = ref()
 watch(() => range.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.certificateValidStart = `${newVal[0]} 00:00:00`
     listQuery.certificateValidEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index 5d8d328..af479a6 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -41,7 +41,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.value.certificateValidStart = `${newVal[0]} 00:00:00`
     listQuery.value.certificateValidEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/device/group/components/tableList.vue b/src/views/tested/device/group/components/tableList.vue
index d1f60ce..f1b817a 100644
--- a/src/views/tested/device/group/components/tableList.vue
+++ b/src/views/tested/device/group/components/tableList.vue
@@ -177,7 +177,16 @@
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
           <el-input
-            v-if="scope.row.editable && !item.isSelect" v-model="scope.row[item.value]" :autofocus="true"
+            v-if="scope.row.editable && !item.isSelect && item.text === '设备名称'" v-model="scope.row[item.value]" :autofocus="true"
+            :placeholder="`${item.text}`" class="input"
+            @focus="select(item.text, scope.$index)"
+          >
+            <template #append>
+              <span @click="select(item.text, scope.$index)">选择</span>
+            </template>
+          </el-input>
+          <el-input
+            v-if="scope.row.editable && !item.isSelect && item.text !== '设备名称'" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
             @focus="select(item.text, scope.$index)"
           />

diff --git a/.env.development b/.env.development
index debe1a8..f2fee42 100644
--- a/.env.development
+++ b/.env.development
@@ -4,7 +4,7 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
-VITE_APP_API_BASEURL = http://127.0.0.1:5909
+VITE_APP_API_BASEURL = http://192.168.8.101:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..313fcf7 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://192.168.8.101:5909"
 }
diff --git a/src/api/eqpt/device/model.ts b/src/api/eqpt/device/model.ts
new file mode 100644
index 0000000..a8fa0f1
--- /dev/null
+++ b/src/api/eqpt/device/model.ts
@@ -0,0 +1,61 @@
+/**
+ * 设备型号规格管理相关
+ */
+import request from '@/api/index'
+
+// 列表
+export function getModelList(params: any) {
+  return request({
+    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}`,
+    method: 'post',
+    data: params,
+  })
+}
+// 列表-不分页
+export function getModelAllList(params: any) {
+  return request({
+    url: '/equipment/model/list',
+    method: 'post',
+    data: params,
+  })
+}
+// 设备名称列表/equipment/model/listEquipmentName
+export function getDeviceNameList(params: any) {
+  return request({
+    url: '/equipment/model/listEquipmentName',
+    method: 'get',
+    params,
+  })
+}
+// 导出
+export function exportModelList(data: any) {
+  return request({
+    url: '/equipment/model/export',
+    method: 'post',
+    data,
+  })
+}
+// 新建或编辑
+export function handlerFunApi(type: string, data: any) {
+  if (type === 'create') {
+    return request({
+      url: '/equipment/model/add',
+      method: 'post',
+      data,
+    })
+  }
+  else if (type === 'update') {
+    return request({
+      url: '/equipment/model/update',
+      method: 'post',
+      data,
+    })
+  }
+}
+// 删除
+export function deleteModel(data: any) {
+  return request({
+    url: `/equipment/model/delete?id=${data.id}`,
+    method: 'post',
+  })
+}
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 14ec12e..64e6f48 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -55,11 +55,12 @@
   // listQuery.value.offset = 1
   // }
   fetchApproval({ processId: listQuery.value.processId }).then((response) => {
+    console.log(response.data, 'response')
     response.data.forEach((item: Array<IList>, index: number) => {
       item.forEach((i: any) => {
         list.value.push({
           cindex: index,
-          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[i.cindex].nodeNumber + 1,
+          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[index - 1].nodeNumber + 1,
           assigneeName: i.assigneeName, // 姓名
           approvalStatus: i.approvalStatus, // 审批类型
           finishTime: i.finishTime ? i.finishTime : '-', // 完成时间
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index f08078d..aefbd8b 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -90,8 +90,16 @@
     type: String,
     default: 'default',
   }, // 表格大小，默认，small,mini等，与el-table条件相同
+  // 排序
+  sort: {
+    type: Object,
+    default() {
+      return {
+      }
+    },
+  },
 })
-const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'multiSelect'])
+const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'multiSelect', 'sortChange'])
 // -------定义数据--------------
 interface columnsCheckInfo {
   text: string
@@ -139,6 +147,10 @@
 function selectionChange(selection: []) {
   emit('selectionChange', selection)
 }
+// 点击排序
+function sortClick(column: any, prop: any, order: any) {
+  emit('sortChange', { column, prop, order })
+}
 // 点击行
 function rowClick(row: object, column?: any, event?: any) {
   emit('rowClick', row)
@@ -196,11 +208,13 @@
       border
       stripe
       :size="size"
+      :default-sort="props.sort"
       :show-header="showHeader"
       style="width: 100%;"
       @selection-change="handleSelectionChange"
       @select="selectClick"
       @row-click="rowClick"
+      @sort-change="sortClick"
     >
       <slot name="preColumns" />
 
@@ -210,7 +224,7 @@
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
+      <el-table-column v-for="column of columns" :key="column.value" :sortable="column.sortable" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
           <span v-else :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ column.filter(scope.row) }}</span>
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index 5cf6445..2cd73de 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -320,7 +320,7 @@
   {
     path: '/meteringdevice',
     component: Layout,
-    redirect: '/devicelist',
+    redirect: '/modellist',
     name: 'MeteringDevice',
     meta: {
       title: '设备台账',
@@ -329,6 +329,43 @@
     },
     children: [
       {
+        path: '/modellist',
+        component: Layout,
+        redirect: '/dmodel',
+        name: 'DeviceModel',
+        meta: {
+          title: '设备规格型号管理',
+          icon: 'ep:key',
+          auth: '/tested/device/model',
+        },
+        children: [
+          {
+            path: '/dmodel',
+            name: 'DeviceModelPage',
+            component: () => import('@/views/tested/device/model/index.vue'),
+            meta: {
+              title: '设备规格型号管理',
+              auth: '/tested/device/model',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/modellist',
+            },
+          },
+          {
+            path: '/dmodel/:type',
+            name: 'ModelEdit',
+            component: () => import('@/views/tested/device/model/components/edit.vue'),
+            meta: {
+              title: '设备规格型号管理',
+              auth: '/tested/device/model',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/modellist',
+            },
+          },
+        ],
+      },
+      {
         path: '/devicelist',
         component: Layout,
         redirect: '/dinfo',
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 6c9383f..879a207 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -158,7 +158,11 @@
 }
 // 批量删除
 const batchDeleteLabel = () => {
-  if (selectList.value.length) {
+  if (selectList.value.filter(item => item.usageStatusName === '已使用').length) {
+    ElMessage.warning('请选择未使用的标签')
+    return
+  }
+  if (selectList.value.filter(item => item.usageStatusName !== '已使用').length) {
     ElMessageBox.confirm(
       '确认删除所选数据吗？',
       '提示',
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index 60d55d6..ba91cbf 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -25,7 +25,7 @@
   offset: 1,
 }) // 查询参数
 watch(() => noticeTime.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     searchQuery.noticeStartTime = `${newVal[0]} 00:00:00`
     searchQuery.noticeEndTime = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/system/signature/autograph.vue b/src/views/system/signature/autograph.vue
index e5a32c8..9c1d0ca 100644
--- a/src/views/system/signature/autograph.vue
+++ b/src/views/system/signature/autograph.vue
@@ -23,7 +23,7 @@
   ids: [],
 }) // 查询参数
 watch(() => createTime.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     searchQuery.createStartTime = `${newVal[0]} 00:00:00`
     searchQuery.createEndTime = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 5f57089..b557683 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -16,7 +16,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index 8f31905..e140eaa 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.applicantTimeStart = `${newVal[0]} 00:00:00`
     listQuery.applicantTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/opinion/index.vue b/src/views/tested/MeasurementBusiness/opinion/index.vue
index 6c7e13c..c6683c0 100644
--- a/src/views/tested/MeasurementBusiness/opinion/index.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue
index b15f27b..e204a69 100644
--- a/src/views/tested/MeasurementBusiness/review/index.vue
+++ b/src/views/tested/MeasurementBusiness/review/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
@@ -76,21 +76,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
-  // getListPage(listQuery).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   listLoading.value = false
-  // })
-  list.value = [{
-    formNo: '12345',
-    formName: '评审表1',
-    labCode: '海口实验室',
-    groupCode: '组别1',
-    signStatusName: '同意',
-    createUserName: '张三',
-    createTime: '2023-09-05',
-  }]
-  listLoading.value = false
+  getListPage(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  })
 }
 fetchData()
 // 查询数据
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 0e2fd1c..217365a 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -14,7 +14,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.sendTimeStart = `${newVal[0]} 00:00:00`
     listQuery.sendTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index e117705..e2d0ea2 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -12,6 +12,7 @@
     required: true,
   },
 })
+const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
 const userStore = useUserStore()
 const listQuery = reactive({
@@ -20,8 +21,8 @@
   createTimeEnd: '',
   createTimeStart: '',
   notifyType: $props.notifyType, // 通知类型(负责人/部门，字典值)
-  notifyDept: userStore.deptId,
-  notifyUser: userStore.id,
+  notifyDept: $route.path.includes('curatorpage') ? '' : userStore.deptId,
+  notifyUser: $route.path.includes('curatorpage') ? userStore.id : '',
   offset: 1,
   limit: 20,
 })
@@ -30,7 +31,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/dept/index.vue b/src/views/tested/MeasurementPlan/dept/index.vue
index aafe5e1..a25835f 100644
--- a/src/views/tested/MeasurementPlan/dept/index.vue
+++ b/src/views/tested/MeasurementPlan/dept/index.vue
@@ -5,5 +5,5 @@
 
 <template>
   <!-- notifyType 通知类型(负责人/部门，字典值) -->
-  <page notify-type="1" />
+  <page notify-type="2" />
 </template>
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 3cdecdc..429acf5 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -53,7 +53,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index f599508..2c53a36 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -24,7 +24,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index 6af790b..f17af59 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -39,7 +39,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 6fa4355..d0e9936 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -27,7 +27,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.value.certificateValidStart = `${newVal[0]} 00:00:00`
     listQuery.value.certificateValidEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/task/index.vue b/src/views/tested/MeasurementPlan/task/index.vue
index 4ab62d9..aa759a8 100644
--- a/src/views/tested/MeasurementPlan/task/index.vue
+++ b/src/views/tested/MeasurementPlan/task/index.vue
@@ -17,7 +17,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createStartTime = `${newVal[0]} 00:00:00`
     listQuery.createEndTime = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index c7d63b8..67b4dac 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -99,7 +99,7 @@
 }
 const range = ref()
 watch(() => range.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.certificateValidStart = `${newVal[0]} 00:00:00`
     listQuery.certificateValidEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index 5d8d328..af479a6 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -41,7 +41,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.value.certificateValidStart = `${newVal[0]} 00:00:00`
     listQuery.value.certificateValidEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/device/group/components/tableList.vue b/src/views/tested/device/group/components/tableList.vue
index d1f60ce..f1b817a 100644
--- a/src/views/tested/device/group/components/tableList.vue
+++ b/src/views/tested/device/group/components/tableList.vue
@@ -177,7 +177,16 @@
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
           <el-input
-            v-if="scope.row.editable && !item.isSelect" v-model="scope.row[item.value]" :autofocus="true"
+            v-if="scope.row.editable && !item.isSelect && item.text === '设备名称'" v-model="scope.row[item.value]" :autofocus="true"
+            :placeholder="`${item.text}`" class="input"
+            @focus="select(item.text, scope.$index)"
+          >
+            <template #append>
+              <span @click="select(item.text, scope.$index)">选择</span>
+            </template>
+          </el-input>
+          <el-input
+            v-if="scope.row.editable && !item.isSelect && item.text !== '设备名称'" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
             @focus="select(item.text, scope.$index)"
           />
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 7443364..db05d4d 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -50,6 +50,7 @@
     text: '统一编号',
     value: 'equipmentNo',
     align: 'center',
+    sortable: 'custom',
   },
   {
     text: '设备名称',
@@ -60,11 +61,13 @@
     text: '型号规格',
     value: 'model',
     align: 'center',
+    sortable: 'custom',
   },
   {
     text: '出厂编号',
     value: 'manufactureNo',
     align: 'center',
+    sortable: 'custom',
   },
   {
     text: '使用岗位',
@@ -85,6 +88,7 @@
     text: '证书有效期',
     value: 'certificateValid',
     align: 'center',
+    sortable: 'custom',
   },
 ])
 const allColums = ref([
@@ -92,6 +96,7 @@
     text: '使用状态',
     value: 'usageStatusName',
     align: 'center',
+    sortable: 'custom',
   },
   {
     text: '备注',
@@ -121,6 +126,21 @@
     align: 'center',
   },
 ])
+// 排序条件发生变化
+const sortChange = ({ column }: any) => {
+  if (column.order === 'ascending') {
+    console.log(column.prop)
+    console.log('升序')
+  }
+  else if (column.order === 'descending') {
+    console.log(column.prop)
+    console.log('倒叙')
+  }
+}
+// 聚合表格实例
+const togetherTableRef = ref()
+// 展开表格实例
+const expandTableRef = ref()
 const list = ref([])
 const total = ref(0)
 const listLoading = ref(true)
@@ -157,7 +177,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.certificateValidStart = `${newVal[0]} 00:00:00`
     listQuery.certificateValidEnd = `${newVal[1]} 23:59:59`
   }
@@ -209,12 +229,29 @@
   expandLoading.value = true
   getInfoList(params).then((res) => {
     expandList.value = res.data
+    // 获取聚合表格选中，判断展开表格是否需要全选
+    const selectList = togetherTableRef.value.getSelectionRows()
+    if (selectList.length) {
+      const select = selectList.filter((item: any) => item.equipmentName === params.equipmentName)
+      if (select.length) {
+        nextTick(() => {
+          expandTableRef.value.toggleAllSelection()
+        })
+      }
+    }
     expandLoading.value = false
   })
 }
 const getRowKeys = (row: any) => { // 获取当前行id
   return row.equipmentName // 这里看这一行中需要根据哪个属性值是id
 }
+// 监听聚合表格多选
+// watch(() => togetherTableRef.value?.getSelectionRows(), (newVal, oldVal) => {
+//   console.log(newVal, 'newVal')
+// }, {
+//   deep: true,
+// })
+
 // 表格被选中的行
 const selectList = ref<any[]>([])
 // 表格多选
@@ -240,6 +277,48 @@
 {
   deep: true,
 })
+const togetherSelect = (selection: any, row: any) => {
+  if (selection.includes(row)) {
+    // 勾选
+    console.log('勾选')
+    if (expands.value && expands.value[0] === row.equipmentName) {
+      expandTableRef.value.toggleAllSelection()
+    }
+  }
+  else {
+    // 取消勾选
+    console.log('取消勾选')
+    if (expands.value && expands.value[0] === row.equipmentName) {
+      expandTableRef.value.toggleAllSelection()
+    }
+  }
+}
+const expandSelect = (selection: any, row: any) => {
+  if (selection.length === expandList.value.length) {
+    // 全选
+    console.log('全选')
+    // 获取聚合
+    console.log(expands.value[0])
+    const data = togetherList.value.filter((item: any) => item.equipmentName === expands.value[0])
+    console.log(data)
+    if (data.length) {
+      nextTick(() => {
+        togetherTableRef.value.toggleRowSelection(data[0], true)
+      })
+    }
+  }
+  else {
+    // 全不选
+    console.log('全不选')
+    // 获取聚合
+    const data = togetherList.value.filter((item: any) => item.equipmentName === expands.value[0])
+    if (data.length) {
+      nextTick(() => {
+        togetherTableRef.value.toggleRowSelection(data[0], false)
+      })
+    }
+  }
+}
 const $router = useRouter()
 // 新建编辑操作
 const handler = (row: IlistObjType, type: string) => {
@@ -497,7 +576,7 @@
       <template v-if="$props.statusName === '全部'" #btns-right>
         <icon-button icon="icon-change" title="切换列表状态" @click="changeTable" />
         <icon-button icon="icon-sweep" title="扫描" />
-        <icon-button icon="icon-add" title="新增" @click="handler({}, 'create')" />
+        <icon-button icon="icon-add" title="新增" @click="handler({} as any, 'create')" />
         <icon-button icon="icon-import" title="批量导入" @click="importList" />
         <icon-button icon="icon-template" title="模板下载" @click="useTemplateDownload('设备信息管理模块')" />
         <icon-button icon="icon-export" title="导出" @click="exportList" />
@@ -508,30 +587,29 @@
         <normal-table
           v-show=" tableFlage "
           ref="normalTableRef" :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="listLoading" :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
+          :list-loading="listLoading"
+          :is-showmulti-select="true" :is-multi="true" @sort-change="sortChange" @change="changePage" @multi-select="multiSelect"
         >
           <template #columns>
             <!-- 全部状态 -->
-            <el-table-column
-              v-for=" column of allColums " :key=" column.value "
-              :label=" column.text " :prop=" column.value " :align=" column.align "
-              :show-overflow-tooltip="true"
-            >
-              <template v-if="$props.statusName === '全部' " #default=" scope ">
-                <span>{{ scope.row[column.value] }}</span>
-              </template>
-            </el-table-column>
+            <template v-if="$props.statusName === '全部' ">
+              <el-table-column
+                v-for=" column of allColums " :key=" column.value "
+                :label=" column.text " :prop=" column.value " :align=" column.align "
+                :show-overflow-tooltip="true"
+                :sortable="column.sortable"
+              />
+            </template>
             <!-- 其他审批状态 -->
-            <el-table-column
-              v-for=" column of otherColums " :key="column.value" :label=" column.text "
-              :prop=" column.value " :align=" column.align "
-              :show-overflow-tooltip="true"
-            >
-              <template v-if="$props.statusName !== '全部' " #default=" scope ">
-                <span>
-                  {{ scope.row[column.value] }}</span>
-              </template>
-            </el-table-column>
+            <template v-if="$props.statusName !== '全部' ">
+              <el-table-column
+                v-for=" column of otherColums " :key="column.value"
+                :label=" column.text "
+                :prop=" column.value " :align=" column.align "
+                :show-overflow-tooltip="true"
+              />
+            </template>
+
             <el-table-column label="操作" width="160" align="center">
               <template #default=" scope ">
                 <el-button link type="primary" size="small" @click="detail(scope.row)">
@@ -580,6 +658,7 @@
       </div>
       <div v-if=" !tableFlage ">
         <!-- 展开行表格 -->
+        <!-- 头部 -->
         <normal-table
           v-show=" !tableFlage " class="nortable-header" :data=" [] " :total=" 0 " :columns=" columns " :options="
             {
@@ -587,12 +666,23 @@
               border: true, // 是否需要上方边框
             }
           " :pagination=" false " :is-showmulti-select=" true " :query="{}"
-        />
-        <el-table
-          v-show=" !tableFlage " v-loading=" togetherLoading " :data=" togetherList " border style="width: 100%;"
-          :row-key=" getRowKeys " :expand-row-keys=" expands " :show-header=" false " @expand-change=" expandChange "
         >
+          <template #columns>
+            <el-table-column label="操作" width="160" align="center" />
+          </template>
+        </normal-table>
+        <!-- 身体 -->
+        <el-table
+          v-show=" !tableFlage "
+          ref="togetherTableRef" v-loading=" togetherLoading " :data=" togetherList " border style="width: 100%;"
+          :row-key=" getRowKeys " :expand-row-keys=" expands " :show-header=" false " @expand-change=" expandChange "
+          @select="togetherSelect"
+        >
+          <el-table-column type="selection" width="38" />
           <el-table-column type="expand">
+            <template #default="props">
+              <!-- 展开表格身体 -->
+              <!-- <normal-table
             <template #default>
               <normal-table
                 :data=" expandList " :total=" 0 " :columns=" columns " :list-loading=" expandLoading " :options="
@@ -601,7 +691,58 @@
                     border: true, // 是否需要上方边框
                   }
                 " :pagination=" false " :is-showmulti-select=" true " :show-header=" false " :query="{}"
-              />
+              /> -->
+              <el-table
+                ref="expandTableRef"
+                v-loading=" expandLoading " :data=" expandList " border style="width: 100%;"
+                :show-header=" false " @select="expandSelect"
+              >
+                <el-table-column type="selection" width="38" />
+                <el-table-column v-for="item in columns" :key="item.value" :labe="item.text" :prop="item.value" align="center" />
+                <el-table-column label="操作" width="160" align="center">
+                  <template #default=" scope ">
+                    <el-button link type="primary" size="small" @click="detail(scope.row)">
+                      查看
+                    </el-button>
+                    <el-button
+                      v-if="proxy.buttonPerm.edit.if({ approvalStatusName: $props.statusName }, permUrl.edit)" link type="primary" size="small"
+                      @click="handler(scope.row, 'update')"
+                    >
+                      编辑
+                    </el-button>
+                    <el-button
+                      v-if="proxy.buttonPerm.agree.if({ approvalStatusName: $props.statusName }, permUrl.agree)" link type="primary" size="small"
+                      @click="approveHandler(scope.row, 'agree')"
+                    >
+                      同意
+                    </el-button>
+                    <el-button
+                      v-if="proxy.buttonPerm.reject.if({ approvalStatusName: $props.statusName }, permUrl.reject)" link type="primary" size="small"
+                      @click="approveHandler(scope.row, 'refuse')"
+                    >
+                      拒绝
+                    </el-button>
+                    <el-button
+                      v-if="proxy.buttonPerm.submit.if({ approvalStatusName: $props.statusName }, permUrl.submit)" link type="primary" size="small"
+                      @click="submit(scope.row)"
+                    >
+                      提交
+                    </el-button>
+                    <el-button
+                      v-if="proxy.buttonPerm.cancel.if({ approvalStatusName: $props.statusName }, permUrl.cancel)" link type="primary" size="small"
+                      @click="canHandler(scope.row)"
+                    >
+                      取消
+                    </el-button>
+                    <el-button
+                      v-if="proxy.buttonPerm.delete.if({ approvalStatusName: $props.statusName }, permUrl.del)" link type="danger" size="small"
+                      @click="delHandler(scope.row)"
+                    >
+                      删除
+                    </el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
             </template>
           </el-table-column>
           <el-table-column label="设备名称" prop="equipmentName" align="center" />

diff --git a/.env.development b/.env.development
index debe1a8..f2fee42 100644
--- a/.env.development
+++ b/.env.development
@@ -4,7 +4,7 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
-VITE_APP_API_BASEURL = http://127.0.0.1:5909
+VITE_APP_API_BASEURL = http://192.168.8.101:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..313fcf7 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://192.168.8.101:5909"
 }
diff --git a/src/api/eqpt/device/model.ts b/src/api/eqpt/device/model.ts
new file mode 100644
index 0000000..a8fa0f1
--- /dev/null
+++ b/src/api/eqpt/device/model.ts
@@ -0,0 +1,61 @@
+/**
+ * 设备型号规格管理相关
+ */
+import request from '@/api/index'
+
+// 列表
+export function getModelList(params: any) {
+  return request({
+    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}`,
+    method: 'post',
+    data: params,
+  })
+}
+// 列表-不分页
+export function getModelAllList(params: any) {
+  return request({
+    url: '/equipment/model/list',
+    method: 'post',
+    data: params,
+  })
+}
+// 设备名称列表/equipment/model/listEquipmentName
+export function getDeviceNameList(params: any) {
+  return request({
+    url: '/equipment/model/listEquipmentName',
+    method: 'get',
+    params,
+  })
+}
+// 导出
+export function exportModelList(data: any) {
+  return request({
+    url: '/equipment/model/export',
+    method: 'post',
+    data,
+  })
+}
+// 新建或编辑
+export function handlerFunApi(type: string, data: any) {
+  if (type === 'create') {
+    return request({
+      url: '/equipment/model/add',
+      method: 'post',
+      data,
+    })
+  }
+  else if (type === 'update') {
+    return request({
+      url: '/equipment/model/update',
+      method: 'post',
+      data,
+    })
+  }
+}
+// 删除
+export function deleteModel(data: any) {
+  return request({
+    url: `/equipment/model/delete?id=${data.id}`,
+    method: 'post',
+  })
+}
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 14ec12e..64e6f48 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -55,11 +55,12 @@
   // listQuery.value.offset = 1
   // }
   fetchApproval({ processId: listQuery.value.processId }).then((response) => {
+    console.log(response.data, 'response')
     response.data.forEach((item: Array<IList>, index: number) => {
       item.forEach((i: any) => {
         list.value.push({
           cindex: index,
-          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[i.cindex].nodeNumber + 1,
+          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[index - 1].nodeNumber + 1,
           assigneeName: i.assigneeName, // 姓名
           approvalStatus: i.approvalStatus, // 审批类型
           finishTime: i.finishTime ? i.finishTime : '-', // 完成时间
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index f08078d..aefbd8b 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -90,8 +90,16 @@
     type: String,
     default: 'default',
   }, // 表格大小，默认，small,mini等，与el-table条件相同
+  // 排序
+  sort: {
+    type: Object,
+    default() {
+      return {
+      }
+    },
+  },
 })
-const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'multiSelect'])
+const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'multiSelect', 'sortChange'])
 // -------定义数据--------------
 interface columnsCheckInfo {
   text: string
@@ -139,6 +147,10 @@
 function selectionChange(selection: []) {
   emit('selectionChange', selection)
 }
+// 点击排序
+function sortClick(column: any, prop: any, order: any) {
+  emit('sortChange', { column, prop, order })
+}
 // 点击行
 function rowClick(row: object, column?: any, event?: any) {
   emit('rowClick', row)
@@ -196,11 +208,13 @@
       border
       stripe
       :size="size"
+      :default-sort="props.sort"
       :show-header="showHeader"
       style="width: 100%;"
       @selection-change="handleSelectionChange"
       @select="selectClick"
       @row-click="rowClick"
+      @sort-change="sortClick"
     >
       <slot name="preColumns" />
 
@@ -210,7 +224,7 @@
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
+      <el-table-column v-for="column of columns" :key="column.value" :sortable="column.sortable" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
           <span v-else :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ column.filter(scope.row) }}</span>
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index 5cf6445..2cd73de 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -320,7 +320,7 @@
   {
     path: '/meteringdevice',
     component: Layout,
-    redirect: '/devicelist',
+    redirect: '/modellist',
     name: 'MeteringDevice',
     meta: {
       title: '设备台账',
@@ -329,6 +329,43 @@
     },
     children: [
       {
+        path: '/modellist',
+        component: Layout,
+        redirect: '/dmodel',
+        name: 'DeviceModel',
+        meta: {
+          title: '设备规格型号管理',
+          icon: 'ep:key',
+          auth: '/tested/device/model',
+        },
+        children: [
+          {
+            path: '/dmodel',
+            name: 'DeviceModelPage',
+            component: () => import('@/views/tested/device/model/index.vue'),
+            meta: {
+              title: '设备规格型号管理',
+              auth: '/tested/device/model',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/modellist',
+            },
+          },
+          {
+            path: '/dmodel/:type',
+            name: 'ModelEdit',
+            component: () => import('@/views/tested/device/model/components/edit.vue'),
+            meta: {
+              title: '设备规格型号管理',
+              auth: '/tested/device/model',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/modellist',
+            },
+          },
+        ],
+      },
+      {
         path: '/devicelist',
         component: Layout,
         redirect: '/dinfo',
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 6c9383f..879a207 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -158,7 +158,11 @@
 }
 // 批量删除
 const batchDeleteLabel = () => {
-  if (selectList.value.length) {
+  if (selectList.value.filter(item => item.usageStatusName === '已使用').length) {
+    ElMessage.warning('请选择未使用的标签')
+    return
+  }
+  if (selectList.value.filter(item => item.usageStatusName !== '已使用').length) {
     ElMessageBox.confirm(
       '确认删除所选数据吗？',
       '提示',
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index 60d55d6..ba91cbf 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -25,7 +25,7 @@
   offset: 1,
 }) // 查询参数
 watch(() => noticeTime.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     searchQuery.noticeStartTime = `${newVal[0]} 00:00:00`
     searchQuery.noticeEndTime = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/system/signature/autograph.vue b/src/views/system/signature/autograph.vue
index e5a32c8..9c1d0ca 100644
--- a/src/views/system/signature/autograph.vue
+++ b/src/views/system/signature/autograph.vue
@@ -23,7 +23,7 @@
   ids: [],
 }) // 查询参数
 watch(() => createTime.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     searchQuery.createStartTime = `${newVal[0]} 00:00:00`
     searchQuery.createEndTime = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 5f57089..b557683 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -16,7 +16,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index 8f31905..e140eaa 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.applicantTimeStart = `${newVal[0]} 00:00:00`
     listQuery.applicantTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/opinion/index.vue b/src/views/tested/MeasurementBusiness/opinion/index.vue
index 6c7e13c..c6683c0 100644
--- a/src/views/tested/MeasurementBusiness/opinion/index.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue
index b15f27b..e204a69 100644
--- a/src/views/tested/MeasurementBusiness/review/index.vue
+++ b/src/views/tested/MeasurementBusiness/review/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
@@ -76,21 +76,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
-  // getListPage(listQuery).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   listLoading.value = false
-  // })
-  list.value = [{
-    formNo: '12345',
-    formName: '评审表1',
-    labCode: '海口实验室',
-    groupCode: '组别1',
-    signStatusName: '同意',
-    createUserName: '张三',
-    createTime: '2023-09-05',
-  }]
-  listLoading.value = false
+  getListPage(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  })
 }
 fetchData()
 // 查询数据
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 0e2fd1c..217365a 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -14,7 +14,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.sendTimeStart = `${newVal[0]} 00:00:00`
     listQuery.sendTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index e117705..e2d0ea2 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -12,6 +12,7 @@
     required: true,
   },
 })
+const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
 const userStore = useUserStore()
 const listQuery = reactive({
@@ -20,8 +21,8 @@
   createTimeEnd: '',
   createTimeStart: '',
   notifyType: $props.notifyType, // 通知类型(负责人/部门，字典值)
-  notifyDept: userStore.deptId,
-  notifyUser: userStore.id,
+  notifyDept: $route.path.includes('curatorpage') ? '' : userStore.deptId,
+  notifyUser: $route.path.includes('curatorpage') ? userStore.id : '',
   offset: 1,
   limit: 20,
 })
@@ -30,7 +31,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/dept/index.vue b/src/views/tested/MeasurementPlan/dept/index.vue
index aafe5e1..a25835f 100644
--- a/src/views/tested/MeasurementPlan/dept/index.vue
+++ b/src/views/tested/MeasurementPlan/dept/index.vue
@@ -5,5 +5,5 @@
 
 <template>
   <!-- notifyType 通知类型(负责人/部门，字典值) -->
-  <page notify-type="1" />
+  <page notify-type="2" />
 </template>
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 3cdecdc..429acf5 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -53,7 +53,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index f599508..2c53a36 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -24,7 +24,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index 6af790b..f17af59 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -39,7 +39,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 6fa4355..d0e9936 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -27,7 +27,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.value.certificateValidStart = `${newVal[0]} 00:00:00`
     listQuery.value.certificateValidEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/task/index.vue b/src/views/tested/MeasurementPlan/task/index.vue
index 4ab62d9..aa759a8 100644
--- a/src/views/tested/MeasurementPlan/task/index.vue
+++ b/src/views/tested/MeasurementPlan/task/index.vue
@@ -17,7 +17,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createStartTime = `${newVal[0]} 00:00:00`
     listQuery.createEndTime = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index c7d63b8..67b4dac 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -99,7 +99,7 @@
 }
 const range = ref()
 watch(() => range.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.certificateValidStart = `${newVal[0]} 00:00:00`
     listQuery.certificateValidEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index 5d8d328..af479a6 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -41,7 +41,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.value.certificateValidStart = `${newVal[0]} 00:00:00`
     listQuery.value.certificateValidEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/device/group/components/tableList.vue b/src/views/tested/device/group/components/tableList.vue
index d1f60ce..f1b817a 100644
--- a/src/views/tested/device/group/components/tableList.vue
+++ b/src/views/tested/device/group/components/tableList.vue
@@ -177,7 +177,16 @@
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
           <el-input
-            v-if="scope.row.editable && !item.isSelect" v-model="scope.row[item.value]" :autofocus="true"
+            v-if="scope.row.editable && !item.isSelect && item.text === '设备名称'" v-model="scope.row[item.value]" :autofocus="true"
+            :placeholder="`${item.text}`" class="input"
+            @focus="select(item.text, scope.$index)"
+          >
+            <template #append>
+              <span @click="select(item.text, scope.$index)">选择</span>
+            </template>
+          </el-input>
+          <el-input
+            v-if="scope.row.editable && !item.isSelect && item.text !== '设备名称'" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
             @focus="select(item.text, scope.$index)"
           />
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 7443364..db05d4d 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -50,6 +50,7 @@
     text: '统一编号',
     value: 'equipmentNo',
     align: 'center',
+    sortable: 'custom',
   },
   {
     text: '设备名称',
@@ -60,11 +61,13 @@
     text: '型号规格',
     value: 'model',
     align: 'center',
+    sortable: 'custom',
   },
   {
     text: '出厂编号',
     value: 'manufactureNo',
     align: 'center',
+    sortable: 'custom',
   },
   {
     text: '使用岗位',
@@ -85,6 +88,7 @@
     text: '证书有效期',
     value: 'certificateValid',
     align: 'center',
+    sortable: 'custom',
   },
 ])
 const allColums = ref([
@@ -92,6 +96,7 @@
     text: '使用状态',
     value: 'usageStatusName',
     align: 'center',
+    sortable: 'custom',
   },
   {
     text: '备注',
@@ -121,6 +126,21 @@
     align: 'center',
   },
 ])
+// 排序条件发生变化
+const sortChange = ({ column }: any) => {
+  if (column.order === 'ascending') {
+    console.log(column.prop)
+    console.log('升序')
+  }
+  else if (column.order === 'descending') {
+    console.log(column.prop)
+    console.log('倒叙')
+  }
+}
+// 聚合表格实例
+const togetherTableRef = ref()
+// 展开表格实例
+const expandTableRef = ref()
 const list = ref([])
 const total = ref(0)
 const listLoading = ref(true)
@@ -157,7 +177,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.certificateValidStart = `${newVal[0]} 00:00:00`
     listQuery.certificateValidEnd = `${newVal[1]} 23:59:59`
   }
@@ -209,12 +229,29 @@
   expandLoading.value = true
   getInfoList(params).then((res) => {
     expandList.value = res.data
+    // 获取聚合表格选中，判断展开表格是否需要全选
+    const selectList = togetherTableRef.value.getSelectionRows()
+    if (selectList.length) {
+      const select = selectList.filter((item: any) => item.equipmentName === params.equipmentName)
+      if (select.length) {
+        nextTick(() => {
+          expandTableRef.value.toggleAllSelection()
+        })
+      }
+    }
     expandLoading.value = false
   })
 }
 const getRowKeys = (row: any) => { // 获取当前行id
   return row.equipmentName // 这里看这一行中需要根据哪个属性值是id
 }
+// 监听聚合表格多选
+// watch(() => togetherTableRef.value?.getSelectionRows(), (newVal, oldVal) => {
+//   console.log(newVal, 'newVal')
+// }, {
+//   deep: true,
+// })
+
 // 表格被选中的行
 const selectList = ref<any[]>([])
 // 表格多选
@@ -240,6 +277,48 @@
 {
   deep: true,
 })
+const togetherSelect = (selection: any, row: any) => {
+  if (selection.includes(row)) {
+    // 勾选
+    console.log('勾选')
+    if (expands.value && expands.value[0] === row.equipmentName) {
+      expandTableRef.value.toggleAllSelection()
+    }
+  }
+  else {
+    // 取消勾选
+    console.log('取消勾选')
+    if (expands.value && expands.value[0] === row.equipmentName) {
+      expandTableRef.value.toggleAllSelection()
+    }
+  }
+}
+const expandSelect = (selection: any, row: any) => {
+  if (selection.length === expandList.value.length) {
+    // 全选
+    console.log('全选')
+    // 获取聚合
+    console.log(expands.value[0])
+    const data = togetherList.value.filter((item: any) => item.equipmentName === expands.value[0])
+    console.log(data)
+    if (data.length) {
+      nextTick(() => {
+        togetherTableRef.value.toggleRowSelection(data[0], true)
+      })
+    }
+  }
+  else {
+    // 全不选
+    console.log('全不选')
+    // 获取聚合
+    const data = togetherList.value.filter((item: any) => item.equipmentName === expands.value[0])
+    if (data.length) {
+      nextTick(() => {
+        togetherTableRef.value.toggleRowSelection(data[0], false)
+      })
+    }
+  }
+}
 const $router = useRouter()
 // 新建编辑操作
 const handler = (row: IlistObjType, type: string) => {
@@ -497,7 +576,7 @@
       <template v-if="$props.statusName === '全部'" #btns-right>
         <icon-button icon="icon-change" title="切换列表状态" @click="changeTable" />
         <icon-button icon="icon-sweep" title="扫描" />
-        <icon-button icon="icon-add" title="新增" @click="handler({}, 'create')" />
+        <icon-button icon="icon-add" title="新增" @click="handler({} as any, 'create')" />
         <icon-button icon="icon-import" title="批量导入" @click="importList" />
         <icon-button icon="icon-template" title="模板下载" @click="useTemplateDownload('设备信息管理模块')" />
         <icon-button icon="icon-export" title="导出" @click="exportList" />
@@ -508,30 +587,29 @@
         <normal-table
           v-show=" tableFlage "
           ref="normalTableRef" :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="listLoading" :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
+          :list-loading="listLoading"
+          :is-showmulti-select="true" :is-multi="true" @sort-change="sortChange" @change="changePage" @multi-select="multiSelect"
         >
           <template #columns>
             <!-- 全部状态 -->
-            <el-table-column
-              v-for=" column of allColums " :key=" column.value "
-              :label=" column.text " :prop=" column.value " :align=" column.align "
-              :show-overflow-tooltip="true"
-            >
-              <template v-if="$props.statusName === '全部' " #default=" scope ">
-                <span>{{ scope.row[column.value] }}</span>
-              </template>
-            </el-table-column>
+            <template v-if="$props.statusName === '全部' ">
+              <el-table-column
+                v-for=" column of allColums " :key=" column.value "
+                :label=" column.text " :prop=" column.value " :align=" column.align "
+                :show-overflow-tooltip="true"
+                :sortable="column.sortable"
+              />
+            </template>
             <!-- 其他审批状态 -->
-            <el-table-column
-              v-for=" column of otherColums " :key="column.value" :label=" column.text "
-              :prop=" column.value " :align=" column.align "
-              :show-overflow-tooltip="true"
-            >
-              <template v-if="$props.statusName !== '全部' " #default=" scope ">
-                <span>
-                  {{ scope.row[column.value] }}</span>
-              </template>
-            </el-table-column>
+            <template v-if="$props.statusName !== '全部' ">
+              <el-table-column
+                v-for=" column of otherColums " :key="column.value"
+                :label=" column.text "
+                :prop=" column.value " :align=" column.align "
+                :show-overflow-tooltip="true"
+              />
+            </template>
+
             <el-table-column label="操作" width="160" align="center">
               <template #default=" scope ">
                 <el-button link type="primary" size="small" @click="detail(scope.row)">
@@ -580,6 +658,7 @@
       </div>
       <div v-if=" !tableFlage ">
         <!-- 展开行表格 -->
+        <!-- 头部 -->
         <normal-table
           v-show=" !tableFlage " class="nortable-header" :data=" [] " :total=" 0 " :columns=" columns " :options="
             {
@@ -587,12 +666,23 @@
               border: true, // 是否需要上方边框
             }
           " :pagination=" false " :is-showmulti-select=" true " :query="{}"
-        />
-        <el-table
-          v-show=" !tableFlage " v-loading=" togetherLoading " :data=" togetherList " border style="width: 100%;"
-          :row-key=" getRowKeys " :expand-row-keys=" expands " :show-header=" false " @expand-change=" expandChange "
         >
+          <template #columns>
+            <el-table-column label="操作" width="160" align="center" />
+          </template>
+        </normal-table>
+        <!-- 身体 -->
+        <el-table
+          v-show=" !tableFlage "
+          ref="togetherTableRef" v-loading=" togetherLoading " :data=" togetherList " border style="width: 100%;"
+          :row-key=" getRowKeys " :expand-row-keys=" expands " :show-header=" false " @expand-change=" expandChange "
+          @select="togetherSelect"
+        >
+          <el-table-column type="selection" width="38" />
           <el-table-column type="expand">
+            <template #default="props">
+              <!-- 展开表格身体 -->
+              <!-- <normal-table
             <template #default>
               <normal-table
                 :data=" expandList " :total=" 0 " :columns=" columns " :list-loading=" expandLoading " :options="
@@ -601,7 +691,58 @@
                     border: true, // 是否需要上方边框
                   }
                 " :pagination=" false " :is-showmulti-select=" true " :show-header=" false " :query="{}"
-              />
+              /> -->
+              <el-table
+                ref="expandTableRef"
+                v-loading=" expandLoading " :data=" expandList " border style="width: 100%;"
+                :show-header=" false " @select="expandSelect"
+              >
+                <el-table-column type="selection" width="38" />
+                <el-table-column v-for="item in columns" :key="item.value" :labe="item.text" :prop="item.value" align="center" />
+                <el-table-column label="操作" width="160" align="center">
+                  <template #default=" scope ">
+                    <el-button link type="primary" size="small" @click="detail(scope.row)">
+                      查看
+                    </el-button>
+                    <el-button
+                      v-if="proxy.buttonPerm.edit.if({ approvalStatusName: $props.statusName }, permUrl.edit)" link type="primary" size="small"
+                      @click="handler(scope.row, 'update')"
+                    >
+                      编辑
+                    </el-button>
+                    <el-button
+                      v-if="proxy.buttonPerm.agree.if({ approvalStatusName: $props.statusName }, permUrl.agree)" link type="primary" size="small"
+                      @click="approveHandler(scope.row, 'agree')"
+                    >
+                      同意
+                    </el-button>
+                    <el-button
+                      v-if="proxy.buttonPerm.reject.if({ approvalStatusName: $props.statusName }, permUrl.reject)" link type="primary" size="small"
+                      @click="approveHandler(scope.row, 'refuse')"
+                    >
+                      拒绝
+                    </el-button>
+                    <el-button
+                      v-if="proxy.buttonPerm.submit.if({ approvalStatusName: $props.statusName }, permUrl.submit)" link type="primary" size="small"
+                      @click="submit(scope.row)"
+                    >
+                      提交
+                    </el-button>
+                    <el-button
+                      v-if="proxy.buttonPerm.cancel.if({ approvalStatusName: $props.statusName }, permUrl.cancel)" link type="primary" size="small"
+                      @click="canHandler(scope.row)"
+                    >
+                      取消
+                    </el-button>
+                    <el-button
+                      v-if="proxy.buttonPerm.delete.if({ approvalStatusName: $props.statusName }, permUrl.del)" link type="danger" size="small"
+                      @click="delHandler(scope.row)"
+                    >
+                      删除
+                    </el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
             </template>
           </el-table-column>
           <el-table-column label="设备名称" prop="equipmentName" align="center" />
diff --git a/src/views/tested/device/model/components/edit.vue b/src/views/tested/device/model/components/edit.vue
new file mode 100644
index 0000000..0783b12
--- /dev/null
+++ b/src/views/tested/device/model/components/edit.vue
@@ -0,0 +1,251 @@
+<!-- 设备规格型号-编辑 -->
+<script lang="ts" setup name="DeviceModelEdit">
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import tableList from './technology.vue'
+import { getDictByCode } from '@/api/system/dict'
+import { handlerFunApi } from '@/api/eqpt/device/model'
+import useUserStore from '@/store/modules/user'
+import { getUserDept } from '@/api/system/user'
+import { uploadApi } from '@/api/system/notice'
+import showPhoto from '@/views/tested/device/info/components/showPhoto.vue'
+const $route = useRoute()
+const $router = useRouter()
+const userStore = useUserStore()
+const ruleFormRef = ref<FormInstance>() // from组件
+const title = ref('')
+// 显示标题
+const textMap: { [key: string]: string } = {
+  update: '编辑',
+  create: '新增',
+  detail: '详情',
+}
+// 对话框类型：create,update
+const dialogStatus = ref('create')
+const ruleForm = ref({
+  category: '', // 设备分类
+  categoryName: '', // 设备分类名称
+  checkCycle: '', // 检定周期
+  createDeptId: '',
+  createTime: '',
+  createUserId: '',
+  equipmentName: '', // 设备名称
+  helpInstruction: '', // 辅助字段
+  id: '',
+  instructionsFile: '', // 附件
+  model: '', // 规格型号
+  modelNo: '', // 规格型号编号
+  remark: '', // 备注
+  technicalTargetList: [], // 技术指标
+  updateTime: '',
+}) // 表单
+const rules = ref<FormRules>({
+  equipmentName: [{ required: true, message: '设备名称名称必填', trigger: 'blur' }],
+  category: [{ required: true, message: '设备分类必选', trigger: 'blur' }],
+  model: [{ required: true, message: '规格型号必填', trigger: 'blur' }],
+  checkCycle: [{ required: true, message: '检定周期必填', trigger: 'blur' }],
+}) // 表单验证规则
+// 弹窗初始化
+const initDialog = () => {
+  dialogStatus.value = $route.params.type as string
+  ruleFormRef.value?.resetFields()
+  if ($route.params.type === 'create') {
+    ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+    ruleForm.value.createUserId = userStore.id
+    // 获取当前用户所在单位
+    getUserDept().then((res) => {
+      ruleForm.value.createDeptId = res.data.id
+    })
+  }
+  else {
+    console.log($route.query.row, 'data')
+    const data = JSON.parse($route.query.row as string)
+    // detailGroup({ groupId: data.id }).then((res) => {
+    ruleForm.value = data
+    // })
+  }
+}
+onMounted(() => {
+  initDialog()
+})
+// 关闭弹窗
+const close = () => {
+  $router.back()
+}
+const tableRef = ref()
+// 保存
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid && tableRef.value.checkCertificateList()) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        ruleForm.value.equipmentList = tableRef.value.list
+        if ($route.params.type === 'create') {
+          handlerFunApi('create', ruleForm.value).then((res) => {
+            ElMessage.success('添加成功')
+            close()
+          })
+        }
+        else {
+          handlerFunApi('update', ruleForm.value).then((res) => {
+            ElMessage.success('修改成功')
+            close()
+          })
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    fd.append('multipartFile', event.target.files[0])
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        ruleForm.value.instructionsFile = ruleForm.value.instructionsFile ? `${ruleForm.value.instructionsFile},${res.data[0]}` : res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
+        loading.close()
+      }
+      else {
+        // ElMessage.error(res.message)
+        loading.close()
+      }
+    })
+  }
+}
+// 上传
+const upload = () => {
+  fileRef.value.click()
+}
+// 删除上传的文件
+const deleteFile = (fileName: string) => {
+  const data = ruleForm.value.instructionsFile.split(',')
+  const filterData = data.filter(item => item !== fileName)
+  ruleForm.value.instructionsFile = filterData.length ? filterData.join(',') : ''
+}
+// 设备分类
+const deviceTypeList = ref<{ id: string; value: string; name: string }[]>([])
+const fetchSelect = () => {
+  // 设备分类
+  getDictByCode('eqptDeviceType').then((res) => {
+    deviceTypeList.value = res.data
+  })
+}
+fetchSelect()
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <approval-dialog ref="approvalDialogRef" @on-success="() => { $router.back() }" />
+    <detail-page :title="`设备规格型号管理-${textMap[dialogStatus]}`">
+      <template #btns>
+        <el-button v-if="dialogStatus !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-com>
+      <el-form
+        ref="ruleFormRef"
+        :model="ruleForm"
+        :rules="rules" label-position="right" label-width="110px" class="form"
+        :disabled="dialogStatus === 'detail'"
+        :class="$route.path.includes('detail') ? 'isDetail' : ''"
+      >
+        <el-row :gutter="24" class="marg">
+          <el-col :span="8">
+            <el-form-item label="型号规格编号">
+              <el-input v-model.trim="ruleForm.modelNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm.equipmentName" placeholder="设备名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="规格型号" prop="model">
+              <el-input v-model.trim="ruleForm.model" placeholder="规格型号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="8">
+            <el-form-item label="辅助字段" prop="helpInstruction">
+              <el-input v-model.trim="ruleForm.helpInstruction" placeholder="辅助字段" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="设备分类" prop="category">
+              <el-select v-model.trim="ruleForm.category" placeholder="设备名称" style="width: 100%;">
+                <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="检定周期" prop="checkCycle">
+              <!-- <el-input v-model.trim="ruleForm.checkCycle" placeholder="检定周期" /> -->
+              <el-input v-model.trim="ruleForm.checkCycle">
+                <template #append>
+                  月
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="使用说明书" prop="instructionsFile">
+              <!-- <el-input v-model.trim="ruleForm.helpInstruction" placeholder="辅助字段" /> -->
+              <show-photo :minio-file-name="ruleForm.instructionsFile" @delete="deleteFile" />
+              <input ref="fileRef" style="display: none;" type="file" accept="application/msword,application/pdf" @change="onFileChange">
+              <el-button v-if="dialogStatus !== 'detail'" type="primary" @click="upload">
+                上传
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="18">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.remark" type="textarea" :row="3" maxlength="100" show-word-limit />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block-com>
+    <detail-block-com>
+      <table-list ref="tableRef" :data="ruleForm.technicalTargetList" :status="dialogStatus" />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>

diff --git a/.env.development b/.env.development
index debe1a8..f2fee42 100644
--- a/.env.development
+++ b/.env.development
@@ -4,7 +4,7 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
-VITE_APP_API_BASEURL = http://127.0.0.1:5909
+VITE_APP_API_BASEURL = http://192.168.8.101:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..313fcf7 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://192.168.8.101:5909"
 }
diff --git a/src/api/eqpt/device/model.ts b/src/api/eqpt/device/model.ts
new file mode 100644
index 0000000..a8fa0f1
--- /dev/null
+++ b/src/api/eqpt/device/model.ts
@@ -0,0 +1,61 @@
+/**
+ * 设备型号规格管理相关
+ */
+import request from '@/api/index'
+
+// 列表
+export function getModelList(params: any) {
+  return request({
+    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}`,
+    method: 'post',
+    data: params,
+  })
+}
+// 列表-不分页
+export function getModelAllList(params: any) {
+  return request({
+    url: '/equipment/model/list',
+    method: 'post',
+    data: params,
+  })
+}
+// 设备名称列表/equipment/model/listEquipmentName
+export function getDeviceNameList(params: any) {
+  return request({
+    url: '/equipment/model/listEquipmentName',
+    method: 'get',
+    params,
+  })
+}
+// 导出
+export function exportModelList(data: any) {
+  return request({
+    url: '/equipment/model/export',
+    method: 'post',
+    data,
+  })
+}
+// 新建或编辑
+export function handlerFunApi(type: string, data: any) {
+  if (type === 'create') {
+    return request({
+      url: '/equipment/model/add',
+      method: 'post',
+      data,
+    })
+  }
+  else if (type === 'update') {
+    return request({
+      url: '/equipment/model/update',
+      method: 'post',
+      data,
+    })
+  }
+}
+// 删除
+export function deleteModel(data: any) {
+  return request({
+    url: `/equipment/model/delete?id=${data.id}`,
+    method: 'post',
+  })
+}
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 14ec12e..64e6f48 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -55,11 +55,12 @@
   // listQuery.value.offset = 1
   // }
   fetchApproval({ processId: listQuery.value.processId }).then((response) => {
+    console.log(response.data, 'response')
     response.data.forEach((item: Array<IList>, index: number) => {
       item.forEach((i: any) => {
         list.value.push({
           cindex: index,
-          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[i.cindex].nodeNumber + 1,
+          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[index - 1].nodeNumber + 1,
           assigneeName: i.assigneeName, // 姓名
           approvalStatus: i.approvalStatus, // 审批类型
           finishTime: i.finishTime ? i.finishTime : '-', // 完成时间
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index f08078d..aefbd8b 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -90,8 +90,16 @@
     type: String,
     default: 'default',
   }, // 表格大小，默认，small,mini等，与el-table条件相同
+  // 排序
+  sort: {
+    type: Object,
+    default() {
+      return {
+      }
+    },
+  },
 })
-const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'multiSelect'])
+const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'multiSelect', 'sortChange'])
 // -------定义数据--------------
 interface columnsCheckInfo {
   text: string
@@ -139,6 +147,10 @@
 function selectionChange(selection: []) {
   emit('selectionChange', selection)
 }
+// 点击排序
+function sortClick(column: any, prop: any, order: any) {
+  emit('sortChange', { column, prop, order })
+}
 // 点击行
 function rowClick(row: object, column?: any, event?: any) {
   emit('rowClick', row)
@@ -196,11 +208,13 @@
       border
       stripe
       :size="size"
+      :default-sort="props.sort"
       :show-header="showHeader"
       style="width: 100%;"
       @selection-change="handleSelectionChange"
       @select="selectClick"
       @row-click="rowClick"
+      @sort-change="sortClick"
     >
       <slot name="preColumns" />
 
@@ -210,7 +224,7 @@
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
+      <el-table-column v-for="column of columns" :key="column.value" :sortable="column.sortable" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
           <span v-else :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ column.filter(scope.row) }}</span>
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index 5cf6445..2cd73de 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -320,7 +320,7 @@
   {
     path: '/meteringdevice',
     component: Layout,
-    redirect: '/devicelist',
+    redirect: '/modellist',
     name: 'MeteringDevice',
     meta: {
       title: '设备台账',
@@ -329,6 +329,43 @@
     },
     children: [
       {
+        path: '/modellist',
+        component: Layout,
+        redirect: '/dmodel',
+        name: 'DeviceModel',
+        meta: {
+          title: '设备规格型号管理',
+          icon: 'ep:key',
+          auth: '/tested/device/model',
+        },
+        children: [
+          {
+            path: '/dmodel',
+            name: 'DeviceModelPage',
+            component: () => import('@/views/tested/device/model/index.vue'),
+            meta: {
+              title: '设备规格型号管理',
+              auth: '/tested/device/model',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/modellist',
+            },
+          },
+          {
+            path: '/dmodel/:type',
+            name: 'ModelEdit',
+            component: () => import('@/views/tested/device/model/components/edit.vue'),
+            meta: {
+              title: '设备规格型号管理',
+              auth: '/tested/device/model',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/modellist',
+            },
+          },
+        ],
+      },
+      {
         path: '/devicelist',
         component: Layout,
         redirect: '/dinfo',
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 6c9383f..879a207 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -158,7 +158,11 @@
 }
 // 批量删除
 const batchDeleteLabel = () => {
-  if (selectList.value.length) {
+  if (selectList.value.filter(item => item.usageStatusName === '已使用').length) {
+    ElMessage.warning('请选择未使用的标签')
+    return
+  }
+  if (selectList.value.filter(item => item.usageStatusName !== '已使用').length) {
     ElMessageBox.confirm(
       '确认删除所选数据吗？',
       '提示',
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index 60d55d6..ba91cbf 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -25,7 +25,7 @@
   offset: 1,
 }) // 查询参数
 watch(() => noticeTime.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     searchQuery.noticeStartTime = `${newVal[0]} 00:00:00`
     searchQuery.noticeEndTime = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/system/signature/autograph.vue b/src/views/system/signature/autograph.vue
index e5a32c8..9c1d0ca 100644
--- a/src/views/system/signature/autograph.vue
+++ b/src/views/system/signature/autograph.vue
@@ -23,7 +23,7 @@
   ids: [],
 }) // 查询参数
 watch(() => createTime.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     searchQuery.createStartTime = `${newVal[0]} 00:00:00`
     searchQuery.createEndTime = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 5f57089..b557683 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -16,7 +16,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index 8f31905..e140eaa 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.applicantTimeStart = `${newVal[0]} 00:00:00`
     listQuery.applicantTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/opinion/index.vue b/src/views/tested/MeasurementBusiness/opinion/index.vue
index 6c7e13c..c6683c0 100644
--- a/src/views/tested/MeasurementBusiness/opinion/index.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue
index b15f27b..e204a69 100644
--- a/src/views/tested/MeasurementBusiness/review/index.vue
+++ b/src/views/tested/MeasurementBusiness/review/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
@@ -76,21 +76,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
-  // getListPage(listQuery).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   listLoading.value = false
-  // })
-  list.value = [{
-    formNo: '12345',
-    formName: '评审表1',
-    labCode: '海口实验室',
-    groupCode: '组别1',
-    signStatusName: '同意',
-    createUserName: '张三',
-    createTime: '2023-09-05',
-  }]
-  listLoading.value = false
+  getListPage(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  })
 }
 fetchData()
 // 查询数据
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 0e2fd1c..217365a 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -14,7 +14,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.sendTimeStart = `${newVal[0]} 00:00:00`
     listQuery.sendTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index e117705..e2d0ea2 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -12,6 +12,7 @@
     required: true,
   },
 })
+const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
 const userStore = useUserStore()
 const listQuery = reactive({
@@ -20,8 +21,8 @@
   createTimeEnd: '',
   createTimeStart: '',
   notifyType: $props.notifyType, // 通知类型(负责人/部门，字典值)
-  notifyDept: userStore.deptId,
-  notifyUser: userStore.id,
+  notifyDept: $route.path.includes('curatorpage') ? '' : userStore.deptId,
+  notifyUser: $route.path.includes('curatorpage') ? userStore.id : '',
   offset: 1,
   limit: 20,
 })
@@ -30,7 +31,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/dept/index.vue b/src/views/tested/MeasurementPlan/dept/index.vue
index aafe5e1..a25835f 100644
--- a/src/views/tested/MeasurementPlan/dept/index.vue
+++ b/src/views/tested/MeasurementPlan/dept/index.vue
@@ -5,5 +5,5 @@
 
 <template>
   <!-- notifyType 通知类型(负责人/部门，字典值) -->
-  <page notify-type="1" />
+  <page notify-type="2" />
 </template>
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 3cdecdc..429acf5 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -53,7 +53,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index f599508..2c53a36 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -24,7 +24,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index 6af790b..f17af59 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -39,7 +39,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 6fa4355..d0e9936 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -27,7 +27,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.value.certificateValidStart = `${newVal[0]} 00:00:00`
     listQuery.value.certificateValidEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/task/index.vue b/src/views/tested/MeasurementPlan/task/index.vue
index 4ab62d9..aa759a8 100644
--- a/src/views/tested/MeasurementPlan/task/index.vue
+++ b/src/views/tested/MeasurementPlan/task/index.vue
@@ -17,7 +17,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createStartTime = `${newVal[0]} 00:00:00`
     listQuery.createEndTime = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index c7d63b8..67b4dac 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -99,7 +99,7 @@
 }
 const range = ref()
 watch(() => range.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.certificateValidStart = `${newVal[0]} 00:00:00`
     listQuery.certificateValidEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index 5d8d328..af479a6 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -41,7 +41,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.value.certificateValidStart = `${newVal[0]} 00:00:00`
     listQuery.value.certificateValidEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/device/group/components/tableList.vue b/src/views/tested/device/group/components/tableList.vue
index d1f60ce..f1b817a 100644
--- a/src/views/tested/device/group/components/tableList.vue
+++ b/src/views/tested/device/group/components/tableList.vue
@@ -177,7 +177,16 @@
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
           <el-input
-            v-if="scope.row.editable && !item.isSelect" v-model="scope.row[item.value]" :autofocus="true"
+            v-if="scope.row.editable && !item.isSelect && item.text === '设备名称'" v-model="scope.row[item.value]" :autofocus="true"
+            :placeholder="`${item.text}`" class="input"
+            @focus="select(item.text, scope.$index)"
+          >
+            <template #append>
+              <span @click="select(item.text, scope.$index)">选择</span>
+            </template>
+          </el-input>
+          <el-input
+            v-if="scope.row.editable && !item.isSelect && item.text !== '设备名称'" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
             @focus="select(item.text, scope.$index)"
           />
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 7443364..db05d4d 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -50,6 +50,7 @@
     text: '统一编号',
     value: 'equipmentNo',
     align: 'center',
+    sortable: 'custom',
   },
   {
     text: '设备名称',
@@ -60,11 +61,13 @@
     text: '型号规格',
     value: 'model',
     align: 'center',
+    sortable: 'custom',
   },
   {
     text: '出厂编号',
     value: 'manufactureNo',
     align: 'center',
+    sortable: 'custom',
   },
   {
     text: '使用岗位',
@@ -85,6 +88,7 @@
     text: '证书有效期',
     value: 'certificateValid',
     align: 'center',
+    sortable: 'custom',
   },
 ])
 const allColums = ref([
@@ -92,6 +96,7 @@
     text: '使用状态',
     value: 'usageStatusName',
     align: 'center',
+    sortable: 'custom',
   },
   {
     text: '备注',
@@ -121,6 +126,21 @@
     align: 'center',
   },
 ])
+// 排序条件发生变化
+const sortChange = ({ column }: any) => {
+  if (column.order === 'ascending') {
+    console.log(column.prop)
+    console.log('升序')
+  }
+  else if (column.order === 'descending') {
+    console.log(column.prop)
+    console.log('倒叙')
+  }
+}
+// 聚合表格实例
+const togetherTableRef = ref()
+// 展开表格实例
+const expandTableRef = ref()
 const list = ref([])
 const total = ref(0)
 const listLoading = ref(true)
@@ -157,7 +177,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.certificateValidStart = `${newVal[0]} 00:00:00`
     listQuery.certificateValidEnd = `${newVal[1]} 23:59:59`
   }
@@ -209,12 +229,29 @@
   expandLoading.value = true
   getInfoList(params).then((res) => {
     expandList.value = res.data
+    // 获取聚合表格选中，判断展开表格是否需要全选
+    const selectList = togetherTableRef.value.getSelectionRows()
+    if (selectList.length) {
+      const select = selectList.filter((item: any) => item.equipmentName === params.equipmentName)
+      if (select.length) {
+        nextTick(() => {
+          expandTableRef.value.toggleAllSelection()
+        })
+      }
+    }
     expandLoading.value = false
   })
 }
 const getRowKeys = (row: any) => { // 获取当前行id
   return row.equipmentName // 这里看这一行中需要根据哪个属性值是id
 }
+// 监听聚合表格多选
+// watch(() => togetherTableRef.value?.getSelectionRows(), (newVal, oldVal) => {
+//   console.log(newVal, 'newVal')
+// }, {
+//   deep: true,
+// })
+
 // 表格被选中的行
 const selectList = ref<any[]>([])
 // 表格多选
@@ -240,6 +277,48 @@
 {
   deep: true,
 })
+const togetherSelect = (selection: any, row: any) => {
+  if (selection.includes(row)) {
+    // 勾选
+    console.log('勾选')
+    if (expands.value && expands.value[0] === row.equipmentName) {
+      expandTableRef.value.toggleAllSelection()
+    }
+  }
+  else {
+    // 取消勾选
+    console.log('取消勾选')
+    if (expands.value && expands.value[0] === row.equipmentName) {
+      expandTableRef.value.toggleAllSelection()
+    }
+  }
+}
+const expandSelect = (selection: any, row: any) => {
+  if (selection.length === expandList.value.length) {
+    // 全选
+    console.log('全选')
+    // 获取聚合
+    console.log(expands.value[0])
+    const data = togetherList.value.filter((item: any) => item.equipmentName === expands.value[0])
+    console.log(data)
+    if (data.length) {
+      nextTick(() => {
+        togetherTableRef.value.toggleRowSelection(data[0], true)
+      })
+    }
+  }
+  else {
+    // 全不选
+    console.log('全不选')
+    // 获取聚合
+    const data = togetherList.value.filter((item: any) => item.equipmentName === expands.value[0])
+    if (data.length) {
+      nextTick(() => {
+        togetherTableRef.value.toggleRowSelection(data[0], false)
+      })
+    }
+  }
+}
 const $router = useRouter()
 // 新建编辑操作
 const handler = (row: IlistObjType, type: string) => {
@@ -497,7 +576,7 @@
       <template v-if="$props.statusName === '全部'" #btns-right>
         <icon-button icon="icon-change" title="切换列表状态" @click="changeTable" />
         <icon-button icon="icon-sweep" title="扫描" />
-        <icon-button icon="icon-add" title="新增" @click="handler({}, 'create')" />
+        <icon-button icon="icon-add" title="新增" @click="handler({} as any, 'create')" />
         <icon-button icon="icon-import" title="批量导入" @click="importList" />
         <icon-button icon="icon-template" title="模板下载" @click="useTemplateDownload('设备信息管理模块')" />
         <icon-button icon="icon-export" title="导出" @click="exportList" />
@@ -508,30 +587,29 @@
         <normal-table
           v-show=" tableFlage "
           ref="normalTableRef" :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="listLoading" :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
+          :list-loading="listLoading"
+          :is-showmulti-select="true" :is-multi="true" @sort-change="sortChange" @change="changePage" @multi-select="multiSelect"
         >
           <template #columns>
             <!-- 全部状态 -->
-            <el-table-column
-              v-for=" column of allColums " :key=" column.value "
-              :label=" column.text " :prop=" column.value " :align=" column.align "
-              :show-overflow-tooltip="true"
-            >
-              <template v-if="$props.statusName === '全部' " #default=" scope ">
-                <span>{{ scope.row[column.value] }}</span>
-              </template>
-            </el-table-column>
+            <template v-if="$props.statusName === '全部' ">
+              <el-table-column
+                v-for=" column of allColums " :key=" column.value "
+                :label=" column.text " :prop=" column.value " :align=" column.align "
+                :show-overflow-tooltip="true"
+                :sortable="column.sortable"
+              />
+            </template>
             <!-- 其他审批状态 -->
-            <el-table-column
-              v-for=" column of otherColums " :key="column.value" :label=" column.text "
-              :prop=" column.value " :align=" column.align "
-              :show-overflow-tooltip="true"
-            >
-              <template v-if="$props.statusName !== '全部' " #default=" scope ">
-                <span>
-                  {{ scope.row[column.value] }}</span>
-              </template>
-            </el-table-column>
+            <template v-if="$props.statusName !== '全部' ">
+              <el-table-column
+                v-for=" column of otherColums " :key="column.value"
+                :label=" column.text "
+                :prop=" column.value " :align=" column.align "
+                :show-overflow-tooltip="true"
+              />
+            </template>
+
             <el-table-column label="操作" width="160" align="center">
               <template #default=" scope ">
                 <el-button link type="primary" size="small" @click="detail(scope.row)">
@@ -580,6 +658,7 @@
       </div>
       <div v-if=" !tableFlage ">
         <!-- 展开行表格 -->
+        <!-- 头部 -->
         <normal-table
           v-show=" !tableFlage " class="nortable-header" :data=" [] " :total=" 0 " :columns=" columns " :options="
             {
@@ -587,12 +666,23 @@
               border: true, // 是否需要上方边框
             }
           " :pagination=" false " :is-showmulti-select=" true " :query="{}"
-        />
-        <el-table
-          v-show=" !tableFlage " v-loading=" togetherLoading " :data=" togetherList " border style="width: 100%;"
-          :row-key=" getRowKeys " :expand-row-keys=" expands " :show-header=" false " @expand-change=" expandChange "
         >
+          <template #columns>
+            <el-table-column label="操作" width="160" align="center" />
+          </template>
+        </normal-table>
+        <!-- 身体 -->
+        <el-table
+          v-show=" !tableFlage "
+          ref="togetherTableRef" v-loading=" togetherLoading " :data=" togetherList " border style="width: 100%;"
+          :row-key=" getRowKeys " :expand-row-keys=" expands " :show-header=" false " @expand-change=" expandChange "
+          @select="togetherSelect"
+        >
+          <el-table-column type="selection" width="38" />
           <el-table-column type="expand">
+            <template #default="props">
+              <!-- 展开表格身体 -->
+              <!-- <normal-table
             <template #default>
               <normal-table
                 :data=" expandList " :total=" 0 " :columns=" columns " :list-loading=" expandLoading " :options="
@@ -601,7 +691,58 @@
                     border: true, // 是否需要上方边框
                   }
                 " :pagination=" false " :is-showmulti-select=" true " :show-header=" false " :query="{}"
-              />
+              /> -->
+              <el-table
+                ref="expandTableRef"
+                v-loading=" expandLoading " :data=" expandList " border style="width: 100%;"
+                :show-header=" false " @select="expandSelect"
+              >
+                <el-table-column type="selection" width="38" />
+                <el-table-column v-for="item in columns" :key="item.value" :labe="item.text" :prop="item.value" align="center" />
+                <el-table-column label="操作" width="160" align="center">
+                  <template #default=" scope ">
+                    <el-button link type="primary" size="small" @click="detail(scope.row)">
+                      查看
+                    </el-button>
+                    <el-button
+                      v-if="proxy.buttonPerm.edit.if({ approvalStatusName: $props.statusName }, permUrl.edit)" link type="primary" size="small"
+                      @click="handler(scope.row, 'update')"
+                    >
+                      编辑
+                    </el-button>
+                    <el-button
+                      v-if="proxy.buttonPerm.agree.if({ approvalStatusName: $props.statusName }, permUrl.agree)" link type="primary" size="small"
+                      @click="approveHandler(scope.row, 'agree')"
+                    >
+                      同意
+                    </el-button>
+                    <el-button
+                      v-if="proxy.buttonPerm.reject.if({ approvalStatusName: $props.statusName }, permUrl.reject)" link type="primary" size="small"
+                      @click="approveHandler(scope.row, 'refuse')"
+                    >
+                      拒绝
+                    </el-button>
+                    <el-button
+                      v-if="proxy.buttonPerm.submit.if({ approvalStatusName: $props.statusName }, permUrl.submit)" link type="primary" size="small"
+                      @click="submit(scope.row)"
+                    >
+                      提交
+                    </el-button>
+                    <el-button
+                      v-if="proxy.buttonPerm.cancel.if({ approvalStatusName: $props.statusName }, permUrl.cancel)" link type="primary" size="small"
+                      @click="canHandler(scope.row)"
+                    >
+                      取消
+                    </el-button>
+                    <el-button
+                      v-if="proxy.buttonPerm.delete.if({ approvalStatusName: $props.statusName }, permUrl.del)" link type="danger" size="small"
+                      @click="delHandler(scope.row)"
+                    >
+                      删除
+                    </el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
             </template>
           </el-table-column>
           <el-table-column label="设备名称" prop="equipmentName" align="center" />
diff --git a/src/views/tested/device/model/components/edit.vue b/src/views/tested/device/model/components/edit.vue
new file mode 100644
index 0000000..0783b12
--- /dev/null
+++ b/src/views/tested/device/model/components/edit.vue
@@ -0,0 +1,251 @@
+<!-- 设备规格型号-编辑 -->
+<script lang="ts" setup name="DeviceModelEdit">
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import tableList from './technology.vue'
+import { getDictByCode } from '@/api/system/dict'
+import { handlerFunApi } from '@/api/eqpt/device/model'
+import useUserStore from '@/store/modules/user'
+import { getUserDept } from '@/api/system/user'
+import { uploadApi } from '@/api/system/notice'
+import showPhoto from '@/views/tested/device/info/components/showPhoto.vue'
+const $route = useRoute()
+const $router = useRouter()
+const userStore = useUserStore()
+const ruleFormRef = ref<FormInstance>() // from组件
+const title = ref('')
+// 显示标题
+const textMap: { [key: string]: string } = {
+  update: '编辑',
+  create: '新增',
+  detail: '详情',
+}
+// 对话框类型：create,update
+const dialogStatus = ref('create')
+const ruleForm = ref({
+  category: '', // 设备分类
+  categoryName: '', // 设备分类名称
+  checkCycle: '', // 检定周期
+  createDeptId: '',
+  createTime: '',
+  createUserId: '',
+  equipmentName: '', // 设备名称
+  helpInstruction: '', // 辅助字段
+  id: '',
+  instructionsFile: '', // 附件
+  model: '', // 规格型号
+  modelNo: '', // 规格型号编号
+  remark: '', // 备注
+  technicalTargetList: [], // 技术指标
+  updateTime: '',
+}) // 表单
+const rules = ref<FormRules>({
+  equipmentName: [{ required: true, message: '设备名称名称必填', trigger: 'blur' }],
+  category: [{ required: true, message: '设备分类必选', trigger: 'blur' }],
+  model: [{ required: true, message: '规格型号必填', trigger: 'blur' }],
+  checkCycle: [{ required: true, message: '检定周期必填', trigger: 'blur' }],
+}) // 表单验证规则
+// 弹窗初始化
+const initDialog = () => {
+  dialogStatus.value = $route.params.type as string
+  ruleFormRef.value?.resetFields()
+  if ($route.params.type === 'create') {
+    ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+    ruleForm.value.createUserId = userStore.id
+    // 获取当前用户所在单位
+    getUserDept().then((res) => {
+      ruleForm.value.createDeptId = res.data.id
+    })
+  }
+  else {
+    console.log($route.query.row, 'data')
+    const data = JSON.parse($route.query.row as string)
+    // detailGroup({ groupId: data.id }).then((res) => {
+    ruleForm.value = data
+    // })
+  }
+}
+onMounted(() => {
+  initDialog()
+})
+// 关闭弹窗
+const close = () => {
+  $router.back()
+}
+const tableRef = ref()
+// 保存
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid && tableRef.value.checkCertificateList()) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        ruleForm.value.equipmentList = tableRef.value.list
+        if ($route.params.type === 'create') {
+          handlerFunApi('create', ruleForm.value).then((res) => {
+            ElMessage.success('添加成功')
+            close()
+          })
+        }
+        else {
+          handlerFunApi('update', ruleForm.value).then((res) => {
+            ElMessage.success('修改成功')
+            close()
+          })
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    fd.append('multipartFile', event.target.files[0])
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        ruleForm.value.instructionsFile = ruleForm.value.instructionsFile ? `${ruleForm.value.instructionsFile},${res.data[0]}` : res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
+        loading.close()
+      }
+      else {
+        // ElMessage.error(res.message)
+        loading.close()
+      }
+    })
+  }
+}
+// 上传
+const upload = () => {
+  fileRef.value.click()
+}
+// 删除上传的文件
+const deleteFile = (fileName: string) => {
+  const data = ruleForm.value.instructionsFile.split(',')
+  const filterData = data.filter(item => item !== fileName)
+  ruleForm.value.instructionsFile = filterData.length ? filterData.join(',') : ''
+}
+// 设备分类
+const deviceTypeList = ref<{ id: string; value: string; name: string }[]>([])
+const fetchSelect = () => {
+  // 设备分类
+  getDictByCode('eqptDeviceType').then((res) => {
+    deviceTypeList.value = res.data
+  })
+}
+fetchSelect()
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <approval-dialog ref="approvalDialogRef" @on-success="() => { $router.back() }" />
+    <detail-page :title="`设备规格型号管理-${textMap[dialogStatus]}`">
+      <template #btns>
+        <el-button v-if="dialogStatus !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-com>
+      <el-form
+        ref="ruleFormRef"
+        :model="ruleForm"
+        :rules="rules" label-position="right" label-width="110px" class="form"
+        :disabled="dialogStatus === 'detail'"
+        :class="$route.path.includes('detail') ? 'isDetail' : ''"
+      >
+        <el-row :gutter="24" class="marg">
+          <el-col :span="8">
+            <el-form-item label="型号规格编号">
+              <el-input v-model.trim="ruleForm.modelNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm.equipmentName" placeholder="设备名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="规格型号" prop="model">
+              <el-input v-model.trim="ruleForm.model" placeholder="规格型号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="8">
+            <el-form-item label="辅助字段" prop="helpInstruction">
+              <el-input v-model.trim="ruleForm.helpInstruction" placeholder="辅助字段" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="设备分类" prop="category">
+              <el-select v-model.trim="ruleForm.category" placeholder="设备名称" style="width: 100%;">
+                <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="检定周期" prop="checkCycle">
+              <!-- <el-input v-model.trim="ruleForm.checkCycle" placeholder="检定周期" /> -->
+              <el-input v-model.trim="ruleForm.checkCycle">
+                <template #append>
+                  月
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="使用说明书" prop="instructionsFile">
+              <!-- <el-input v-model.trim="ruleForm.helpInstruction" placeholder="辅助字段" /> -->
+              <show-photo :minio-file-name="ruleForm.instructionsFile" @delete="deleteFile" />
+              <input ref="fileRef" style="display: none;" type="file" accept="application/msword,application/pdf" @change="onFileChange">
+              <el-button v-if="dialogStatus !== 'detail'" type="primary" @click="upload">
+                上传
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="18">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.remark" type="textarea" :row="3" maxlength="100" show-word-limit />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block-com>
+    <detail-block-com>
+      <table-list ref="tableRef" :data="ruleForm.technicalTargetList" :status="dialogStatus" />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/tested/device/model/components/list.vue b/src/views/tested/device/model/components/list.vue
new file mode 100644
index 0000000..60a0a42
--- /dev/null
+++ b/src/views/tested/device/model/components/list.vue
@@ -0,0 +1,266 @@
+<!-- 设备规格型号管理列表 -->
+<script lang="ts" setup name="DeviceModelList">
+import { reactive, ref, watch } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { deleteModel, exportModelList, getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
+import { exportFile } from '@/utils/exportUtils'
+import { getDictByCode } from '@/api/system/dict'
+const { proxy } = getCurrentInstance() as any
+const listQuery = reactive({
+  category: '',
+  equipmentName: '',
+  helpInstruction: '',
+  model: '',
+  offset: 1,
+  limit: 20,
+})
+const columns = ref([
+  {
+    text: '型号规格编号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '型号规格',
+    value: 'model',
+    align: 'center',
+  },
+  {
+    text: '辅助字段',
+    value: 'helpInstruction',
+    align: 'center',
+  },
+  {
+    text: '设备分类',
+    value: 'categoryName',
+    align: 'center',
+  },
+  {
+    text: '检定周期',
+    value: 'checkCycle',
+    align: 'center',
+  },
+  {
+    text: '使用说明书',
+    value: 'instructionsFile',
+    align: 'center',
+  },
+  {
+    text: '备注',
+    value: 'remark',
+    align: 'center',
+  },
+])
+const list = ref([])
+const total = ref(0)
+const listLoading = ref(true)
+
+// 获取数据
+const fetchData = (isNowPage = true) => {
+  listLoading.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  getModelList(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  })
+}
+fetchData()
+// 查询数据
+const search = () => {
+  fetchData(false)
+}
+// 重置
+const reset = () => {
+  listQuery.category = ''
+  listQuery.equipmentName = ''
+  listQuery.helpInstruction = ''
+  listQuery.model = ''
+  listQuery.offset = 1
+  listQuery.limit = 20
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData()
+}
+const $router = useRouter()
+// 新建编辑操作
+const handler = (row: any, type: string) => {
+  $router.push({
+    path: `/dmodel/${type}`,
+    query: {
+      row: JSON.stringify(row),
+      id: row.id,
+    },
+  })
+}
+// 删除
+const delHandler = (row: any) => {
+  ElMessageBox.confirm(
+    '确认删除操作？注意删除不可逆。',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    // 判断设备是否被绑定
+    // 此设备型号与已存在设备绑定，请先删除设备
+    deleteModel({ id: row.id }).then((res) => {
+      ElMessage.success('操作成功')
+      search()
+    })
+  })
+}
+// 表格被选中的行
+const selectList = ref<any[]>([])
+// 表格多选
+const multiSelect = (row: any[]) => {
+  selectList.value = row
+}
+// 导出列表
+const exportList = () => {
+  if (list.value.length) {
+    const loading = ElLoading.service({
+      lock: true,
+      text: 'Loading',
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const data = {
+      ...listQuery,
+      offset: undefined,
+      limit: undefined,
+      ids: selectList.value.map(item => item.id),
+    }
+    exportModelList(data).then((res) => {
+      exportFile('设备规格型号')
+      loading.close()
+    })
+      .catch((_) => {
+        loading.close()
+      })
+  }
+  else {
+    ElMessage.warning('无可导出内容')
+  }
+}
+// 获取下拉列表相关
+// 设备名称
+const deviceNameList = ref<{ id: string; value: string; name: string }[]>([])
+// 设备分类
+const deviceTypeList = ref<{ id: string; value: string; name: string }[]>([])
+// 规格型号
+const modelList = ref<any[]>([])
+// 辅助字段
+const helpList = ref<any[]>([])
+const allList = ref<any[]>([])
+const fetchSelect = () => {
+  // 设备分类
+  getDictByCode('eqptDeviceType').then((res) => {
+    deviceTypeList.value = res.data
+  })
+  // 设备名称
+  getDeviceNameList().then((res) => {
+    deviceNameList.value = res.data
+  })
+  // 规格型号及辅助字段
+  getModelAllList({}).then((res) => {
+    allList.value = res.data
+    modelList.value = res.data
+    helpList.value = res.data.filter(item => item.helpInstruction)
+  })
+}
+fetchSelect()
+// 监听设备名称下拉框，修改规格型号和辅助字段
+watch(() => listQuery.equipmentName, (newVal) => {
+  if (newVal) {
+    listQuery.helpInstruction = ''
+    listQuery.model = ''
+    // 修改规格型号和辅助字段列表
+    const data = allList.value.filter(item => item.equipmentName === newVal)
+    modelList.value = data
+    helpList.value = data.filter(item => item.helpInstruction)
+  }
+})
+// 监听规格型号下拉框，修改辅助字段
+watch(() => listQuery.model, (newVal) => {
+  if (newVal) {
+    listQuery.helpInstruction = ''
+    // 修改规格型号和辅助字段列表
+    console.log(helpList.value, 'helpList.value')
+    helpList.value = helpList.value.filter(item => item.model === newVal)
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-select v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable>
+          <el-option v-for="item in deviceNameList" :key="item" :label="item" :value="item" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model.trim="listQuery.model" placeholder="规格型号" clearable>
+          <el-option v-for="item in modelList" :key="item.id" :label="item.model" :value="item.model" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model.trim="listQuery.helpInstruction" placeholder="辅助字段" clearable>
+          <el-option v-for="item in helpList" :key="item.id" :label="item.helpInstruction" :value="item.helpInstruction" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model.trim="listQuery.category" placeholder="设备分类" clearable>
+          <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-add" title="新增" @click="handler({}, 'create')" />
+        <icon-button icon="icon-export" title="导出" @click="exportList" />
+      </template>
+      <!-- 普通表格 -->
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
+      >
+        <template #columns>
+          <el-table-column label="操作" width="140" align="center">
+            <template #default="scope">
+              <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
+                查看
+              </el-button>
+              <el-button link type="primary" size="small" @click="handler(scope.row, 'update')">
+                编辑
+              </el-button>
+              <el-button link type="danger" size="small" @click="delHandler(scope.row)">
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+

diff --git a/.env.development b/.env.development
index debe1a8..f2fee42 100644
--- a/.env.development
+++ b/.env.development
@@ -4,7 +4,7 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
-VITE_APP_API_BASEURL = http://127.0.0.1:5909
+VITE_APP_API_BASEURL = http://192.168.8.101:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..313fcf7 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://192.168.8.101:5909"
 }
diff --git a/src/api/eqpt/device/model.ts b/src/api/eqpt/device/model.ts
new file mode 100644
index 0000000..a8fa0f1
--- /dev/null
+++ b/src/api/eqpt/device/model.ts
@@ -0,0 +1,61 @@
+/**
+ * 设备型号规格管理相关
+ */
+import request from '@/api/index'
+
+// 列表
+export function getModelList(params: any) {
+  return request({
+    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}`,
+    method: 'post',
+    data: params,
+  })
+}
+// 列表-不分页
+export function getModelAllList(params: any) {
+  return request({
+    url: '/equipment/model/list',
+    method: 'post',
+    data: params,
+  })
+}
+// 设备名称列表/equipment/model/listEquipmentName
+export function getDeviceNameList(params: any) {
+  return request({
+    url: '/equipment/model/listEquipmentName',
+    method: 'get',
+    params,
+  })
+}
+// 导出
+export function exportModelList(data: any) {
+  return request({
+    url: '/equipment/model/export',
+    method: 'post',
+    data,
+  })
+}
+// 新建或编辑
+export function handlerFunApi(type: string, data: any) {
+  if (type === 'create') {
+    return request({
+      url: '/equipment/model/add',
+      method: 'post',
+      data,
+    })
+  }
+  else if (type === 'update') {
+    return request({
+      url: '/equipment/model/update',
+      method: 'post',
+      data,
+    })
+  }
+}
+// 删除
+export function deleteModel(data: any) {
+  return request({
+    url: `/equipment/model/delete?id=${data.id}`,
+    method: 'post',
+  })
+}
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 14ec12e..64e6f48 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -55,11 +55,12 @@
   // listQuery.value.offset = 1
   // }
   fetchApproval({ processId: listQuery.value.processId }).then((response) => {
+    console.log(response.data, 'response')
     response.data.forEach((item: Array<IList>, index: number) => {
       item.forEach((i: any) => {
         list.value.push({
           cindex: index,
-          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[i.cindex].nodeNumber + 1,
+          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[index - 1].nodeNumber + 1,
           assigneeName: i.assigneeName, // 姓名
           approvalStatus: i.approvalStatus, // 审批类型
           finishTime: i.finishTime ? i.finishTime : '-', // 完成时间
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index f08078d..aefbd8b 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -90,8 +90,16 @@
     type: String,
     default: 'default',
   }, // 表格大小，默认，small,mini等，与el-table条件相同
+  // 排序
+  sort: {
+    type: Object,
+    default() {
+      return {
+      }
+    },
+  },
 })
-const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'multiSelect'])
+const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'multiSelect', 'sortChange'])
 // -------定义数据--------------
 interface columnsCheckInfo {
   text: string
@@ -139,6 +147,10 @@
 function selectionChange(selection: []) {
   emit('selectionChange', selection)
 }
+// 点击排序
+function sortClick(column: any, prop: any, order: any) {
+  emit('sortChange', { column, prop, order })
+}
 // 点击行
 function rowClick(row: object, column?: any, event?: any) {
   emit('rowClick', row)
@@ -196,11 +208,13 @@
       border
       stripe
       :size="size"
+      :default-sort="props.sort"
       :show-header="showHeader"
       style="width: 100%;"
       @selection-change="handleSelectionChange"
       @select="selectClick"
       @row-click="rowClick"
+      @sort-change="sortClick"
     >
       <slot name="preColumns" />
 
@@ -210,7 +224,7 @@
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
+      <el-table-column v-for="column of columns" :key="column.value" :sortable="column.sortable" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
           <span v-else :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ column.filter(scope.row) }}</span>
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index 5cf6445..2cd73de 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -320,7 +320,7 @@
   {
     path: '/meteringdevice',
     component: Layout,
-    redirect: '/devicelist',
+    redirect: '/modellist',
     name: 'MeteringDevice',
     meta: {
       title: '设备台账',
@@ -329,6 +329,43 @@
     },
     children: [
       {
+        path: '/modellist',
+        component: Layout,
+        redirect: '/dmodel',
+        name: 'DeviceModel',
+        meta: {
+          title: '设备规格型号管理',
+          icon: 'ep:key',
+          auth: '/tested/device/model',
+        },
+        children: [
+          {
+            path: '/dmodel',
+            name: 'DeviceModelPage',
+            component: () => import('@/views/tested/device/model/index.vue'),
+            meta: {
+              title: '设备规格型号管理',
+              auth: '/tested/device/model',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/modellist',
+            },
+          },
+          {
+            path: '/dmodel/:type',
+            name: 'ModelEdit',
+            component: () => import('@/views/tested/device/model/components/edit.vue'),
+            meta: {
+              title: '设备规格型号管理',
+              auth: '/tested/device/model',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/modellist',
+            },
+          },
+        ],
+      },
+      {
         path: '/devicelist',
         component: Layout,
         redirect: '/dinfo',
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 6c9383f..879a207 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -158,7 +158,11 @@
 }
 // 批量删除
 const batchDeleteLabel = () => {
-  if (selectList.value.length) {
+  if (selectList.value.filter(item => item.usageStatusName === '已使用').length) {
+    ElMessage.warning('请选择未使用的标签')
+    return
+  }
+  if (selectList.value.filter(item => item.usageStatusName !== '已使用').length) {
     ElMessageBox.confirm(
       '确认删除所选数据吗？',
       '提示',
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index 60d55d6..ba91cbf 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -25,7 +25,7 @@
   offset: 1,
 }) // 查询参数
 watch(() => noticeTime.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     searchQuery.noticeStartTime = `${newVal[0]} 00:00:00`
     searchQuery.noticeEndTime = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/system/signature/autograph.vue b/src/views/system/signature/autograph.vue
index e5a32c8..9c1d0ca 100644
--- a/src/views/system/signature/autograph.vue
+++ b/src/views/system/signature/autograph.vue
@@ -23,7 +23,7 @@
   ids: [],
 }) // 查询参数
 watch(() => createTime.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     searchQuery.createStartTime = `${newVal[0]} 00:00:00`
     searchQuery.createEndTime = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 5f57089..b557683 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -16,7 +16,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index 8f31905..e140eaa 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.applicantTimeStart = `${newVal[0]} 00:00:00`
     listQuery.applicantTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/opinion/index.vue b/src/views/tested/MeasurementBusiness/opinion/index.vue
index 6c7e13c..c6683c0 100644
--- a/src/views/tested/MeasurementBusiness/opinion/index.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue
index b15f27b..e204a69 100644
--- a/src/views/tested/MeasurementBusiness/review/index.vue
+++ b/src/views/tested/MeasurementBusiness/review/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
@@ -76,21 +76,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
-  // getListPage(listQuery).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   listLoading.value = false
-  // })
-  list.value = [{
-    formNo: '12345',
-    formName: '评审表1',
-    labCode: '海口实验室',
-    groupCode: '组别1',
-    signStatusName: '同意',
-    createUserName: '张三',
-    createTime: '2023-09-05',
-  }]
-  listLoading.value = false
+  getListPage(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  })
 }
 fetchData()
 // 查询数据
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 0e2fd1c..217365a 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -14,7 +14,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.sendTimeStart = `${newVal[0]} 00:00:00`
     listQuery.sendTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index e117705..e2d0ea2 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -12,6 +12,7 @@
     required: true,
   },
 })
+const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
 const userStore = useUserStore()
 const listQuery = reactive({
@@ -20,8 +21,8 @@
   createTimeEnd: '',
   createTimeStart: '',
   notifyType: $props.notifyType, // 通知类型(负责人/部门，字典值)
-  notifyDept: userStore.deptId,
-  notifyUser: userStore.id,
+  notifyDept: $route.path.includes('curatorpage') ? '' : userStore.deptId,
+  notifyUser: $route.path.includes('curatorpage') ? userStore.id : '',
   offset: 1,
   limit: 20,
 })
@@ -30,7 +31,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/dept/index.vue b/src/views/tested/MeasurementPlan/dept/index.vue
index aafe5e1..a25835f 100644
--- a/src/views/tested/MeasurementPlan/dept/index.vue
+++ b/src/views/tested/MeasurementPlan/dept/index.vue
@@ -5,5 +5,5 @@
 
 <template>
   <!-- notifyType 通知类型(负责人/部门，字典值) -->
-  <page notify-type="1" />
+  <page notify-type="2" />
 </template>
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 3cdecdc..429acf5 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -53,7 +53,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index f599508..2c53a36 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -24,7 +24,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index 6af790b..f17af59 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -39,7 +39,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 6fa4355..d0e9936 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -27,7 +27,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.value.certificateValidStart = `${newVal[0]} 00:00:00`
     listQuery.value.certificateValidEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/task/index.vue b/src/views/tested/MeasurementPlan/task/index.vue
index 4ab62d9..aa759a8 100644
--- a/src/views/tested/MeasurementPlan/task/index.vue
+++ b/src/views/tested/MeasurementPlan/task/index.vue
@@ -17,7 +17,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createStartTime = `${newVal[0]} 00:00:00`
     listQuery.createEndTime = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index c7d63b8..67b4dac 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -99,7 +99,7 @@
 }
 const range = ref()
 watch(() => range.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.certificateValidStart = `${newVal[0]} 00:00:00`
     listQuery.certificateValidEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index 5d8d328..af479a6 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -41,7 +41,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.value.certificateValidStart = `${newVal[0]} 00:00:00`
     listQuery.value.certificateValidEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/device/group/components/tableList.vue b/src/views/tested/device/group/components/tableList.vue
index d1f60ce..f1b817a 100644
--- a/src/views/tested/device/group/components/tableList.vue
+++ b/src/views/tested/device/group/components/tableList.vue
@@ -177,7 +177,16 @@
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
           <el-input
-            v-if="scope.row.editable && !item.isSelect" v-model="scope.row[item.value]" :autofocus="true"
+            v-if="scope.row.editable && !item.isSelect && item.text === '设备名称'" v-model="scope.row[item.value]" :autofocus="true"
+            :placeholder="`${item.text}`" class="input"
+            @focus="select(item.text, scope.$index)"
+          >
+            <template #append>
+              <span @click="select(item.text, scope.$index)">选择</span>
+            </template>
+          </el-input>
+          <el-input
+            v-if="scope.row.editable && !item.isSelect && item.text !== '设备名称'" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
             @focus="select(item.text, scope.$index)"
           />
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 7443364..db05d4d 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -50,6 +50,7 @@
     text: '统一编号',
     value: 'equipmentNo',
     align: 'center',
+    sortable: 'custom',
   },
   {
     text: '设备名称',
@@ -60,11 +61,13 @@
     text: '型号规格',
     value: 'model',
     align: 'center',
+    sortable: 'custom',
   },
   {
     text: '出厂编号',
     value: 'manufactureNo',
     align: 'center',
+    sortable: 'custom',
   },
   {
     text: '使用岗位',
@@ -85,6 +88,7 @@
     text: '证书有效期',
     value: 'certificateValid',
     align: 'center',
+    sortable: 'custom',
   },
 ])
 const allColums = ref([
@@ -92,6 +96,7 @@
     text: '使用状态',
     value: 'usageStatusName',
     align: 'center',
+    sortable: 'custom',
   },
   {
     text: '备注',
@@ -121,6 +126,21 @@
     align: 'center',
   },
 ])
+// 排序条件发生变化
+const sortChange = ({ column }: any) => {
+  if (column.order === 'ascending') {
+    console.log(column.prop)
+    console.log('升序')
+  }
+  else if (column.order === 'descending') {
+    console.log(column.prop)
+    console.log('倒叙')
+  }
+}
+// 聚合表格实例
+const togetherTableRef = ref()
+// 展开表格实例
+const expandTableRef = ref()
 const list = ref([])
 const total = ref(0)
 const listLoading = ref(true)
@@ -157,7 +177,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.certificateValidStart = `${newVal[0]} 00:00:00`
     listQuery.certificateValidEnd = `${newVal[1]} 23:59:59`
   }
@@ -209,12 +229,29 @@
   expandLoading.value = true
   getInfoList(params).then((res) => {
     expandList.value = res.data
+    // 获取聚合表格选中，判断展开表格是否需要全选
+    const selectList = togetherTableRef.value.getSelectionRows()
+    if (selectList.length) {
+      const select = selectList.filter((item: any) => item.equipmentName === params.equipmentName)
+      if (select.length) {
+        nextTick(() => {
+          expandTableRef.value.toggleAllSelection()
+        })
+      }
+    }
     expandLoading.value = false
   })
 }
 const getRowKeys = (row: any) => { // 获取当前行id
   return row.equipmentName // 这里看这一行中需要根据哪个属性值是id
 }
+// 监听聚合表格多选
+// watch(() => togetherTableRef.value?.getSelectionRows(), (newVal, oldVal) => {
+//   console.log(newVal, 'newVal')
+// }, {
+//   deep: true,
+// })
+
 // 表格被选中的行
 const selectList = ref<any[]>([])
 // 表格多选
@@ -240,6 +277,48 @@
 {
   deep: true,
 })
+const togetherSelect = (selection: any, row: any) => {
+  if (selection.includes(row)) {
+    // 勾选
+    console.log('勾选')
+    if (expands.value && expands.value[0] === row.equipmentName) {
+      expandTableRef.value.toggleAllSelection()
+    }
+  }
+  else {
+    // 取消勾选
+    console.log('取消勾选')
+    if (expands.value && expands.value[0] === row.equipmentName) {
+      expandTableRef.value.toggleAllSelection()
+    }
+  }
+}
+const expandSelect = (selection: any, row: any) => {
+  if (selection.length === expandList.value.length) {
+    // 全选
+    console.log('全选')
+    // 获取聚合
+    console.log(expands.value[0])
+    const data = togetherList.value.filter((item: any) => item.equipmentName === expands.value[0])
+    console.log(data)
+    if (data.length) {
+      nextTick(() => {
+        togetherTableRef.value.toggleRowSelection(data[0], true)
+      })
+    }
+  }
+  else {
+    // 全不选
+    console.log('全不选')
+    // 获取聚合
+    const data = togetherList.value.filter((item: any) => item.equipmentName === expands.value[0])
+    if (data.length) {
+      nextTick(() => {
+        togetherTableRef.value.toggleRowSelection(data[0], false)
+      })
+    }
+  }
+}
 const $router = useRouter()
 // 新建编辑操作
 const handler = (row: IlistObjType, type: string) => {
@@ -497,7 +576,7 @@
       <template v-if="$props.statusName === '全部'" #btns-right>
         <icon-button icon="icon-change" title="切换列表状态" @click="changeTable" />
         <icon-button icon="icon-sweep" title="扫描" />
-        <icon-button icon="icon-add" title="新增" @click="handler({}, 'create')" />
+        <icon-button icon="icon-add" title="新增" @click="handler({} as any, 'create')" />
         <icon-button icon="icon-import" title="批量导入" @click="importList" />
         <icon-button icon="icon-template" title="模板下载" @click="useTemplateDownload('设备信息管理模块')" />
         <icon-button icon="icon-export" title="导出" @click="exportList" />
@@ -508,30 +587,29 @@
         <normal-table
           v-show=" tableFlage "
           ref="normalTableRef" :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="listLoading" :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
+          :list-loading="listLoading"
+          :is-showmulti-select="true" :is-multi="true" @sort-change="sortChange" @change="changePage" @multi-select="multiSelect"
         >
           <template #columns>
             <!-- 全部状态 -->
-            <el-table-column
-              v-for=" column of allColums " :key=" column.value "
-              :label=" column.text " :prop=" column.value " :align=" column.align "
-              :show-overflow-tooltip="true"
-            >
-              <template v-if="$props.statusName === '全部' " #default=" scope ">
-                <span>{{ scope.row[column.value] }}</span>
-              </template>
-            </el-table-column>
+            <template v-if="$props.statusName === '全部' ">
+              <el-table-column
+                v-for=" column of allColums " :key=" column.value "
+                :label=" column.text " :prop=" column.value " :align=" column.align "
+                :show-overflow-tooltip="true"
+                :sortable="column.sortable"
+              />
+            </template>
             <!-- 其他审批状态 -->
-            <el-table-column
-              v-for=" column of otherColums " :key="column.value" :label=" column.text "
-              :prop=" column.value " :align=" column.align "
-              :show-overflow-tooltip="true"
-            >
-              <template v-if="$props.statusName !== '全部' " #default=" scope ">
-                <span>
-                  {{ scope.row[column.value] }}</span>
-              </template>
-            </el-table-column>
+            <template v-if="$props.statusName !== '全部' ">
+              <el-table-column
+                v-for=" column of otherColums " :key="column.value"
+                :label=" column.text "
+                :prop=" column.value " :align=" column.align "
+                :show-overflow-tooltip="true"
+              />
+            </template>
+
             <el-table-column label="操作" width="160" align="center">
               <template #default=" scope ">
                 <el-button link type="primary" size="small" @click="detail(scope.row)">
@@ -580,6 +658,7 @@
       </div>
       <div v-if=" !tableFlage ">
         <!-- 展开行表格 -->
+        <!-- 头部 -->
         <normal-table
           v-show=" !tableFlage " class="nortable-header" :data=" [] " :total=" 0 " :columns=" columns " :options="
             {
@@ -587,12 +666,23 @@
               border: true, // 是否需要上方边框
             }
           " :pagination=" false " :is-showmulti-select=" true " :query="{}"
-        />
-        <el-table
-          v-show=" !tableFlage " v-loading=" togetherLoading " :data=" togetherList " border style="width: 100%;"
-          :row-key=" getRowKeys " :expand-row-keys=" expands " :show-header=" false " @expand-change=" expandChange "
         >
+          <template #columns>
+            <el-table-column label="操作" width="160" align="center" />
+          </template>
+        </normal-table>
+        <!-- 身体 -->
+        <el-table
+          v-show=" !tableFlage "
+          ref="togetherTableRef" v-loading=" togetherLoading " :data=" togetherList " border style="width: 100%;"
+          :row-key=" getRowKeys " :expand-row-keys=" expands " :show-header=" false " @expand-change=" expandChange "
+          @select="togetherSelect"
+        >
+          <el-table-column type="selection" width="38" />
           <el-table-column type="expand">
+            <template #default="props">
+              <!-- 展开表格身体 -->
+              <!-- <normal-table
             <template #default>
               <normal-table
                 :data=" expandList " :total=" 0 " :columns=" columns " :list-loading=" expandLoading " :options="
@@ -601,7 +691,58 @@
                     border: true, // 是否需要上方边框
                   }
                 " :pagination=" false " :is-showmulti-select=" true " :show-header=" false " :query="{}"
-              />
+              /> -->
+              <el-table
+                ref="expandTableRef"
+                v-loading=" expandLoading " :data=" expandList " border style="width: 100%;"
+                :show-header=" false " @select="expandSelect"
+              >
+                <el-table-column type="selection" width="38" />
+                <el-table-column v-for="item in columns" :key="item.value" :labe="item.text" :prop="item.value" align="center" />
+                <el-table-column label="操作" width="160" align="center">
+                  <template #default=" scope ">
+                    <el-button link type="primary" size="small" @click="detail(scope.row)">
+                      查看
+                    </el-button>
+                    <el-button
+                      v-if="proxy.buttonPerm.edit.if({ approvalStatusName: $props.statusName }, permUrl.edit)" link type="primary" size="small"
+                      @click="handler(scope.row, 'update')"
+                    >
+                      编辑
+                    </el-button>
+                    <el-button
+                      v-if="proxy.buttonPerm.agree.if({ approvalStatusName: $props.statusName }, permUrl.agree)" link type="primary" size="small"
+                      @click="approveHandler(scope.row, 'agree')"
+                    >
+                      同意
+                    </el-button>
+                    <el-button
+                      v-if="proxy.buttonPerm.reject.if({ approvalStatusName: $props.statusName }, permUrl.reject)" link type="primary" size="small"
+                      @click="approveHandler(scope.row, 'refuse')"
+                    >
+                      拒绝
+                    </el-button>
+                    <el-button
+                      v-if="proxy.buttonPerm.submit.if({ approvalStatusName: $props.statusName }, permUrl.submit)" link type="primary" size="small"
+                      @click="submit(scope.row)"
+                    >
+                      提交
+                    </el-button>
+                    <el-button
+                      v-if="proxy.buttonPerm.cancel.if({ approvalStatusName: $props.statusName }, permUrl.cancel)" link type="primary" size="small"
+                      @click="canHandler(scope.row)"
+                    >
+                      取消
+                    </el-button>
+                    <el-button
+                      v-if="proxy.buttonPerm.delete.if({ approvalStatusName: $props.statusName }, permUrl.del)" link type="danger" size="small"
+                      @click="delHandler(scope.row)"
+                    >
+                      删除
+                    </el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
             </template>
           </el-table-column>
           <el-table-column label="设备名称" prop="equipmentName" align="center" />
diff --git a/src/views/tested/device/model/components/edit.vue b/src/views/tested/device/model/components/edit.vue
new file mode 100644
index 0000000..0783b12
--- /dev/null
+++ b/src/views/tested/device/model/components/edit.vue
@@ -0,0 +1,251 @@
+<!-- 设备规格型号-编辑 -->
+<script lang="ts" setup name="DeviceModelEdit">
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import tableList from './technology.vue'
+import { getDictByCode } from '@/api/system/dict'
+import { handlerFunApi } from '@/api/eqpt/device/model'
+import useUserStore from '@/store/modules/user'
+import { getUserDept } from '@/api/system/user'
+import { uploadApi } from '@/api/system/notice'
+import showPhoto from '@/views/tested/device/info/components/showPhoto.vue'
+const $route = useRoute()
+const $router = useRouter()
+const userStore = useUserStore()
+const ruleFormRef = ref<FormInstance>() // from组件
+const title = ref('')
+// 显示标题
+const textMap: { [key: string]: string } = {
+  update: '编辑',
+  create: '新增',
+  detail: '详情',
+}
+// 对话框类型：create,update
+const dialogStatus = ref('create')
+const ruleForm = ref({
+  category: '', // 设备分类
+  categoryName: '', // 设备分类名称
+  checkCycle: '', // 检定周期
+  createDeptId: '',
+  createTime: '',
+  createUserId: '',
+  equipmentName: '', // 设备名称
+  helpInstruction: '', // 辅助字段
+  id: '',
+  instructionsFile: '', // 附件
+  model: '', // 规格型号
+  modelNo: '', // 规格型号编号
+  remark: '', // 备注
+  technicalTargetList: [], // 技术指标
+  updateTime: '',
+}) // 表单
+const rules = ref<FormRules>({
+  equipmentName: [{ required: true, message: '设备名称名称必填', trigger: 'blur' }],
+  category: [{ required: true, message: '设备分类必选', trigger: 'blur' }],
+  model: [{ required: true, message: '规格型号必填', trigger: 'blur' }],
+  checkCycle: [{ required: true, message: '检定周期必填', trigger: 'blur' }],
+}) // 表单验证规则
+// 弹窗初始化
+const initDialog = () => {
+  dialogStatus.value = $route.params.type as string
+  ruleFormRef.value?.resetFields()
+  if ($route.params.type === 'create') {
+    ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+    ruleForm.value.createUserId = userStore.id
+    // 获取当前用户所在单位
+    getUserDept().then((res) => {
+      ruleForm.value.createDeptId = res.data.id
+    })
+  }
+  else {
+    console.log($route.query.row, 'data')
+    const data = JSON.parse($route.query.row as string)
+    // detailGroup({ groupId: data.id }).then((res) => {
+    ruleForm.value = data
+    // })
+  }
+}
+onMounted(() => {
+  initDialog()
+})
+// 关闭弹窗
+const close = () => {
+  $router.back()
+}
+const tableRef = ref()
+// 保存
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid && tableRef.value.checkCertificateList()) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        ruleForm.value.equipmentList = tableRef.value.list
+        if ($route.params.type === 'create') {
+          handlerFunApi('create', ruleForm.value).then((res) => {
+            ElMessage.success('添加成功')
+            close()
+          })
+        }
+        else {
+          handlerFunApi('update', ruleForm.value).then((res) => {
+            ElMessage.success('修改成功')
+            close()
+          })
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    fd.append('multipartFile', event.target.files[0])
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        ruleForm.value.instructionsFile = ruleForm.value.instructionsFile ? `${ruleForm.value.instructionsFile},${res.data[0]}` : res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
+        loading.close()
+      }
+      else {
+        // ElMessage.error(res.message)
+        loading.close()
+      }
+    })
+  }
+}
+// 上传
+const upload = () => {
+  fileRef.value.click()
+}
+// 删除上传的文件
+const deleteFile = (fileName: string) => {
+  const data = ruleForm.value.instructionsFile.split(',')
+  const filterData = data.filter(item => item !== fileName)
+  ruleForm.value.instructionsFile = filterData.length ? filterData.join(',') : ''
+}
+// 设备分类
+const deviceTypeList = ref<{ id: string; value: string; name: string }[]>([])
+const fetchSelect = () => {
+  // 设备分类
+  getDictByCode('eqptDeviceType').then((res) => {
+    deviceTypeList.value = res.data
+  })
+}
+fetchSelect()
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <approval-dialog ref="approvalDialogRef" @on-success="() => { $router.back() }" />
+    <detail-page :title="`设备规格型号管理-${textMap[dialogStatus]}`">
+      <template #btns>
+        <el-button v-if="dialogStatus !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-com>
+      <el-form
+        ref="ruleFormRef"
+        :model="ruleForm"
+        :rules="rules" label-position="right" label-width="110px" class="form"
+        :disabled="dialogStatus === 'detail'"
+        :class="$route.path.includes('detail') ? 'isDetail' : ''"
+      >
+        <el-row :gutter="24" class="marg">
+          <el-col :span="8">
+            <el-form-item label="型号规格编号">
+              <el-input v-model.trim="ruleForm.modelNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm.equipmentName" placeholder="设备名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="规格型号" prop="model">
+              <el-input v-model.trim="ruleForm.model" placeholder="规格型号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="8">
+            <el-form-item label="辅助字段" prop="helpInstruction">
+              <el-input v-model.trim="ruleForm.helpInstruction" placeholder="辅助字段" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="设备分类" prop="category">
+              <el-select v-model.trim="ruleForm.category" placeholder="设备名称" style="width: 100%;">
+                <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="检定周期" prop="checkCycle">
+              <!-- <el-input v-model.trim="ruleForm.checkCycle" placeholder="检定周期" /> -->
+              <el-input v-model.trim="ruleForm.checkCycle">
+                <template #append>
+                  月
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="使用说明书" prop="instructionsFile">
+              <!-- <el-input v-model.trim="ruleForm.helpInstruction" placeholder="辅助字段" /> -->
+              <show-photo :minio-file-name="ruleForm.instructionsFile" @delete="deleteFile" />
+              <input ref="fileRef" style="display: none;" type="file" accept="application/msword,application/pdf" @change="onFileChange">
+              <el-button v-if="dialogStatus !== 'detail'" type="primary" @click="upload">
+                上传
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="18">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.remark" type="textarea" :row="3" maxlength="100" show-word-limit />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block-com>
+    <detail-block-com>
+      <table-list ref="tableRef" :data="ruleForm.technicalTargetList" :status="dialogStatus" />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/tested/device/model/components/list.vue b/src/views/tested/device/model/components/list.vue
new file mode 100644
index 0000000..60a0a42
--- /dev/null
+++ b/src/views/tested/device/model/components/list.vue
@@ -0,0 +1,266 @@
+<!-- 设备规格型号管理列表 -->
+<script lang="ts" setup name="DeviceModelList">
+import { reactive, ref, watch } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { deleteModel, exportModelList, getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
+import { exportFile } from '@/utils/exportUtils'
+import { getDictByCode } from '@/api/system/dict'
+const { proxy } = getCurrentInstance() as any
+const listQuery = reactive({
+  category: '',
+  equipmentName: '',
+  helpInstruction: '',
+  model: '',
+  offset: 1,
+  limit: 20,
+})
+const columns = ref([
+  {
+    text: '型号规格编号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '型号规格',
+    value: 'model',
+    align: 'center',
+  },
+  {
+    text: '辅助字段',
+    value: 'helpInstruction',
+    align: 'center',
+  },
+  {
+    text: '设备分类',
+    value: 'categoryName',
+    align: 'center',
+  },
+  {
+    text: '检定周期',
+    value: 'checkCycle',
+    align: 'center',
+  },
+  {
+    text: '使用说明书',
+    value: 'instructionsFile',
+    align: 'center',
+  },
+  {
+    text: '备注',
+    value: 'remark',
+    align: 'center',
+  },
+])
+const list = ref([])
+const total = ref(0)
+const listLoading = ref(true)
+
+// 获取数据
+const fetchData = (isNowPage = true) => {
+  listLoading.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  getModelList(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  })
+}
+fetchData()
+// 查询数据
+const search = () => {
+  fetchData(false)
+}
+// 重置
+const reset = () => {
+  listQuery.category = ''
+  listQuery.equipmentName = ''
+  listQuery.helpInstruction = ''
+  listQuery.model = ''
+  listQuery.offset = 1
+  listQuery.limit = 20
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData()
+}
+const $router = useRouter()
+// 新建编辑操作
+const handler = (row: any, type: string) => {
+  $router.push({
+    path: `/dmodel/${type}`,
+    query: {
+      row: JSON.stringify(row),
+      id: row.id,
+    },
+  })
+}
+// 删除
+const delHandler = (row: any) => {
+  ElMessageBox.confirm(
+    '确认删除操作？注意删除不可逆。',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    // 判断设备是否被绑定
+    // 此设备型号与已存在设备绑定，请先删除设备
+    deleteModel({ id: row.id }).then((res) => {
+      ElMessage.success('操作成功')
+      search()
+    })
+  })
+}
+// 表格被选中的行
+const selectList = ref<any[]>([])
+// 表格多选
+const multiSelect = (row: any[]) => {
+  selectList.value = row
+}
+// 导出列表
+const exportList = () => {
+  if (list.value.length) {
+    const loading = ElLoading.service({
+      lock: true,
+      text: 'Loading',
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const data = {
+      ...listQuery,
+      offset: undefined,
+      limit: undefined,
+      ids: selectList.value.map(item => item.id),
+    }
+    exportModelList(data).then((res) => {
+      exportFile('设备规格型号')
+      loading.close()
+    })
+      .catch((_) => {
+        loading.close()
+      })
+  }
+  else {
+    ElMessage.warning('无可导出内容')
+  }
+}
+// 获取下拉列表相关
+// 设备名称
+const deviceNameList = ref<{ id: string; value: string; name: string }[]>([])
+// 设备分类
+const deviceTypeList = ref<{ id: string; value: string; name: string }[]>([])
+// 规格型号
+const modelList = ref<any[]>([])
+// 辅助字段
+const helpList = ref<any[]>([])
+const allList = ref<any[]>([])
+const fetchSelect = () => {
+  // 设备分类
+  getDictByCode('eqptDeviceType').then((res) => {
+    deviceTypeList.value = res.data
+  })
+  // 设备名称
+  getDeviceNameList().then((res) => {
+    deviceNameList.value = res.data
+  })
+  // 规格型号及辅助字段
+  getModelAllList({}).then((res) => {
+    allList.value = res.data
+    modelList.value = res.data
+    helpList.value = res.data.filter(item => item.helpInstruction)
+  })
+}
+fetchSelect()
+// 监听设备名称下拉框，修改规格型号和辅助字段
+watch(() => listQuery.equipmentName, (newVal) => {
+  if (newVal) {
+    listQuery.helpInstruction = ''
+    listQuery.model = ''
+    // 修改规格型号和辅助字段列表
+    const data = allList.value.filter(item => item.equipmentName === newVal)
+    modelList.value = data
+    helpList.value = data.filter(item => item.helpInstruction)
+  }
+})
+// 监听规格型号下拉框，修改辅助字段
+watch(() => listQuery.model, (newVal) => {
+  if (newVal) {
+    listQuery.helpInstruction = ''
+    // 修改规格型号和辅助字段列表
+    console.log(helpList.value, 'helpList.value')
+    helpList.value = helpList.value.filter(item => item.model === newVal)
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-select v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable>
+          <el-option v-for="item in deviceNameList" :key="item" :label="item" :value="item" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model.trim="listQuery.model" placeholder="规格型号" clearable>
+          <el-option v-for="item in modelList" :key="item.id" :label="item.model" :value="item.model" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model.trim="listQuery.helpInstruction" placeholder="辅助字段" clearable>
+          <el-option v-for="item in helpList" :key="item.id" :label="item.helpInstruction" :value="item.helpInstruction" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model.trim="listQuery.category" placeholder="设备分类" clearable>
+          <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-add" title="新增" @click="handler({}, 'create')" />
+        <icon-button icon="icon-export" title="导出" @click="exportList" />
+      </template>
+      <!-- 普通表格 -->
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
+      >
+        <template #columns>
+          <el-table-column label="操作" width="140" align="center">
+            <template #default="scope">
+              <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
+                查看
+              </el-button>
+              <el-button link type="primary" size="small" @click="handler(scope.row, 'update')">
+                编辑
+              </el-button>
+              <el-button link type="danger" size="small" @click="delHandler(scope.row)">
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
diff --git a/src/views/tested/device/model/components/technology.vue b/src/views/tested/device/model/components/technology.vue
new file mode 100644
index 0000000..d31fb2d
--- /dev/null
+++ b/src/views/tested/device/model/components/technology.vue
@@ -0,0 +1,141 @@
+<!-- 技术指标 -->
+<script lang="ts" setup name="DeviceTechnologyTable">
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { useCheckList } from '@/utils/useCheckList'
+const $props = defineProps({
+  data: {
+    type: Array,
+    default: () => ([]),
+  },
+})
+const $route = useRoute()
+// 表头显示标题
+const columns = ref([
+  {
+    text: '测量范围',
+    value: 'measureRange',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+  {
+    text: '不确定度或允许误差极限或准确度等级',
+    value: 'uncertainty',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+  {
+    text: '依据的技术文件',
+    value: 'basedDocuments',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+])
+const list = ref<any[]>([])
+// 检查数据列表
+function checkCertificateList() {
+  return useCheckList(list.value, columns.value, '技术指标')
+}
+// 将列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of list.value) {
+    item.editable = false
+  }
+}
+// 双击行显示输入框
+const dblclickRow = (row: any) => {
+  if ($route.path.includes('detail')) {
+    return
+  }
+  setAllRowReadable()
+  row.editable = true
+}
+const SelectionList = ref()
+// 表格选中
+const handleSelectionChange = (e: any[]) => {
+  SelectionList.value = e
+}
+// 添加行
+const addRow = () => {
+  if (checkCertificateList()) {
+    setAllRowReadable()
+    list.value.push({
+      measureRange: '',
+      uncertainty: '',
+      basedDocuments: '',
+      editable: true,
+    })
+  }
+}
+// 删除行
+const removeRow = () => {
+  list.value = list.value.filter((item) => {
+    return !SelectionList.value.includes(item)
+  })
+}
+watch(() => $props.data, (newVal) => {
+  if (newVal) {
+    list.value = newVal
+  }
+})
+const initDialog = () => {
+  list.value = $props.data
+}
+initDialog()
+defineExpose({
+  list,
+  checkCertificateList,
+})
+</script>
+
+<template>
+  <detail-block-switch title="技术指标">
+    <template v-if="!$route.path.includes('detail')" #btns>
+      <el-button type="primary" @click="addRow">
+        增加行
+      </el-button>
+      <el-button type="info" @click="removeRow">
+        删除行
+      </el-button>
+    </template>
+    <el-table
+      ref="multipleTableRef" :data="list" style="width: 100%;" border @selection-change="handleSelectionChange"
+      @row-dblclick="dblclickRow"
+    >
+      <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
+      <el-table-column align="center" label="序号" width="80" type="index" />
+      <el-table-column
+        v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text"
+        align="center"
+      >
+        <template #header>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
+        </template>
+        <template #default="scope">
+          <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+          <el-input
+            v-if="scope.row.editable && !item.isSelect" v-model="scope.row[item.value]" :autofocus="true"
+            :placeholder="`${item.text}`" class="input"
+          />
+          <!-- <el-date-picker v-if="scope.row.editable && item.isDate" v-model="scope.row[item.value]" type="date"
+              format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`" /> -->
+          <!-- <el-select
+            v-if="scope.row.editable && item.isSelect" v-model="scope.row[item.value]"
+            :placeholder="`${item.text}`"
+          >
+            <el-option v-for="item in platformListBak" :key="item.id" :label="item.name" :value="item.name" />
+          </el-select> -->
+        </template>
+      </el-table-column>
+    </el-table>
+  </detail-block-switch>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>

diff --git a/.env.development b/.env.development
index debe1a8..f2fee42 100644
--- a/.env.development
+++ b/.env.development
@@ -4,7 +4,7 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
-VITE_APP_API_BASEURL = http://127.0.0.1:5909
+VITE_APP_API_BASEURL = http://192.168.8.101:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..313fcf7 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://192.168.8.101:5909"
 }
diff --git a/src/api/eqpt/device/model.ts b/src/api/eqpt/device/model.ts
new file mode 100644
index 0000000..a8fa0f1
--- /dev/null
+++ b/src/api/eqpt/device/model.ts
@@ -0,0 +1,61 @@
+/**
+ * 设备型号规格管理相关
+ */
+import request from '@/api/index'
+
+// 列表
+export function getModelList(params: any) {
+  return request({
+    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}`,
+    method: 'post',
+    data: params,
+  })
+}
+// 列表-不分页
+export function getModelAllList(params: any) {
+  return request({
+    url: '/equipment/model/list',
+    method: 'post',
+    data: params,
+  })
+}
+// 设备名称列表/equipment/model/listEquipmentName
+export function getDeviceNameList(params: any) {
+  return request({
+    url: '/equipment/model/listEquipmentName',
+    method: 'get',
+    params,
+  })
+}
+// 导出
+export function exportModelList(data: any) {
+  return request({
+    url: '/equipment/model/export',
+    method: 'post',
+    data,
+  })
+}
+// 新建或编辑
+export function handlerFunApi(type: string, data: any) {
+  if (type === 'create') {
+    return request({
+      url: '/equipment/model/add',
+      method: 'post',
+      data,
+    })
+  }
+  else if (type === 'update') {
+    return request({
+      url: '/equipment/model/update',
+      method: 'post',
+      data,
+    })
+  }
+}
+// 删除
+export function deleteModel(data: any) {
+  return request({
+    url: `/equipment/model/delete?id=${data.id}`,
+    method: 'post',
+  })
+}
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 14ec12e..64e6f48 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -55,11 +55,12 @@
   // listQuery.value.offset = 1
   // }
   fetchApproval({ processId: listQuery.value.processId }).then((response) => {
+    console.log(response.data, 'response')
     response.data.forEach((item: Array<IList>, index: number) => {
       item.forEach((i: any) => {
         list.value.push({
           cindex: index,
-          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[i.cindex].nodeNumber + 1,
+          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[index - 1].nodeNumber + 1,
           assigneeName: i.assigneeName, // 姓名
           approvalStatus: i.approvalStatus, // 审批类型
           finishTime: i.finishTime ? i.finishTime : '-', // 完成时间
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index f08078d..aefbd8b 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -90,8 +90,16 @@
     type: String,
     default: 'default',
   }, // 表格大小，默认，small,mini等，与el-table条件相同
+  // 排序
+  sort: {
+    type: Object,
+    default() {
+      return {
+      }
+    },
+  },
 })
-const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'multiSelect'])
+const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'multiSelect', 'sortChange'])
 // -------定义数据--------------
 interface columnsCheckInfo {
   text: string
@@ -139,6 +147,10 @@
 function selectionChange(selection: []) {
   emit('selectionChange', selection)
 }
+// 点击排序
+function sortClick(column: any, prop: any, order: any) {
+  emit('sortChange', { column, prop, order })
+}
 // 点击行
 function rowClick(row: object, column?: any, event?: any) {
   emit('rowClick', row)
@@ -196,11 +208,13 @@
       border
       stripe
       :size="size"
+      :default-sort="props.sort"
       :show-header="showHeader"
       style="width: 100%;"
       @selection-change="handleSelectionChange"
       @select="selectClick"
       @row-click="rowClick"
+      @sort-change="sortClick"
     >
       <slot name="preColumns" />
 
@@ -210,7 +224,7 @@
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
+      <el-table-column v-for="column of columns" :key="column.value" :sortable="column.sortable" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
           <span v-else :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ column.filter(scope.row) }}</span>
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index 5cf6445..2cd73de 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -320,7 +320,7 @@
   {
     path: '/meteringdevice',
     component: Layout,
-    redirect: '/devicelist',
+    redirect: '/modellist',
     name: 'MeteringDevice',
     meta: {
       title: '设备台账',
@@ -329,6 +329,43 @@
     },
     children: [
       {
+        path: '/modellist',
+        component: Layout,
+        redirect: '/dmodel',
+        name: 'DeviceModel',
+        meta: {
+          title: '设备规格型号管理',
+          icon: 'ep:key',
+          auth: '/tested/device/model',
+        },
+        children: [
+          {
+            path: '/dmodel',
+            name: 'DeviceModelPage',
+            component: () => import('@/views/tested/device/model/index.vue'),
+            meta: {
+              title: '设备规格型号管理',
+              auth: '/tested/device/model',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/modellist',
+            },
+          },
+          {
+            path: '/dmodel/:type',
+            name: 'ModelEdit',
+            component: () => import('@/views/tested/device/model/components/edit.vue'),
+            meta: {
+              title: '设备规格型号管理',
+              auth: '/tested/device/model',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/modellist',
+            },
+          },
+        ],
+      },
+      {
         path: '/devicelist',
         component: Layout,
         redirect: '/dinfo',
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 6c9383f..879a207 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -158,7 +158,11 @@
 }
 // 批量删除
 const batchDeleteLabel = () => {
-  if (selectList.value.length) {
+  if (selectList.value.filter(item => item.usageStatusName === '已使用').length) {
+    ElMessage.warning('请选择未使用的标签')
+    return
+  }
+  if (selectList.value.filter(item => item.usageStatusName !== '已使用').length) {
     ElMessageBox.confirm(
       '确认删除所选数据吗？',
       '提示',
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index 60d55d6..ba91cbf 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -25,7 +25,7 @@
   offset: 1,
 }) // 查询参数
 watch(() => noticeTime.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     searchQuery.noticeStartTime = `${newVal[0]} 00:00:00`
     searchQuery.noticeEndTime = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/system/signature/autograph.vue b/src/views/system/signature/autograph.vue
index e5a32c8..9c1d0ca 100644
--- a/src/views/system/signature/autograph.vue
+++ b/src/views/system/signature/autograph.vue
@@ -23,7 +23,7 @@
   ids: [],
 }) // 查询参数
 watch(() => createTime.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     searchQuery.createStartTime = `${newVal[0]} 00:00:00`
     searchQuery.createEndTime = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 5f57089..b557683 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -16,7 +16,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index 8f31905..e140eaa 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.applicantTimeStart = `${newVal[0]} 00:00:00`
     listQuery.applicantTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/opinion/index.vue b/src/views/tested/MeasurementBusiness/opinion/index.vue
index 6c7e13c..c6683c0 100644
--- a/src/views/tested/MeasurementBusiness/opinion/index.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue
index b15f27b..e204a69 100644
--- a/src/views/tested/MeasurementBusiness/review/index.vue
+++ b/src/views/tested/MeasurementBusiness/review/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
@@ -76,21 +76,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
-  // getListPage(listQuery).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   listLoading.value = false
-  // })
-  list.value = [{
-    formNo: '12345',
-    formName: '评审表1',
-    labCode: '海口实验室',
-    groupCode: '组别1',
-    signStatusName: '同意',
-    createUserName: '张三',
-    createTime: '2023-09-05',
-  }]
-  listLoading.value = false
+  getListPage(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  })
 }
 fetchData()
 // 查询数据
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 0e2fd1c..217365a 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -14,7 +14,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.sendTimeStart = `${newVal[0]} 00:00:00`
     listQuery.sendTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index e117705..e2d0ea2 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -12,6 +12,7 @@
     required: true,
   },
 })
+const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
 const userStore = useUserStore()
 const listQuery = reactive({
@@ -20,8 +21,8 @@
   createTimeEnd: '',
   createTimeStart: '',
   notifyType: $props.notifyType, // 通知类型(负责人/部门，字典值)
-  notifyDept: userStore.deptId,
-  notifyUser: userStore.id,
+  notifyDept: $route.path.includes('curatorpage') ? '' : userStore.deptId,
+  notifyUser: $route.path.includes('curatorpage') ? userStore.id : '',
   offset: 1,
   limit: 20,
 })
@@ -30,7 +31,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/dept/index.vue b/src/views/tested/MeasurementPlan/dept/index.vue
index aafe5e1..a25835f 100644
--- a/src/views/tested/MeasurementPlan/dept/index.vue
+++ b/src/views/tested/MeasurementPlan/dept/index.vue
@@ -5,5 +5,5 @@
 
 <template>
   <!-- notifyType 通知类型(负责人/部门，字典值) -->
-  <page notify-type="1" />
+  <page notify-type="2" />
 </template>
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 3cdecdc..429acf5 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -53,7 +53,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index f599508..2c53a36 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -24,7 +24,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index 6af790b..f17af59 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -39,7 +39,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 6fa4355..d0e9936 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -27,7 +27,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.value.certificateValidStart = `${newVal[0]} 00:00:00`
     listQuery.value.certificateValidEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/task/index.vue b/src/views/tested/MeasurementPlan/task/index.vue
index 4ab62d9..aa759a8 100644
--- a/src/views/tested/MeasurementPlan/task/index.vue
+++ b/src/views/tested/MeasurementPlan/task/index.vue
@@ -17,7 +17,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createStartTime = `${newVal[0]} 00:00:00`
     listQuery.createEndTime = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index c7d63b8..67b4dac 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -99,7 +99,7 @@
 }
 const range = ref()
 watch(() => range.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.certificateValidStart = `${newVal[0]} 00:00:00`
     listQuery.certificateValidEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index 5d8d328..af479a6 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -41,7 +41,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.value.certificateValidStart = `${newVal[0]} 00:00:00`
     listQuery.value.certificateValidEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/device/group/components/tableList.vue b/src/views/tested/device/group/components/tableList.vue
index d1f60ce..f1b817a 100644
--- a/src/views/tested/device/group/components/tableList.vue
+++ b/src/views/tested/device/group/components/tableList.vue
@@ -177,7 +177,16 @@
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
           <el-input
-            v-if="scope.row.editable && !item.isSelect" v-model="scope.row[item.value]" :autofocus="true"
+            v-if="scope.row.editable && !item.isSelect && item.text === '设备名称'" v-model="scope.row[item.value]" :autofocus="true"
+            :placeholder="`${item.text}`" class="input"
+            @focus="select(item.text, scope.$index)"
+          >
+            <template #append>
+              <span @click="select(item.text, scope.$index)">选择</span>
+            </template>
+          </el-input>
+          <el-input
+            v-if="scope.row.editable && !item.isSelect && item.text !== '设备名称'" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
             @focus="select(item.text, scope.$index)"
           />
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 7443364..db05d4d 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -50,6 +50,7 @@
     text: '统一编号',
     value: 'equipmentNo',
     align: 'center',
+    sortable: 'custom',
   },
   {
     text: '设备名称',
@@ -60,11 +61,13 @@
     text: '型号规格',
     value: 'model',
     align: 'center',
+    sortable: 'custom',
   },
   {
     text: '出厂编号',
     value: 'manufactureNo',
     align: 'center',
+    sortable: 'custom',
   },
   {
     text: '使用岗位',
@@ -85,6 +88,7 @@
     text: '证书有效期',
     value: 'certificateValid',
     align: 'center',
+    sortable: 'custom',
   },
 ])
 const allColums = ref([
@@ -92,6 +96,7 @@
     text: '使用状态',
     value: 'usageStatusName',
     align: 'center',
+    sortable: 'custom',
   },
   {
     text: '备注',
@@ -121,6 +126,21 @@
     align: 'center',
   },
 ])
+// 排序条件发生变化
+const sortChange = ({ column }: any) => {
+  if (column.order === 'ascending') {
+    console.log(column.prop)
+    console.log('升序')
+  }
+  else if (column.order === 'descending') {
+    console.log(column.prop)
+    console.log('倒叙')
+  }
+}
+// 聚合表格实例
+const togetherTableRef = ref()
+// 展开表格实例
+const expandTableRef = ref()
 const list = ref([])
 const total = ref(0)
 const listLoading = ref(true)
@@ -157,7 +177,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.certificateValidStart = `${newVal[0]} 00:00:00`
     listQuery.certificateValidEnd = `${newVal[1]} 23:59:59`
   }
@@ -209,12 +229,29 @@
   expandLoading.value = true
   getInfoList(params).then((res) => {
     expandList.value = res.data
+    // 获取聚合表格选中，判断展开表格是否需要全选
+    const selectList = togetherTableRef.value.getSelectionRows()
+    if (selectList.length) {
+      const select = selectList.filter((item: any) => item.equipmentName === params.equipmentName)
+      if (select.length) {
+        nextTick(() => {
+          expandTableRef.value.toggleAllSelection()
+        })
+      }
+    }
     expandLoading.value = false
   })
 }
 const getRowKeys = (row: any) => { // 获取当前行id
   return row.equipmentName // 这里看这一行中需要根据哪个属性值是id
 }
+// 监听聚合表格多选
+// watch(() => togetherTableRef.value?.getSelectionRows(), (newVal, oldVal) => {
+//   console.log(newVal, 'newVal')
+// }, {
+//   deep: true,
+// })
+
 // 表格被选中的行
 const selectList = ref<any[]>([])
 // 表格多选
@@ -240,6 +277,48 @@
 {
   deep: true,
 })
+const togetherSelect = (selection: any, row: any) => {
+  if (selection.includes(row)) {
+    // 勾选
+    console.log('勾选')
+    if (expands.value && expands.value[0] === row.equipmentName) {
+      expandTableRef.value.toggleAllSelection()
+    }
+  }
+  else {
+    // 取消勾选
+    console.log('取消勾选')
+    if (expands.value && expands.value[0] === row.equipmentName) {
+      expandTableRef.value.toggleAllSelection()
+    }
+  }
+}
+const expandSelect = (selection: any, row: any) => {
+  if (selection.length === expandList.value.length) {
+    // 全选
+    console.log('全选')
+    // 获取聚合
+    console.log(expands.value[0])
+    const data = togetherList.value.filter((item: any) => item.equipmentName === expands.value[0])
+    console.log(data)
+    if (data.length) {
+      nextTick(() => {
+        togetherTableRef.value.toggleRowSelection(data[0], true)
+      })
+    }
+  }
+  else {
+    // 全不选
+    console.log('全不选')
+    // 获取聚合
+    const data = togetherList.value.filter((item: any) => item.equipmentName === expands.value[0])
+    if (data.length) {
+      nextTick(() => {
+        togetherTableRef.value.toggleRowSelection(data[0], false)
+      })
+    }
+  }
+}
 const $router = useRouter()
 // 新建编辑操作
 const handler = (row: IlistObjType, type: string) => {
@@ -497,7 +576,7 @@
       <template v-if="$props.statusName === '全部'" #btns-right>
         <icon-button icon="icon-change" title="切换列表状态" @click="changeTable" />
         <icon-button icon="icon-sweep" title="扫描" />
-        <icon-button icon="icon-add" title="新增" @click="handler({}, 'create')" />
+        <icon-button icon="icon-add" title="新增" @click="handler({} as any, 'create')" />
         <icon-button icon="icon-import" title="批量导入" @click="importList" />
         <icon-button icon="icon-template" title="模板下载" @click="useTemplateDownload('设备信息管理模块')" />
         <icon-button icon="icon-export" title="导出" @click="exportList" />
@@ -508,30 +587,29 @@
         <normal-table
           v-show=" tableFlage "
           ref="normalTableRef" :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="listLoading" :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
+          :list-loading="listLoading"
+          :is-showmulti-select="true" :is-multi="true" @sort-change="sortChange" @change="changePage" @multi-select="multiSelect"
         >
           <template #columns>
             <!-- 全部状态 -->
-            <el-table-column
-              v-for=" column of allColums " :key=" column.value "
-              :label=" column.text " :prop=" column.value " :align=" column.align "
-              :show-overflow-tooltip="true"
-            >
-              <template v-if="$props.statusName === '全部' " #default=" scope ">
-                <span>{{ scope.row[column.value] }}</span>
-              </template>
-            </el-table-column>
+            <template v-if="$props.statusName === '全部' ">
+              <el-table-column
+                v-for=" column of allColums " :key=" column.value "
+                :label=" column.text " :prop=" column.value " :align=" column.align "
+                :show-overflow-tooltip="true"
+                :sortable="column.sortable"
+              />
+            </template>
             <!-- 其他审批状态 -->
-            <el-table-column
-              v-for=" column of otherColums " :key="column.value" :label=" column.text "
-              :prop=" column.value " :align=" column.align "
-              :show-overflow-tooltip="true"
-            >
-              <template v-if="$props.statusName !== '全部' " #default=" scope ">
-                <span>
-                  {{ scope.row[column.value] }}</span>
-              </template>
-            </el-table-column>
+            <template v-if="$props.statusName !== '全部' ">
+              <el-table-column
+                v-for=" column of otherColums " :key="column.value"
+                :label=" column.text "
+                :prop=" column.value " :align=" column.align "
+                :show-overflow-tooltip="true"
+              />
+            </template>
+
             <el-table-column label="操作" width="160" align="center">
               <template #default=" scope ">
                 <el-button link type="primary" size="small" @click="detail(scope.row)">
@@ -580,6 +658,7 @@
       </div>
       <div v-if=" !tableFlage ">
         <!-- 展开行表格 -->
+        <!-- 头部 -->
         <normal-table
           v-show=" !tableFlage " class="nortable-header" :data=" [] " :total=" 0 " :columns=" columns " :options="
             {
@@ -587,12 +666,23 @@
               border: true, // 是否需要上方边框
             }
           " :pagination=" false " :is-showmulti-select=" true " :query="{}"
-        />
-        <el-table
-          v-show=" !tableFlage " v-loading=" togetherLoading " :data=" togetherList " border style="width: 100%;"
-          :row-key=" getRowKeys " :expand-row-keys=" expands " :show-header=" false " @expand-change=" expandChange "
         >
+          <template #columns>
+            <el-table-column label="操作" width="160" align="center" />
+          </template>
+        </normal-table>
+        <!-- 身体 -->
+        <el-table
+          v-show=" !tableFlage "
+          ref="togetherTableRef" v-loading=" togetherLoading " :data=" togetherList " border style="width: 100%;"
+          :row-key=" getRowKeys " :expand-row-keys=" expands " :show-header=" false " @expand-change=" expandChange "
+          @select="togetherSelect"
+        >
+          <el-table-column type="selection" width="38" />
           <el-table-column type="expand">
+            <template #default="props">
+              <!-- 展开表格身体 -->
+              <!-- <normal-table
             <template #default>
               <normal-table
                 :data=" expandList " :total=" 0 " :columns=" columns " :list-loading=" expandLoading " :options="
@@ -601,7 +691,58 @@
                     border: true, // 是否需要上方边框
                   }
                 " :pagination=" false " :is-showmulti-select=" true " :show-header=" false " :query="{}"
-              />
+              /> -->
+              <el-table
+                ref="expandTableRef"
+                v-loading=" expandLoading " :data=" expandList " border style="width: 100%;"
+                :show-header=" false " @select="expandSelect"
+              >
+                <el-table-column type="selection" width="38" />
+                <el-table-column v-for="item in columns" :key="item.value" :labe="item.text" :prop="item.value" align="center" />
+                <el-table-column label="操作" width="160" align="center">
+                  <template #default=" scope ">
+                    <el-button link type="primary" size="small" @click="detail(scope.row)">
+                      查看
+                    </el-button>
+                    <el-button
+                      v-if="proxy.buttonPerm.edit.if({ approvalStatusName: $props.statusName }, permUrl.edit)" link type="primary" size="small"
+                      @click="handler(scope.row, 'update')"
+                    >
+                      编辑
+                    </el-button>
+                    <el-button
+                      v-if="proxy.buttonPerm.agree.if({ approvalStatusName: $props.statusName }, permUrl.agree)" link type="primary" size="small"
+                      @click="approveHandler(scope.row, 'agree')"
+                    >
+                      同意
+                    </el-button>
+                    <el-button
+                      v-if="proxy.buttonPerm.reject.if({ approvalStatusName: $props.statusName }, permUrl.reject)" link type="primary" size="small"
+                      @click="approveHandler(scope.row, 'refuse')"
+                    >
+                      拒绝
+                    </el-button>
+                    <el-button
+                      v-if="proxy.buttonPerm.submit.if({ approvalStatusName: $props.statusName }, permUrl.submit)" link type="primary" size="small"
+                      @click="submit(scope.row)"
+                    >
+                      提交
+                    </el-button>
+                    <el-button
+                      v-if="proxy.buttonPerm.cancel.if({ approvalStatusName: $props.statusName }, permUrl.cancel)" link type="primary" size="small"
+                      @click="canHandler(scope.row)"
+                    >
+                      取消
+                    </el-button>
+                    <el-button
+                      v-if="proxy.buttonPerm.delete.if({ approvalStatusName: $props.statusName }, permUrl.del)" link type="danger" size="small"
+                      @click="delHandler(scope.row)"
+                    >
+                      删除
+                    </el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
             </template>
           </el-table-column>
           <el-table-column label="设备名称" prop="equipmentName" align="center" />
diff --git a/src/views/tested/device/model/components/edit.vue b/src/views/tested/device/model/components/edit.vue
new file mode 100644
index 0000000..0783b12
--- /dev/null
+++ b/src/views/tested/device/model/components/edit.vue
@@ -0,0 +1,251 @@
+<!-- 设备规格型号-编辑 -->
+<script lang="ts" setup name="DeviceModelEdit">
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import tableList from './technology.vue'
+import { getDictByCode } from '@/api/system/dict'
+import { handlerFunApi } from '@/api/eqpt/device/model'
+import useUserStore from '@/store/modules/user'
+import { getUserDept } from '@/api/system/user'
+import { uploadApi } from '@/api/system/notice'
+import showPhoto from '@/views/tested/device/info/components/showPhoto.vue'
+const $route = useRoute()
+const $router = useRouter()
+const userStore = useUserStore()
+const ruleFormRef = ref<FormInstance>() // from组件
+const title = ref('')
+// 显示标题
+const textMap: { [key: string]: string } = {
+  update: '编辑',
+  create: '新增',
+  detail: '详情',
+}
+// 对话框类型：create,update
+const dialogStatus = ref('create')
+const ruleForm = ref({
+  category: '', // 设备分类
+  categoryName: '', // 设备分类名称
+  checkCycle: '', // 检定周期
+  createDeptId: '',
+  createTime: '',
+  createUserId: '',
+  equipmentName: '', // 设备名称
+  helpInstruction: '', // 辅助字段
+  id: '',
+  instructionsFile: '', // 附件
+  model: '', // 规格型号
+  modelNo: '', // 规格型号编号
+  remark: '', // 备注
+  technicalTargetList: [], // 技术指标
+  updateTime: '',
+}) // 表单
+const rules = ref<FormRules>({
+  equipmentName: [{ required: true, message: '设备名称名称必填', trigger: 'blur' }],
+  category: [{ required: true, message: '设备分类必选', trigger: 'blur' }],
+  model: [{ required: true, message: '规格型号必填', trigger: 'blur' }],
+  checkCycle: [{ required: true, message: '检定周期必填', trigger: 'blur' }],
+}) // 表单验证规则
+// 弹窗初始化
+const initDialog = () => {
+  dialogStatus.value = $route.params.type as string
+  ruleFormRef.value?.resetFields()
+  if ($route.params.type === 'create') {
+    ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+    ruleForm.value.createUserId = userStore.id
+    // 获取当前用户所在单位
+    getUserDept().then((res) => {
+      ruleForm.value.createDeptId = res.data.id
+    })
+  }
+  else {
+    console.log($route.query.row, 'data')
+    const data = JSON.parse($route.query.row as string)
+    // detailGroup({ groupId: data.id }).then((res) => {
+    ruleForm.value = data
+    // })
+  }
+}
+onMounted(() => {
+  initDialog()
+})
+// 关闭弹窗
+const close = () => {
+  $router.back()
+}
+const tableRef = ref()
+// 保存
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid && tableRef.value.checkCertificateList()) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        ruleForm.value.equipmentList = tableRef.value.list
+        if ($route.params.type === 'create') {
+          handlerFunApi('create', ruleForm.value).then((res) => {
+            ElMessage.success('添加成功')
+            close()
+          })
+        }
+        else {
+          handlerFunApi('update', ruleForm.value).then((res) => {
+            ElMessage.success('修改成功')
+            close()
+          })
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    fd.append('multipartFile', event.target.files[0])
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        ruleForm.value.instructionsFile = ruleForm.value.instructionsFile ? `${ruleForm.value.instructionsFile},${res.data[0]}` : res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
+        loading.close()
+      }
+      else {
+        // ElMessage.error(res.message)
+        loading.close()
+      }
+    })
+  }
+}
+// 上传
+const upload = () => {
+  fileRef.value.click()
+}
+// 删除上传的文件
+const deleteFile = (fileName: string) => {
+  const data = ruleForm.value.instructionsFile.split(',')
+  const filterData = data.filter(item => item !== fileName)
+  ruleForm.value.instructionsFile = filterData.length ? filterData.join(',') : ''
+}
+// 设备分类
+const deviceTypeList = ref<{ id: string; value: string; name: string }[]>([])
+const fetchSelect = () => {
+  // 设备分类
+  getDictByCode('eqptDeviceType').then((res) => {
+    deviceTypeList.value = res.data
+  })
+}
+fetchSelect()
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <approval-dialog ref="approvalDialogRef" @on-success="() => { $router.back() }" />
+    <detail-page :title="`设备规格型号管理-${textMap[dialogStatus]}`">
+      <template #btns>
+        <el-button v-if="dialogStatus !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-com>
+      <el-form
+        ref="ruleFormRef"
+        :model="ruleForm"
+        :rules="rules" label-position="right" label-width="110px" class="form"
+        :disabled="dialogStatus === 'detail'"
+        :class="$route.path.includes('detail') ? 'isDetail' : ''"
+      >
+        <el-row :gutter="24" class="marg">
+          <el-col :span="8">
+            <el-form-item label="型号规格编号">
+              <el-input v-model.trim="ruleForm.modelNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm.equipmentName" placeholder="设备名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="规格型号" prop="model">
+              <el-input v-model.trim="ruleForm.model" placeholder="规格型号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="8">
+            <el-form-item label="辅助字段" prop="helpInstruction">
+              <el-input v-model.trim="ruleForm.helpInstruction" placeholder="辅助字段" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="设备分类" prop="category">
+              <el-select v-model.trim="ruleForm.category" placeholder="设备名称" style="width: 100%;">
+                <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="检定周期" prop="checkCycle">
+              <!-- <el-input v-model.trim="ruleForm.checkCycle" placeholder="检定周期" /> -->
+              <el-input v-model.trim="ruleForm.checkCycle">
+                <template #append>
+                  月
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="使用说明书" prop="instructionsFile">
+              <!-- <el-input v-model.trim="ruleForm.helpInstruction" placeholder="辅助字段" /> -->
+              <show-photo :minio-file-name="ruleForm.instructionsFile" @delete="deleteFile" />
+              <input ref="fileRef" style="display: none;" type="file" accept="application/msword,application/pdf" @change="onFileChange">
+              <el-button v-if="dialogStatus !== 'detail'" type="primary" @click="upload">
+                上传
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="18">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.remark" type="textarea" :row="3" maxlength="100" show-word-limit />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block-com>
+    <detail-block-com>
+      <table-list ref="tableRef" :data="ruleForm.technicalTargetList" :status="dialogStatus" />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/tested/device/model/components/list.vue b/src/views/tested/device/model/components/list.vue
new file mode 100644
index 0000000..60a0a42
--- /dev/null
+++ b/src/views/tested/device/model/components/list.vue
@@ -0,0 +1,266 @@
+<!-- 设备规格型号管理列表 -->
+<script lang="ts" setup name="DeviceModelList">
+import { reactive, ref, watch } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { deleteModel, exportModelList, getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
+import { exportFile } from '@/utils/exportUtils'
+import { getDictByCode } from '@/api/system/dict'
+const { proxy } = getCurrentInstance() as any
+const listQuery = reactive({
+  category: '',
+  equipmentName: '',
+  helpInstruction: '',
+  model: '',
+  offset: 1,
+  limit: 20,
+})
+const columns = ref([
+  {
+    text: '型号规格编号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '型号规格',
+    value: 'model',
+    align: 'center',
+  },
+  {
+    text: '辅助字段',
+    value: 'helpInstruction',
+    align: 'center',
+  },
+  {
+    text: '设备分类',
+    value: 'categoryName',
+    align: 'center',
+  },
+  {
+    text: '检定周期',
+    value: 'checkCycle',
+    align: 'center',
+  },
+  {
+    text: '使用说明书',
+    value: 'instructionsFile',
+    align: 'center',
+  },
+  {
+    text: '备注',
+    value: 'remark',
+    align: 'center',
+  },
+])
+const list = ref([])
+const total = ref(0)
+const listLoading = ref(true)
+
+// 获取数据
+const fetchData = (isNowPage = true) => {
+  listLoading.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  getModelList(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  })
+}
+fetchData()
+// 查询数据
+const search = () => {
+  fetchData(false)
+}
+// 重置
+const reset = () => {
+  listQuery.category = ''
+  listQuery.equipmentName = ''
+  listQuery.helpInstruction = ''
+  listQuery.model = ''
+  listQuery.offset = 1
+  listQuery.limit = 20
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData()
+}
+const $router = useRouter()
+// 新建编辑操作
+const handler = (row: any, type: string) => {
+  $router.push({
+    path: `/dmodel/${type}`,
+    query: {
+      row: JSON.stringify(row),
+      id: row.id,
+    },
+  })
+}
+// 删除
+const delHandler = (row: any) => {
+  ElMessageBox.confirm(
+    '确认删除操作？注意删除不可逆。',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    // 判断设备是否被绑定
+    // 此设备型号与已存在设备绑定，请先删除设备
+    deleteModel({ id: row.id }).then((res) => {
+      ElMessage.success('操作成功')
+      search()
+    })
+  })
+}
+// 表格被选中的行
+const selectList = ref<any[]>([])
+// 表格多选
+const multiSelect = (row: any[]) => {
+  selectList.value = row
+}
+// 导出列表
+const exportList = () => {
+  if (list.value.length) {
+    const loading = ElLoading.service({
+      lock: true,
+      text: 'Loading',
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const data = {
+      ...listQuery,
+      offset: undefined,
+      limit: undefined,
+      ids: selectList.value.map(item => item.id),
+    }
+    exportModelList(data).then((res) => {
+      exportFile('设备规格型号')
+      loading.close()
+    })
+      .catch((_) => {
+        loading.close()
+      })
+  }
+  else {
+    ElMessage.warning('无可导出内容')
+  }
+}
+// 获取下拉列表相关
+// 设备名称
+const deviceNameList = ref<{ id: string; value: string; name: string }[]>([])
+// 设备分类
+const deviceTypeList = ref<{ id: string; value: string; name: string }[]>([])
+// 规格型号
+const modelList = ref<any[]>([])
+// 辅助字段
+const helpList = ref<any[]>([])
+const allList = ref<any[]>([])
+const fetchSelect = () => {
+  // 设备分类
+  getDictByCode('eqptDeviceType').then((res) => {
+    deviceTypeList.value = res.data
+  })
+  // 设备名称
+  getDeviceNameList().then((res) => {
+    deviceNameList.value = res.data
+  })
+  // 规格型号及辅助字段
+  getModelAllList({}).then((res) => {
+    allList.value = res.data
+    modelList.value = res.data
+    helpList.value = res.data.filter(item => item.helpInstruction)
+  })
+}
+fetchSelect()
+// 监听设备名称下拉框，修改规格型号和辅助字段
+watch(() => listQuery.equipmentName, (newVal) => {
+  if (newVal) {
+    listQuery.helpInstruction = ''
+    listQuery.model = ''
+    // 修改规格型号和辅助字段列表
+    const data = allList.value.filter(item => item.equipmentName === newVal)
+    modelList.value = data
+    helpList.value = data.filter(item => item.helpInstruction)
+  }
+})
+// 监听规格型号下拉框，修改辅助字段
+watch(() => listQuery.model, (newVal) => {
+  if (newVal) {
+    listQuery.helpInstruction = ''
+    // 修改规格型号和辅助字段列表
+    console.log(helpList.value, 'helpList.value')
+    helpList.value = helpList.value.filter(item => item.model === newVal)
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-select v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable>
+          <el-option v-for="item in deviceNameList" :key="item" :label="item" :value="item" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model.trim="listQuery.model" placeholder="规格型号" clearable>
+          <el-option v-for="item in modelList" :key="item.id" :label="item.model" :value="item.model" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model.trim="listQuery.helpInstruction" placeholder="辅助字段" clearable>
+          <el-option v-for="item in helpList" :key="item.id" :label="item.helpInstruction" :value="item.helpInstruction" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model.trim="listQuery.category" placeholder="设备分类" clearable>
+          <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-add" title="新增" @click="handler({}, 'create')" />
+        <icon-button icon="icon-export" title="导出" @click="exportList" />
+      </template>
+      <!-- 普通表格 -->
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
+      >
+        <template #columns>
+          <el-table-column label="操作" width="140" align="center">
+            <template #default="scope">
+              <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
+                查看
+              </el-button>
+              <el-button link type="primary" size="small" @click="handler(scope.row, 'update')">
+                编辑
+              </el-button>
+              <el-button link type="danger" size="small" @click="delHandler(scope.row)">
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
diff --git a/src/views/tested/device/model/components/technology.vue b/src/views/tested/device/model/components/technology.vue
new file mode 100644
index 0000000..d31fb2d
--- /dev/null
+++ b/src/views/tested/device/model/components/technology.vue
@@ -0,0 +1,141 @@
+<!-- 技术指标 -->
+<script lang="ts" setup name="DeviceTechnologyTable">
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { useCheckList } from '@/utils/useCheckList'
+const $props = defineProps({
+  data: {
+    type: Array,
+    default: () => ([]),
+  },
+})
+const $route = useRoute()
+// 表头显示标题
+const columns = ref([
+  {
+    text: '测量范围',
+    value: 'measureRange',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+  {
+    text: '不确定度或允许误差极限或准确度等级',
+    value: 'uncertainty',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+  {
+    text: '依据的技术文件',
+    value: 'basedDocuments',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+])
+const list = ref<any[]>([])
+// 检查数据列表
+function checkCertificateList() {
+  return useCheckList(list.value, columns.value, '技术指标')
+}
+// 将列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of list.value) {
+    item.editable = false
+  }
+}
+// 双击行显示输入框
+const dblclickRow = (row: any) => {
+  if ($route.path.includes('detail')) {
+    return
+  }
+  setAllRowReadable()
+  row.editable = true
+}
+const SelectionList = ref()
+// 表格选中
+const handleSelectionChange = (e: any[]) => {
+  SelectionList.value = e
+}
+// 添加行
+const addRow = () => {
+  if (checkCertificateList()) {
+    setAllRowReadable()
+    list.value.push({
+      measureRange: '',
+      uncertainty: '',
+      basedDocuments: '',
+      editable: true,
+    })
+  }
+}
+// 删除行
+const removeRow = () => {
+  list.value = list.value.filter((item) => {
+    return !SelectionList.value.includes(item)
+  })
+}
+watch(() => $props.data, (newVal) => {
+  if (newVal) {
+    list.value = newVal
+  }
+})
+const initDialog = () => {
+  list.value = $props.data
+}
+initDialog()
+defineExpose({
+  list,
+  checkCertificateList,
+})
+</script>
+
+<template>
+  <detail-block-switch title="技术指标">
+    <template v-if="!$route.path.includes('detail')" #btns>
+      <el-button type="primary" @click="addRow">
+        增加行
+      </el-button>
+      <el-button type="info" @click="removeRow">
+        删除行
+      </el-button>
+    </template>
+    <el-table
+      ref="multipleTableRef" :data="list" style="width: 100%;" border @selection-change="handleSelectionChange"
+      @row-dblclick="dblclickRow"
+    >
+      <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
+      <el-table-column align="center" label="序号" width="80" type="index" />
+      <el-table-column
+        v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text"
+        align="center"
+      >
+        <template #header>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
+        </template>
+        <template #default="scope">
+          <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+          <el-input
+            v-if="scope.row.editable && !item.isSelect" v-model="scope.row[item.value]" :autofocus="true"
+            :placeholder="`${item.text}`" class="input"
+          />
+          <!-- <el-date-picker v-if="scope.row.editable && item.isDate" v-model="scope.row[item.value]" type="date"
+              format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`" /> -->
+          <!-- <el-select
+            v-if="scope.row.editable && item.isSelect" v-model="scope.row[item.value]"
+            :placeholder="`${item.text}`"
+          >
+            <el-option v-for="item in platformListBak" :key="item.id" :label="item.name" :value="item.name" />
+          </el-select> -->
+        </template>
+      </el-table-column>
+    </el-table>
+  </detail-block-switch>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>
diff --git a/src/views/tested/device/model/index.vue b/src/views/tested/device/model/index.vue
new file mode 100644
index 0000000..e0524d9
--- /dev/null
+++ b/src/views/tested/device/model/index.vue
@@ -0,0 +1,8 @@
+<!-- 设备规格型号管理 -->
+<script lang="ts" setup name="DeviceModelIndex">
+import list from './components/list.vue'
+</script>
+
+<template>
+  <list />
+</template>

diff --git a/.env.development b/.env.development
index debe1a8..f2fee42 100644
--- a/.env.development
+++ b/.env.development
@@ -4,7 +4,7 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
-VITE_APP_API_BASEURL = http://127.0.0.1:5909
+VITE_APP_API_BASEURL = http://192.168.8.101:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..313fcf7 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://192.168.8.101:5909"
 }
diff --git a/src/api/eqpt/device/model.ts b/src/api/eqpt/device/model.ts
new file mode 100644
index 0000000..a8fa0f1
--- /dev/null
+++ b/src/api/eqpt/device/model.ts
@@ -0,0 +1,61 @@
+/**
+ * 设备型号规格管理相关
+ */
+import request from '@/api/index'
+
+// 列表
+export function getModelList(params: any) {
+  return request({
+    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}`,
+    method: 'post',
+    data: params,
+  })
+}
+// 列表-不分页
+export function getModelAllList(params: any) {
+  return request({
+    url: '/equipment/model/list',
+    method: 'post',
+    data: params,
+  })
+}
+// 设备名称列表/equipment/model/listEquipmentName
+export function getDeviceNameList(params: any) {
+  return request({
+    url: '/equipment/model/listEquipmentName',
+    method: 'get',
+    params,
+  })
+}
+// 导出
+export function exportModelList(data: any) {
+  return request({
+    url: '/equipment/model/export',
+    method: 'post',
+    data,
+  })
+}
+// 新建或编辑
+export function handlerFunApi(type: string, data: any) {
+  if (type === 'create') {
+    return request({
+      url: '/equipment/model/add',
+      method: 'post',
+      data,
+    })
+  }
+  else if (type === 'update') {
+    return request({
+      url: '/equipment/model/update',
+      method: 'post',
+      data,
+    })
+  }
+}
+// 删除
+export function deleteModel(data: any) {
+  return request({
+    url: `/equipment/model/delete?id=${data.id}`,
+    method: 'post',
+  })
+}
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 14ec12e..64e6f48 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -55,11 +55,12 @@
   // listQuery.value.offset = 1
   // }
   fetchApproval({ processId: listQuery.value.processId }).then((response) => {
+    console.log(response.data, 'response')
     response.data.forEach((item: Array<IList>, index: number) => {
       item.forEach((i: any) => {
         list.value.push({
           cindex: index,
-          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[i.cindex].nodeNumber + 1,
+          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[index - 1].nodeNumber + 1,
           assigneeName: i.assigneeName, // 姓名
           approvalStatus: i.approvalStatus, // 审批类型
           finishTime: i.finishTime ? i.finishTime : '-', // 完成时间
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index f08078d..aefbd8b 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -90,8 +90,16 @@
     type: String,
     default: 'default',
   }, // 表格大小，默认，small,mini等，与el-table条件相同
+  // 排序
+  sort: {
+    type: Object,
+    default() {
+      return {
+      }
+    },
+  },
 })
-const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'multiSelect'])
+const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'multiSelect', 'sortChange'])
 // -------定义数据--------------
 interface columnsCheckInfo {
   text: string
@@ -139,6 +147,10 @@
 function selectionChange(selection: []) {
   emit('selectionChange', selection)
 }
+// 点击排序
+function sortClick(column: any, prop: any, order: any) {
+  emit('sortChange', { column, prop, order })
+}
 // 点击行
 function rowClick(row: object, column?: any, event?: any) {
   emit('rowClick', row)
@@ -196,11 +208,13 @@
       border
       stripe
       :size="size"
+      :default-sort="props.sort"
       :show-header="showHeader"
       style="width: 100%;"
       @selection-change="handleSelectionChange"
       @select="selectClick"
       @row-click="rowClick"
+      @sort-change="sortClick"
     >
       <slot name="preColumns" />
 
@@ -210,7 +224,7 @@
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
+      <el-table-column v-for="column of columns" :key="column.value" :sortable="column.sortable" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
           <span v-else :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ column.filter(scope.row) }}</span>
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index 5cf6445..2cd73de 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -320,7 +320,7 @@
   {
     path: '/meteringdevice',
     component: Layout,
-    redirect: '/devicelist',
+    redirect: '/modellist',
     name: 'MeteringDevice',
     meta: {
       title: '设备台账',
@@ -329,6 +329,43 @@
     },
     children: [
       {
+        path: '/modellist',
+        component: Layout,
+        redirect: '/dmodel',
+        name: 'DeviceModel',
+        meta: {
+          title: '设备规格型号管理',
+          icon: 'ep:key',
+          auth: '/tested/device/model',
+        },
+        children: [
+          {
+            path: '/dmodel',
+            name: 'DeviceModelPage',
+            component: () => import('@/views/tested/device/model/index.vue'),
+            meta: {
+              title: '设备规格型号管理',
+              auth: '/tested/device/model',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/modellist',
+            },
+          },
+          {
+            path: '/dmodel/:type',
+            name: 'ModelEdit',
+            component: () => import('@/views/tested/device/model/components/edit.vue'),
+            meta: {
+              title: '设备规格型号管理',
+              auth: '/tested/device/model',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/modellist',
+            },
+          },
+        ],
+      },
+      {
         path: '/devicelist',
         component: Layout,
         redirect: '/dinfo',
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 6c9383f..879a207 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -158,7 +158,11 @@
 }
 // 批量删除
 const batchDeleteLabel = () => {
-  if (selectList.value.length) {
+  if (selectList.value.filter(item => item.usageStatusName === '已使用').length) {
+    ElMessage.warning('请选择未使用的标签')
+    return
+  }
+  if (selectList.value.filter(item => item.usageStatusName !== '已使用').length) {
     ElMessageBox.confirm(
       '确认删除所选数据吗？',
       '提示',
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index 60d55d6..ba91cbf 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -25,7 +25,7 @@
   offset: 1,
 }) // 查询参数
 watch(() => noticeTime.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     searchQuery.noticeStartTime = `${newVal[0]} 00:00:00`
     searchQuery.noticeEndTime = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/system/signature/autograph.vue b/src/views/system/signature/autograph.vue
index e5a32c8..9c1d0ca 100644
--- a/src/views/system/signature/autograph.vue
+++ b/src/views/system/signature/autograph.vue
@@ -23,7 +23,7 @@
   ids: [],
 }) // 查询参数
 watch(() => createTime.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     searchQuery.createStartTime = `${newVal[0]} 00:00:00`
     searchQuery.createEndTime = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 5f57089..b557683 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -16,7 +16,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index 8f31905..e140eaa 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.applicantTimeStart = `${newVal[0]} 00:00:00`
     listQuery.applicantTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/opinion/index.vue b/src/views/tested/MeasurementBusiness/opinion/index.vue
index 6c7e13c..c6683c0 100644
--- a/src/views/tested/MeasurementBusiness/opinion/index.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue
index b15f27b..e204a69 100644
--- a/src/views/tested/MeasurementBusiness/review/index.vue
+++ b/src/views/tested/MeasurementBusiness/review/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
@@ -76,21 +76,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
-  // getListPage(listQuery).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   listLoading.value = false
-  // })
-  list.value = [{
-    formNo: '12345',
-    formName: '评审表1',
-    labCode: '海口实验室',
-    groupCode: '组别1',
-    signStatusName: '同意',
-    createUserName: '张三',
-    createTime: '2023-09-05',
-  }]
-  listLoading.value = false
+  getListPage(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  })
 }
 fetchData()
 // 查询数据
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 0e2fd1c..217365a 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -14,7 +14,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.sendTimeStart = `${newVal[0]} 00:00:00`
     listQuery.sendTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index e117705..e2d0ea2 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -12,6 +12,7 @@
     required: true,
   },
 })
+const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
 const userStore = useUserStore()
 const listQuery = reactive({
@@ -20,8 +21,8 @@
   createTimeEnd: '',
   createTimeStart: '',
   notifyType: $props.notifyType, // 通知类型(负责人/部门，字典值)
-  notifyDept: userStore.deptId,
-  notifyUser: userStore.id,
+  notifyDept: $route.path.includes('curatorpage') ? '' : userStore.deptId,
+  notifyUser: $route.path.includes('curatorpage') ? userStore.id : '',
   offset: 1,
   limit: 20,
 })
@@ -30,7 +31,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/dept/index.vue b/src/views/tested/MeasurementPlan/dept/index.vue
index aafe5e1..a25835f 100644
--- a/src/views/tested/MeasurementPlan/dept/index.vue
+++ b/src/views/tested/MeasurementPlan/dept/index.vue
@@ -5,5 +5,5 @@
 
 <template>
   <!-- notifyType 通知类型(负责人/部门，字典值) -->
-  <page notify-type="1" />
+  <page notify-type="2" />
 </template>
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 3cdecdc..429acf5 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -53,7 +53,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index f599508..2c53a36 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -24,7 +24,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index 6af790b..f17af59 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -39,7 +39,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 6fa4355..d0e9936 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -27,7 +27,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.value.certificateValidStart = `${newVal[0]} 00:00:00`
     listQuery.value.certificateValidEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/task/index.vue b/src/views/tested/MeasurementPlan/task/index.vue
index 4ab62d9..aa759a8 100644
--- a/src/views/tested/MeasurementPlan/task/index.vue
+++ b/src/views/tested/MeasurementPlan/task/index.vue
@@ -17,7 +17,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createStartTime = `${newVal[0]} 00:00:00`
     listQuery.createEndTime = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index c7d63b8..67b4dac 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -99,7 +99,7 @@
 }
 const range = ref()
 watch(() => range.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.certificateValidStart = `${newVal[0]} 00:00:00`
     listQuery.certificateValidEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index 5d8d328..af479a6 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -41,7 +41,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.value.certificateValidStart = `${newVal[0]} 00:00:00`
     listQuery.value.certificateValidEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/device/group/components/tableList.vue b/src/views/tested/device/group/components/tableList.vue
index d1f60ce..f1b817a 100644
--- a/src/views/tested/device/group/components/tableList.vue
+++ b/src/views/tested/device/group/components/tableList.vue
@@ -177,7 +177,16 @@
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
           <el-input
-            v-if="scope.row.editable && !item.isSelect" v-model="scope.row[item.value]" :autofocus="true"
+            v-if="scope.row.editable && !item.isSelect && item.text === '设备名称'" v-model="scope.row[item.value]" :autofocus="true"
+            :placeholder="`${item.text}`" class="input"
+            @focus="select(item.text, scope.$index)"
+          >
+            <template #append>
+              <span @click="select(item.text, scope.$index)">选择</span>
+            </template>
+          </el-input>
+          <el-input
+            v-if="scope.row.editable && !item.isSelect && item.text !== '设备名称'" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
             @focus="select(item.text, scope.$index)"
           />
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 7443364..db05d4d 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -50,6 +50,7 @@
     text: '统一编号',
     value: 'equipmentNo',
     align: 'center',
+    sortable: 'custom',
   },
   {
     text: '设备名称',
@@ -60,11 +61,13 @@
     text: '型号规格',
     value: 'model',
     align: 'center',
+    sortable: 'custom',
   },
   {
     text: '出厂编号',
     value: 'manufactureNo',
     align: 'center',
+    sortable: 'custom',
   },
   {
     text: '使用岗位',
@@ -85,6 +88,7 @@
     text: '证书有效期',
     value: 'certificateValid',
     align: 'center',
+    sortable: 'custom',
   },
 ])
 const allColums = ref([
@@ -92,6 +96,7 @@
     text: '使用状态',
     value: 'usageStatusName',
     align: 'center',
+    sortable: 'custom',
   },
   {
     text: '备注',
@@ -121,6 +126,21 @@
     align: 'center',
   },
 ])
+// 排序条件发生变化
+const sortChange = ({ column }: any) => {
+  if (column.order === 'ascending') {
+    console.log(column.prop)
+    console.log('升序')
+  }
+  else if (column.order === 'descending') {
+    console.log(column.prop)
+    console.log('倒叙')
+  }
+}
+// 聚合表格实例
+const togetherTableRef = ref()
+// 展开表格实例
+const expandTableRef = ref()
 const list = ref([])
 const total = ref(0)
 const listLoading = ref(true)
@@ -157,7 +177,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.certificateValidStart = `${newVal[0]} 00:00:00`
     listQuery.certificateValidEnd = `${newVal[1]} 23:59:59`
   }
@@ -209,12 +229,29 @@
   expandLoading.value = true
   getInfoList(params).then((res) => {
     expandList.value = res.data
+    // 获取聚合表格选中，判断展开表格是否需要全选
+    const selectList = togetherTableRef.value.getSelectionRows()
+    if (selectList.length) {
+      const select = selectList.filter((item: any) => item.equipmentName === params.equipmentName)
+      if (select.length) {
+        nextTick(() => {
+          expandTableRef.value.toggleAllSelection()
+        })
+      }
+    }
     expandLoading.value = false
   })
 }
 const getRowKeys = (row: any) => { // 获取当前行id
   return row.equipmentName // 这里看这一行中需要根据哪个属性值是id
 }
+// 监听聚合表格多选
+// watch(() => togetherTableRef.value?.getSelectionRows(), (newVal, oldVal) => {
+//   console.log(newVal, 'newVal')
+// }, {
+//   deep: true,
+// })
+
 // 表格被选中的行
 const selectList = ref<any[]>([])
 // 表格多选
@@ -240,6 +277,48 @@
 {
   deep: true,
 })
+const togetherSelect = (selection: any, row: any) => {
+  if (selection.includes(row)) {
+    // 勾选
+    console.log('勾选')
+    if (expands.value && expands.value[0] === row.equipmentName) {
+      expandTableRef.value.toggleAllSelection()
+    }
+  }
+  else {
+    // 取消勾选
+    console.log('取消勾选')
+    if (expands.value && expands.value[0] === row.equipmentName) {
+      expandTableRef.value.toggleAllSelection()
+    }
+  }
+}
+const expandSelect = (selection: any, row: any) => {
+  if (selection.length === expandList.value.length) {
+    // 全选
+    console.log('全选')
+    // 获取聚合
+    console.log(expands.value[0])
+    const data = togetherList.value.filter((item: any) => item.equipmentName === expands.value[0])
+    console.log(data)
+    if (data.length) {
+      nextTick(() => {
+        togetherTableRef.value.toggleRowSelection(data[0], true)
+      })
+    }
+  }
+  else {
+    // 全不选
+    console.log('全不选')
+    // 获取聚合
+    const data = togetherList.value.filter((item: any) => item.equipmentName === expands.value[0])
+    if (data.length) {
+      nextTick(() => {
+        togetherTableRef.value.toggleRowSelection(data[0], false)
+      })
+    }
+  }
+}
 const $router = useRouter()
 // 新建编辑操作
 const handler = (row: IlistObjType, type: string) => {
@@ -497,7 +576,7 @@
       <template v-if="$props.statusName === '全部'" #btns-right>
         <icon-button icon="icon-change" title="切换列表状态" @click="changeTable" />
         <icon-button icon="icon-sweep" title="扫描" />
-        <icon-button icon="icon-add" title="新增" @click="handler({}, 'create')" />
+        <icon-button icon="icon-add" title="新增" @click="handler({} as any, 'create')" />
         <icon-button icon="icon-import" title="批量导入" @click="importList" />
         <icon-button icon="icon-template" title="模板下载" @click="useTemplateDownload('设备信息管理模块')" />
         <icon-button icon="icon-export" title="导出" @click="exportList" />
@@ -508,30 +587,29 @@
         <normal-table
           v-show=" tableFlage "
           ref="normalTableRef" :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="listLoading" :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
+          :list-loading="listLoading"
+          :is-showmulti-select="true" :is-multi="true" @sort-change="sortChange" @change="changePage" @multi-select="multiSelect"
         >
           <template #columns>
             <!-- 全部状态 -->
-            <el-table-column
-              v-for=" column of allColums " :key=" column.value "
-              :label=" column.text " :prop=" column.value " :align=" column.align "
-              :show-overflow-tooltip="true"
-            >
-              <template v-if="$props.statusName === '全部' " #default=" scope ">
-                <span>{{ scope.row[column.value] }}</span>
-              </template>
-            </el-table-column>
+            <template v-if="$props.statusName === '全部' ">
+              <el-table-column
+                v-for=" column of allColums " :key=" column.value "
+                :label=" column.text " :prop=" column.value " :align=" column.align "
+                :show-overflow-tooltip="true"
+                :sortable="column.sortable"
+              />
+            </template>
             <!-- 其他审批状态 -->
-            <el-table-column
-              v-for=" column of otherColums " :key="column.value" :label=" column.text "
-              :prop=" column.value " :align=" column.align "
-              :show-overflow-tooltip="true"
-            >
-              <template v-if="$props.statusName !== '全部' " #default=" scope ">
-                <span>
-                  {{ scope.row[column.value] }}</span>
-              </template>
-            </el-table-column>
+            <template v-if="$props.statusName !== '全部' ">
+              <el-table-column
+                v-for=" column of otherColums " :key="column.value"
+                :label=" column.text "
+                :prop=" column.value " :align=" column.align "
+                :show-overflow-tooltip="true"
+              />
+            </template>
+
             <el-table-column label="操作" width="160" align="center">
               <template #default=" scope ">
                 <el-button link type="primary" size="small" @click="detail(scope.row)">
@@ -580,6 +658,7 @@
       </div>
       <div v-if=" !tableFlage ">
         <!-- 展开行表格 -->
+        <!-- 头部 -->
         <normal-table
           v-show=" !tableFlage " class="nortable-header" :data=" [] " :total=" 0 " :columns=" columns " :options="
             {
@@ -587,12 +666,23 @@
               border: true, // 是否需要上方边框
             }
           " :pagination=" false " :is-showmulti-select=" true " :query="{}"
-        />
-        <el-table
-          v-show=" !tableFlage " v-loading=" togetherLoading " :data=" togetherList " border style="width: 100%;"
-          :row-key=" getRowKeys " :expand-row-keys=" expands " :show-header=" false " @expand-change=" expandChange "
         >
+          <template #columns>
+            <el-table-column label="操作" width="160" align="center" />
+          </template>
+        </normal-table>
+        <!-- 身体 -->
+        <el-table
+          v-show=" !tableFlage "
+          ref="togetherTableRef" v-loading=" togetherLoading " :data=" togetherList " border style="width: 100%;"
+          :row-key=" getRowKeys " :expand-row-keys=" expands " :show-header=" false " @expand-change=" expandChange "
+          @select="togetherSelect"
+        >
+          <el-table-column type="selection" width="38" />
           <el-table-column type="expand">
+            <template #default="props">
+              <!-- 展开表格身体 -->
+              <!-- <normal-table
             <template #default>
               <normal-table
                 :data=" expandList " :total=" 0 " :columns=" columns " :list-loading=" expandLoading " :options="
@@ -601,7 +691,58 @@
                     border: true, // 是否需要上方边框
                   }
                 " :pagination=" false " :is-showmulti-select=" true " :show-header=" false " :query="{}"
-              />
+              /> -->
+              <el-table
+                ref="expandTableRef"
+                v-loading=" expandLoading " :data=" expandList " border style="width: 100%;"
+                :show-header=" false " @select="expandSelect"
+              >
+                <el-table-column type="selection" width="38" />
+                <el-table-column v-for="item in columns" :key="item.value" :labe="item.text" :prop="item.value" align="center" />
+                <el-table-column label="操作" width="160" align="center">
+                  <template #default=" scope ">
+                    <el-button link type="primary" size="small" @click="detail(scope.row)">
+                      查看
+                    </el-button>
+                    <el-button
+                      v-if="proxy.buttonPerm.edit.if({ approvalStatusName: $props.statusName }, permUrl.edit)" link type="primary" size="small"
+                      @click="handler(scope.row, 'update')"
+                    >
+                      编辑
+                    </el-button>
+                    <el-button
+                      v-if="proxy.buttonPerm.agree.if({ approvalStatusName: $props.statusName }, permUrl.agree)" link type="primary" size="small"
+                      @click="approveHandler(scope.row, 'agree')"
+                    >
+                      同意
+                    </el-button>
+                    <el-button
+                      v-if="proxy.buttonPerm.reject.if({ approvalStatusName: $props.statusName }, permUrl.reject)" link type="primary" size="small"
+                      @click="approveHandler(scope.row, 'refuse')"
+                    >
+                      拒绝
+                    </el-button>
+                    <el-button
+                      v-if="proxy.buttonPerm.submit.if({ approvalStatusName: $props.statusName }, permUrl.submit)" link type="primary" size="small"
+                      @click="submit(scope.row)"
+                    >
+                      提交
+                    </el-button>
+                    <el-button
+                      v-if="proxy.buttonPerm.cancel.if({ approvalStatusName: $props.statusName }, permUrl.cancel)" link type="primary" size="small"
+                      @click="canHandler(scope.row)"
+                    >
+                      取消
+                    </el-button>
+                    <el-button
+                      v-if="proxy.buttonPerm.delete.if({ approvalStatusName: $props.statusName }, permUrl.del)" link type="danger" size="small"
+                      @click="delHandler(scope.row)"
+                    >
+                      删除
+                    </el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
             </template>
           </el-table-column>
           <el-table-column label="设备名称" prop="equipmentName" align="center" />
diff --git a/src/views/tested/device/model/components/edit.vue b/src/views/tested/device/model/components/edit.vue
new file mode 100644
index 0000000..0783b12
--- /dev/null
+++ b/src/views/tested/device/model/components/edit.vue
@@ -0,0 +1,251 @@
+<!-- 设备规格型号-编辑 -->
+<script lang="ts" setup name="DeviceModelEdit">
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import tableList from './technology.vue'
+import { getDictByCode } from '@/api/system/dict'
+import { handlerFunApi } from '@/api/eqpt/device/model'
+import useUserStore from '@/store/modules/user'
+import { getUserDept } from '@/api/system/user'
+import { uploadApi } from '@/api/system/notice'
+import showPhoto from '@/views/tested/device/info/components/showPhoto.vue'
+const $route = useRoute()
+const $router = useRouter()
+const userStore = useUserStore()
+const ruleFormRef = ref<FormInstance>() // from组件
+const title = ref('')
+// 显示标题
+const textMap: { [key: string]: string } = {
+  update: '编辑',
+  create: '新增',
+  detail: '详情',
+}
+// 对话框类型：create,update
+const dialogStatus = ref('create')
+const ruleForm = ref({
+  category: '', // 设备分类
+  categoryName: '', // 设备分类名称
+  checkCycle: '', // 检定周期
+  createDeptId: '',
+  createTime: '',
+  createUserId: '',
+  equipmentName: '', // 设备名称
+  helpInstruction: '', // 辅助字段
+  id: '',
+  instructionsFile: '', // 附件
+  model: '', // 规格型号
+  modelNo: '', // 规格型号编号
+  remark: '', // 备注
+  technicalTargetList: [], // 技术指标
+  updateTime: '',
+}) // 表单
+const rules = ref<FormRules>({
+  equipmentName: [{ required: true, message: '设备名称名称必填', trigger: 'blur' }],
+  category: [{ required: true, message: '设备分类必选', trigger: 'blur' }],
+  model: [{ required: true, message: '规格型号必填', trigger: 'blur' }],
+  checkCycle: [{ required: true, message: '检定周期必填', trigger: 'blur' }],
+}) // 表单验证规则
+// 弹窗初始化
+const initDialog = () => {
+  dialogStatus.value = $route.params.type as string
+  ruleFormRef.value?.resetFields()
+  if ($route.params.type === 'create') {
+    ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+    ruleForm.value.createUserId = userStore.id
+    // 获取当前用户所在单位
+    getUserDept().then((res) => {
+      ruleForm.value.createDeptId = res.data.id
+    })
+  }
+  else {
+    console.log($route.query.row, 'data')
+    const data = JSON.parse($route.query.row as string)
+    // detailGroup({ groupId: data.id }).then((res) => {
+    ruleForm.value = data
+    // })
+  }
+}
+onMounted(() => {
+  initDialog()
+})
+// 关闭弹窗
+const close = () => {
+  $router.back()
+}
+const tableRef = ref()
+// 保存
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid && tableRef.value.checkCertificateList()) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        ruleForm.value.equipmentList = tableRef.value.list
+        if ($route.params.type === 'create') {
+          handlerFunApi('create', ruleForm.value).then((res) => {
+            ElMessage.success('添加成功')
+            close()
+          })
+        }
+        else {
+          handlerFunApi('update', ruleForm.value).then((res) => {
+            ElMessage.success('修改成功')
+            close()
+          })
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    fd.append('multipartFile', event.target.files[0])
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        ruleForm.value.instructionsFile = ruleForm.value.instructionsFile ? `${ruleForm.value.instructionsFile},${res.data[0]}` : res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
+        loading.close()
+      }
+      else {
+        // ElMessage.error(res.message)
+        loading.close()
+      }
+    })
+  }
+}
+// 上传
+const upload = () => {
+  fileRef.value.click()
+}
+// 删除上传的文件
+const deleteFile = (fileName: string) => {
+  const data = ruleForm.value.instructionsFile.split(',')
+  const filterData = data.filter(item => item !== fileName)
+  ruleForm.value.instructionsFile = filterData.length ? filterData.join(',') : ''
+}
+// 设备分类
+const deviceTypeList = ref<{ id: string; value: string; name: string }[]>([])
+const fetchSelect = () => {
+  // 设备分类
+  getDictByCode('eqptDeviceType').then((res) => {
+    deviceTypeList.value = res.data
+  })
+}
+fetchSelect()
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <approval-dialog ref="approvalDialogRef" @on-success="() => { $router.back() }" />
+    <detail-page :title="`设备规格型号管理-${textMap[dialogStatus]}`">
+      <template #btns>
+        <el-button v-if="dialogStatus !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-com>
+      <el-form
+        ref="ruleFormRef"
+        :model="ruleForm"
+        :rules="rules" label-position="right" label-width="110px" class="form"
+        :disabled="dialogStatus === 'detail'"
+        :class="$route.path.includes('detail') ? 'isDetail' : ''"
+      >
+        <el-row :gutter="24" class="marg">
+          <el-col :span="8">
+            <el-form-item label="型号规格编号">
+              <el-input v-model.trim="ruleForm.modelNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm.equipmentName" placeholder="设备名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="规格型号" prop="model">
+              <el-input v-model.trim="ruleForm.model" placeholder="规格型号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="8">
+            <el-form-item label="辅助字段" prop="helpInstruction">
+              <el-input v-model.trim="ruleForm.helpInstruction" placeholder="辅助字段" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="设备分类" prop="category">
+              <el-select v-model.trim="ruleForm.category" placeholder="设备名称" style="width: 100%;">
+                <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="检定周期" prop="checkCycle">
+              <!-- <el-input v-model.trim="ruleForm.checkCycle" placeholder="检定周期" /> -->
+              <el-input v-model.trim="ruleForm.checkCycle">
+                <template #append>
+                  月
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="使用说明书" prop="instructionsFile">
+              <!-- <el-input v-model.trim="ruleForm.helpInstruction" placeholder="辅助字段" /> -->
+              <show-photo :minio-file-name="ruleForm.instructionsFile" @delete="deleteFile" />
+              <input ref="fileRef" style="display: none;" type="file" accept="application/msword,application/pdf" @change="onFileChange">
+              <el-button v-if="dialogStatus !== 'detail'" type="primary" @click="upload">
+                上传
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="18">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.remark" type="textarea" :row="3" maxlength="100" show-word-limit />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block-com>
+    <detail-block-com>
+      <table-list ref="tableRef" :data="ruleForm.technicalTargetList" :status="dialogStatus" />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/tested/device/model/components/list.vue b/src/views/tested/device/model/components/list.vue
new file mode 100644
index 0000000..60a0a42
--- /dev/null
+++ b/src/views/tested/device/model/components/list.vue
@@ -0,0 +1,266 @@
+<!-- 设备规格型号管理列表 -->
+<script lang="ts" setup name="DeviceModelList">
+import { reactive, ref, watch } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { deleteModel, exportModelList, getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
+import { exportFile } from '@/utils/exportUtils'
+import { getDictByCode } from '@/api/system/dict'
+const { proxy } = getCurrentInstance() as any
+const listQuery = reactive({
+  category: '',
+  equipmentName: '',
+  helpInstruction: '',
+  model: '',
+  offset: 1,
+  limit: 20,
+})
+const columns = ref([
+  {
+    text: '型号规格编号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '型号规格',
+    value: 'model',
+    align: 'center',
+  },
+  {
+    text: '辅助字段',
+    value: 'helpInstruction',
+    align: 'center',
+  },
+  {
+    text: '设备分类',
+    value: 'categoryName',
+    align: 'center',
+  },
+  {
+    text: '检定周期',
+    value: 'checkCycle',
+    align: 'center',
+  },
+  {
+    text: '使用说明书',
+    value: 'instructionsFile',
+    align: 'center',
+  },
+  {
+    text: '备注',
+    value: 'remark',
+    align: 'center',
+  },
+])
+const list = ref([])
+const total = ref(0)
+const listLoading = ref(true)
+
+// 获取数据
+const fetchData = (isNowPage = true) => {
+  listLoading.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  getModelList(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  })
+}
+fetchData()
+// 查询数据
+const search = () => {
+  fetchData(false)
+}
+// 重置
+const reset = () => {
+  listQuery.category = ''
+  listQuery.equipmentName = ''
+  listQuery.helpInstruction = ''
+  listQuery.model = ''
+  listQuery.offset = 1
+  listQuery.limit = 20
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData()
+}
+const $router = useRouter()
+// 新建编辑操作
+const handler = (row: any, type: string) => {
+  $router.push({
+    path: `/dmodel/${type}`,
+    query: {
+      row: JSON.stringify(row),
+      id: row.id,
+    },
+  })
+}
+// 删除
+const delHandler = (row: any) => {
+  ElMessageBox.confirm(
+    '确认删除操作？注意删除不可逆。',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    // 判断设备是否被绑定
+    // 此设备型号与已存在设备绑定，请先删除设备
+    deleteModel({ id: row.id }).then((res) => {
+      ElMessage.success('操作成功')
+      search()
+    })
+  })
+}
+// 表格被选中的行
+const selectList = ref<any[]>([])
+// 表格多选
+const multiSelect = (row: any[]) => {
+  selectList.value = row
+}
+// 导出列表
+const exportList = () => {
+  if (list.value.length) {
+    const loading = ElLoading.service({
+      lock: true,
+      text: 'Loading',
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const data = {
+      ...listQuery,
+      offset: undefined,
+      limit: undefined,
+      ids: selectList.value.map(item => item.id),
+    }
+    exportModelList(data).then((res) => {
+      exportFile('设备规格型号')
+      loading.close()
+    })
+      .catch((_) => {
+        loading.close()
+      })
+  }
+  else {
+    ElMessage.warning('无可导出内容')
+  }
+}
+// 获取下拉列表相关
+// 设备名称
+const deviceNameList = ref<{ id: string; value: string; name: string }[]>([])
+// 设备分类
+const deviceTypeList = ref<{ id: string; value: string; name: string }[]>([])
+// 规格型号
+const modelList = ref<any[]>([])
+// 辅助字段
+const helpList = ref<any[]>([])
+const allList = ref<any[]>([])
+const fetchSelect = () => {
+  // 设备分类
+  getDictByCode('eqptDeviceType').then((res) => {
+    deviceTypeList.value = res.data
+  })
+  // 设备名称
+  getDeviceNameList().then((res) => {
+    deviceNameList.value = res.data
+  })
+  // 规格型号及辅助字段
+  getModelAllList({}).then((res) => {
+    allList.value = res.data
+    modelList.value = res.data
+    helpList.value = res.data.filter(item => item.helpInstruction)
+  })
+}
+fetchSelect()
+// 监听设备名称下拉框，修改规格型号和辅助字段
+watch(() => listQuery.equipmentName, (newVal) => {
+  if (newVal) {
+    listQuery.helpInstruction = ''
+    listQuery.model = ''
+    // 修改规格型号和辅助字段列表
+    const data = allList.value.filter(item => item.equipmentName === newVal)
+    modelList.value = data
+    helpList.value = data.filter(item => item.helpInstruction)
+  }
+})
+// 监听规格型号下拉框，修改辅助字段
+watch(() => listQuery.model, (newVal) => {
+  if (newVal) {
+    listQuery.helpInstruction = ''
+    // 修改规格型号和辅助字段列表
+    console.log(helpList.value, 'helpList.value')
+    helpList.value = helpList.value.filter(item => item.model === newVal)
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-select v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable>
+          <el-option v-for="item in deviceNameList" :key="item" :label="item" :value="item" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model.trim="listQuery.model" placeholder="规格型号" clearable>
+          <el-option v-for="item in modelList" :key="item.id" :label="item.model" :value="item.model" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model.trim="listQuery.helpInstruction" placeholder="辅助字段" clearable>
+          <el-option v-for="item in helpList" :key="item.id" :label="item.helpInstruction" :value="item.helpInstruction" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model.trim="listQuery.category" placeholder="设备分类" clearable>
+          <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-add" title="新增" @click="handler({}, 'create')" />
+        <icon-button icon="icon-export" title="导出" @click="exportList" />
+      </template>
+      <!-- 普通表格 -->
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
+      >
+        <template #columns>
+          <el-table-column label="操作" width="140" align="center">
+            <template #default="scope">
+              <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
+                查看
+              </el-button>
+              <el-button link type="primary" size="small" @click="handler(scope.row, 'update')">
+                编辑
+              </el-button>
+              <el-button link type="danger" size="small" @click="delHandler(scope.row)">
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
diff --git a/src/views/tested/device/model/components/technology.vue b/src/views/tested/device/model/components/technology.vue
new file mode 100644
index 0000000..d31fb2d
--- /dev/null
+++ b/src/views/tested/device/model/components/technology.vue
@@ -0,0 +1,141 @@
+<!-- 技术指标 -->
+<script lang="ts" setup name="DeviceTechnologyTable">
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { useCheckList } from '@/utils/useCheckList'
+const $props = defineProps({
+  data: {
+    type: Array,
+    default: () => ([]),
+  },
+})
+const $route = useRoute()
+// 表头显示标题
+const columns = ref([
+  {
+    text: '测量范围',
+    value: 'measureRange',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+  {
+    text: '不确定度或允许误差极限或准确度等级',
+    value: 'uncertainty',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+  {
+    text: '依据的技术文件',
+    value: 'basedDocuments',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+])
+const list = ref<any[]>([])
+// 检查数据列表
+function checkCertificateList() {
+  return useCheckList(list.value, columns.value, '技术指标')
+}
+// 将列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of list.value) {
+    item.editable = false
+  }
+}
+// 双击行显示输入框
+const dblclickRow = (row: any) => {
+  if ($route.path.includes('detail')) {
+    return
+  }
+  setAllRowReadable()
+  row.editable = true
+}
+const SelectionList = ref()
+// 表格选中
+const handleSelectionChange = (e: any[]) => {
+  SelectionList.value = e
+}
+// 添加行
+const addRow = () => {
+  if (checkCertificateList()) {
+    setAllRowReadable()
+    list.value.push({
+      measureRange: '',
+      uncertainty: '',
+      basedDocuments: '',
+      editable: true,
+    })
+  }
+}
+// 删除行
+const removeRow = () => {
+  list.value = list.value.filter((item) => {
+    return !SelectionList.value.includes(item)
+  })
+}
+watch(() => $props.data, (newVal) => {
+  if (newVal) {
+    list.value = newVal
+  }
+})
+const initDialog = () => {
+  list.value = $props.data
+}
+initDialog()
+defineExpose({
+  list,
+  checkCertificateList,
+})
+</script>
+
+<template>
+  <detail-block-switch title="技术指标">
+    <template v-if="!$route.path.includes('detail')" #btns>
+      <el-button type="primary" @click="addRow">
+        增加行
+      </el-button>
+      <el-button type="info" @click="removeRow">
+        删除行
+      </el-button>
+    </template>
+    <el-table
+      ref="multipleTableRef" :data="list" style="width: 100%;" border @selection-change="handleSelectionChange"
+      @row-dblclick="dblclickRow"
+    >
+      <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
+      <el-table-column align="center" label="序号" width="80" type="index" />
+      <el-table-column
+        v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text"
+        align="center"
+      >
+        <template #header>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
+        </template>
+        <template #default="scope">
+          <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+          <el-input
+            v-if="scope.row.editable && !item.isSelect" v-model="scope.row[item.value]" :autofocus="true"
+            :placeholder="`${item.text}`" class="input"
+          />
+          <!-- <el-date-picker v-if="scope.row.editable && item.isDate" v-model="scope.row[item.value]" type="date"
+              format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`" /> -->
+          <!-- <el-select
+            v-if="scope.row.editable && item.isSelect" v-model="scope.row[item.value]"
+            :placeholder="`${item.text}`"
+          >
+            <el-option v-for="item in platformListBak" :key="item.id" :label="item.name" :value="item.name" />
+          </el-select> -->
+        </template>
+      </el-table-column>
+    </el-table>
+  </detail-block-switch>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>
diff --git a/src/views/tested/device/model/index.vue b/src/views/tested/device/model/index.vue
new file mode 100644
index 0000000..e0524d9
--- /dev/null
+++ b/src/views/tested/device/model/index.vue
@@ -0,0 +1,8 @@
+<!-- 设备规格型号管理 -->
+<script lang="ts" setup name="DeviceModelIndex">
+import list from './components/list.vue'
+</script>
+
+<template>
+  <list />
+</template>
diff --git a/src/views/tested/device/remind/index.vue b/src/views/tested/device/remind/index.vue
index e29c9e7..63937cb 100644
--- a/src/views/tested/device/remind/index.vue
+++ b/src/views/tested/device/remind/index.vue
@@ -92,7 +92,7 @@
 }
 const range = ref()
 watch(() => range.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.certificateValidStart = `${newVal[0]} 00:00:00`
     listQuery.certificateValidEnd = `${newVal[1]} 23:59:59`
   }

diff --git a/.env.development b/.env.development
index debe1a8..f2fee42 100644
--- a/.env.development
+++ b/.env.development
@@ -4,7 +4,7 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
-VITE_APP_API_BASEURL = http://127.0.0.1:5909
+VITE_APP_API_BASEURL = http://192.168.8.101:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..313fcf7 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://192.168.8.101:5909"
 }
diff --git a/src/api/eqpt/device/model.ts b/src/api/eqpt/device/model.ts
new file mode 100644
index 0000000..a8fa0f1
--- /dev/null
+++ b/src/api/eqpt/device/model.ts
@@ -0,0 +1,61 @@
+/**
+ * 设备型号规格管理相关
+ */
+import request from '@/api/index'
+
+// 列表
+export function getModelList(params: any) {
+  return request({
+    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}`,
+    method: 'post',
+    data: params,
+  })
+}
+// 列表-不分页
+export function getModelAllList(params: any) {
+  return request({
+    url: '/equipment/model/list',
+    method: 'post',
+    data: params,
+  })
+}
+// 设备名称列表/equipment/model/listEquipmentName
+export function getDeviceNameList(params: any) {
+  return request({
+    url: '/equipment/model/listEquipmentName',
+    method: 'get',
+    params,
+  })
+}
+// 导出
+export function exportModelList(data: any) {
+  return request({
+    url: '/equipment/model/export',
+    method: 'post',
+    data,
+  })
+}
+// 新建或编辑
+export function handlerFunApi(type: string, data: any) {
+  if (type === 'create') {
+    return request({
+      url: '/equipment/model/add',
+      method: 'post',
+      data,
+    })
+  }
+  else if (type === 'update') {
+    return request({
+      url: '/equipment/model/update',
+      method: 'post',
+      data,
+    })
+  }
+}
+// 删除
+export function deleteModel(data: any) {
+  return request({
+    url: `/equipment/model/delete?id=${data.id}`,
+    method: 'post',
+  })
+}
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 14ec12e..64e6f48 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -55,11 +55,12 @@
   // listQuery.value.offset = 1
   // }
   fetchApproval({ processId: listQuery.value.processId }).then((response) => {
+    console.log(response.data, 'response')
     response.data.forEach((item: Array<IList>, index: number) => {
       item.forEach((i: any) => {
         list.value.push({
           cindex: index,
-          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[i.cindex].nodeNumber + 1,
+          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[index - 1].nodeNumber + 1,
           assigneeName: i.assigneeName, // 姓名
           approvalStatus: i.approvalStatus, // 审批类型
           finishTime: i.finishTime ? i.finishTime : '-', // 完成时间
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index f08078d..aefbd8b 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -90,8 +90,16 @@
     type: String,
     default: 'default',
   }, // 表格大小，默认，small,mini等，与el-table条件相同
+  // 排序
+  sort: {
+    type: Object,
+    default() {
+      return {
+      }
+    },
+  },
 })
-const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'multiSelect'])
+const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'multiSelect', 'sortChange'])
 // -------定义数据--------------
 interface columnsCheckInfo {
   text: string
@@ -139,6 +147,10 @@
 function selectionChange(selection: []) {
   emit('selectionChange', selection)
 }
+// 点击排序
+function sortClick(column: any, prop: any, order: any) {
+  emit('sortChange', { column, prop, order })
+}
 // 点击行
 function rowClick(row: object, column?: any, event?: any) {
   emit('rowClick', row)
@@ -196,11 +208,13 @@
       border
       stripe
       :size="size"
+      :default-sort="props.sort"
       :show-header="showHeader"
       style="width: 100%;"
       @selection-change="handleSelectionChange"
       @select="selectClick"
       @row-click="rowClick"
+      @sort-change="sortClick"
     >
       <slot name="preColumns" />
 
@@ -210,7 +224,7 @@
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
+      <el-table-column v-for="column of columns" :key="column.value" :sortable="column.sortable" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
           <span v-else :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ column.filter(scope.row) }}</span>
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index 5cf6445..2cd73de 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -320,7 +320,7 @@
   {
     path: '/meteringdevice',
     component: Layout,
-    redirect: '/devicelist',
+    redirect: '/modellist',
     name: 'MeteringDevice',
     meta: {
       title: '设备台账',
@@ -329,6 +329,43 @@
     },
     children: [
       {
+        path: '/modellist',
+        component: Layout,
+        redirect: '/dmodel',
+        name: 'DeviceModel',
+        meta: {
+          title: '设备规格型号管理',
+          icon: 'ep:key',
+          auth: '/tested/device/model',
+        },
+        children: [
+          {
+            path: '/dmodel',
+            name: 'DeviceModelPage',
+            component: () => import('@/views/tested/device/model/index.vue'),
+            meta: {
+              title: '设备规格型号管理',
+              auth: '/tested/device/model',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/modellist',
+            },
+          },
+          {
+            path: '/dmodel/:type',
+            name: 'ModelEdit',
+            component: () => import('@/views/tested/device/model/components/edit.vue'),
+            meta: {
+              title: '设备规格型号管理',
+              auth: '/tested/device/model',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/modellist',
+            },
+          },
+        ],
+      },
+      {
         path: '/devicelist',
         component: Layout,
         redirect: '/dinfo',
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 6c9383f..879a207 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -158,7 +158,11 @@
 }
 // 批量删除
 const batchDeleteLabel = () => {
-  if (selectList.value.length) {
+  if (selectList.value.filter(item => item.usageStatusName === '已使用').length) {
+    ElMessage.warning('请选择未使用的标签')
+    return
+  }
+  if (selectList.value.filter(item => item.usageStatusName !== '已使用').length) {
     ElMessageBox.confirm(
       '确认删除所选数据吗？',
       '提示',
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index 60d55d6..ba91cbf 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -25,7 +25,7 @@
   offset: 1,
 }) // 查询参数
 watch(() => noticeTime.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     searchQuery.noticeStartTime = `${newVal[0]} 00:00:00`
     searchQuery.noticeEndTime = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/system/signature/autograph.vue b/src/views/system/signature/autograph.vue
index e5a32c8..9c1d0ca 100644
--- a/src/views/system/signature/autograph.vue
+++ b/src/views/system/signature/autograph.vue
@@ -23,7 +23,7 @@
   ids: [],
 }) // 查询参数
 watch(() => createTime.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     searchQuery.createStartTime = `${newVal[0]} 00:00:00`
     searchQuery.createEndTime = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 5f57089..b557683 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -16,7 +16,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index 8f31905..e140eaa 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.applicantTimeStart = `${newVal[0]} 00:00:00`
     listQuery.applicantTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/opinion/index.vue b/src/views/tested/MeasurementBusiness/opinion/index.vue
index 6c7e13c..c6683c0 100644
--- a/src/views/tested/MeasurementBusiness/opinion/index.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue
index b15f27b..e204a69 100644
--- a/src/views/tested/MeasurementBusiness/review/index.vue
+++ b/src/views/tested/MeasurementBusiness/review/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
@@ -76,21 +76,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
-  // getListPage(listQuery).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   listLoading.value = false
-  // })
-  list.value = [{
-    formNo: '12345',
-    formName: '评审表1',
-    labCode: '海口实验室',
-    groupCode: '组别1',
-    signStatusName: '同意',
-    createUserName: '张三',
-    createTime: '2023-09-05',
-  }]
-  listLoading.value = false
+  getListPage(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  })
 }
 fetchData()
 // 查询数据
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 0e2fd1c..217365a 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -14,7 +14,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.sendTimeStart = `${newVal[0]} 00:00:00`
     listQuery.sendTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index e117705..e2d0ea2 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -12,6 +12,7 @@
     required: true,
   },
 })
+const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
 const userStore = useUserStore()
 const listQuery = reactive({
@@ -20,8 +21,8 @@
   createTimeEnd: '',
   createTimeStart: '',
   notifyType: $props.notifyType, // 通知类型(负责人/部门，字典值)
-  notifyDept: userStore.deptId,
-  notifyUser: userStore.id,
+  notifyDept: $route.path.includes('curatorpage') ? '' : userStore.deptId,
+  notifyUser: $route.path.includes('curatorpage') ? userStore.id : '',
   offset: 1,
   limit: 20,
 })
@@ -30,7 +31,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/dept/index.vue b/src/views/tested/MeasurementPlan/dept/index.vue
index aafe5e1..a25835f 100644
--- a/src/views/tested/MeasurementPlan/dept/index.vue
+++ b/src/views/tested/MeasurementPlan/dept/index.vue
@@ -5,5 +5,5 @@
 
 <template>
   <!-- notifyType 通知类型(负责人/部门，字典值) -->
-  <page notify-type="1" />
+  <page notify-type="2" />
 </template>
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 3cdecdc..429acf5 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -53,7 +53,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index f599508..2c53a36 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -24,7 +24,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index 6af790b..f17af59 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -39,7 +39,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 6fa4355..d0e9936 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -27,7 +27,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.value.certificateValidStart = `${newVal[0]} 00:00:00`
     listQuery.value.certificateValidEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/task/index.vue b/src/views/tested/MeasurementPlan/task/index.vue
index 4ab62d9..aa759a8 100644
--- a/src/views/tested/MeasurementPlan/task/index.vue
+++ b/src/views/tested/MeasurementPlan/task/index.vue
@@ -17,7 +17,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createStartTime = `${newVal[0]} 00:00:00`
     listQuery.createEndTime = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index c7d63b8..67b4dac 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -99,7 +99,7 @@
 }
 const range = ref()
 watch(() => range.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.certificateValidStart = `${newVal[0]} 00:00:00`
     listQuery.certificateValidEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index 5d8d328..af479a6 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -41,7 +41,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.value.certificateValidStart = `${newVal[0]} 00:00:00`
     listQuery.value.certificateValidEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/device/group/components/tableList.vue b/src/views/tested/device/group/components/tableList.vue
index d1f60ce..f1b817a 100644
--- a/src/views/tested/device/group/components/tableList.vue
+++ b/src/views/tested/device/group/components/tableList.vue
@@ -177,7 +177,16 @@
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
           <el-input
-            v-if="scope.row.editable && !item.isSelect" v-model="scope.row[item.value]" :autofocus="true"
+            v-if="scope.row.editable && !item.isSelect && item.text === '设备名称'" v-model="scope.row[item.value]" :autofocus="true"
+            :placeholder="`${item.text}`" class="input"
+            @focus="select(item.text, scope.$index)"
+          >
+            <template #append>
+              <span @click="select(item.text, scope.$index)">选择</span>
+            </template>
+          </el-input>
+          <el-input
+            v-if="scope.row.editable && !item.isSelect && item.text !== '设备名称'" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
             @focus="select(item.text, scope.$index)"
           />
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 7443364..db05d4d 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -50,6 +50,7 @@
     text: '统一编号',
     value: 'equipmentNo',
     align: 'center',
+    sortable: 'custom',
   },
   {
     text: '设备名称',
@@ -60,11 +61,13 @@
     text: '型号规格',
     value: 'model',
     align: 'center',
+    sortable: 'custom',
   },
   {
     text: '出厂编号',
     value: 'manufactureNo',
     align: 'center',
+    sortable: 'custom',
   },
   {
     text: '使用岗位',
@@ -85,6 +88,7 @@
     text: '证书有效期',
     value: 'certificateValid',
     align: 'center',
+    sortable: 'custom',
   },
 ])
 const allColums = ref([
@@ -92,6 +96,7 @@
     text: '使用状态',
     value: 'usageStatusName',
     align: 'center',
+    sortable: 'custom',
   },
   {
     text: '备注',
@@ -121,6 +126,21 @@
     align: 'center',
   },
 ])
+// 排序条件发生变化
+const sortChange = ({ column }: any) => {
+  if (column.order === 'ascending') {
+    console.log(column.prop)
+    console.log('升序')
+  }
+  else if (column.order === 'descending') {
+    console.log(column.prop)
+    console.log('倒叙')
+  }
+}
+// 聚合表格实例
+const togetherTableRef = ref()
+// 展开表格实例
+const expandTableRef = ref()
 const list = ref([])
 const total = ref(0)
 const listLoading = ref(true)
@@ -157,7 +177,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.certificateValidStart = `${newVal[0]} 00:00:00`
     listQuery.certificateValidEnd = `${newVal[1]} 23:59:59`
   }
@@ -209,12 +229,29 @@
   expandLoading.value = true
   getInfoList(params).then((res) => {
     expandList.value = res.data
+    // 获取聚合表格选中，判断展开表格是否需要全选
+    const selectList = togetherTableRef.value.getSelectionRows()
+    if (selectList.length) {
+      const select = selectList.filter((item: any) => item.equipmentName === params.equipmentName)
+      if (select.length) {
+        nextTick(() => {
+          expandTableRef.value.toggleAllSelection()
+        })
+      }
+    }
     expandLoading.value = false
   })
 }
 const getRowKeys = (row: any) => { // 获取当前行id
   return row.equipmentName // 这里看这一行中需要根据哪个属性值是id
 }
+// 监听聚合表格多选
+// watch(() => togetherTableRef.value?.getSelectionRows(), (newVal, oldVal) => {
+//   console.log(newVal, 'newVal')
+// }, {
+//   deep: true,
+// })
+
 // 表格被选中的行
 const selectList = ref<any[]>([])
 // 表格多选
@@ -240,6 +277,48 @@
 {
   deep: true,
 })
+const togetherSelect = (selection: any, row: any) => {
+  if (selection.includes(row)) {
+    // 勾选
+    console.log('勾选')
+    if (expands.value && expands.value[0] === row.equipmentName) {
+      expandTableRef.value.toggleAllSelection()
+    }
+  }
+  else {
+    // 取消勾选
+    console.log('取消勾选')
+    if (expands.value && expands.value[0] === row.equipmentName) {
+      expandTableRef.value.toggleAllSelection()
+    }
+  }
+}
+const expandSelect = (selection: any, row: any) => {
+  if (selection.length === expandList.value.length) {
+    // 全选
+    console.log('全选')
+    // 获取聚合
+    console.log(expands.value[0])
+    const data = togetherList.value.filter((item: any) => item.equipmentName === expands.value[0])
+    console.log(data)
+    if (data.length) {
+      nextTick(() => {
+        togetherTableRef.value.toggleRowSelection(data[0], true)
+      })
+    }
+  }
+  else {
+    // 全不选
+    console.log('全不选')
+    // 获取聚合
+    const data = togetherList.value.filter((item: any) => item.equipmentName === expands.value[0])
+    if (data.length) {
+      nextTick(() => {
+        togetherTableRef.value.toggleRowSelection(data[0], false)
+      })
+    }
+  }
+}
 const $router = useRouter()
 // 新建编辑操作
 const handler = (row: IlistObjType, type: string) => {
@@ -497,7 +576,7 @@
       <template v-if="$props.statusName === '全部'" #btns-right>
         <icon-button icon="icon-change" title="切换列表状态" @click="changeTable" />
         <icon-button icon="icon-sweep" title="扫描" />
-        <icon-button icon="icon-add" title="新增" @click="handler({}, 'create')" />
+        <icon-button icon="icon-add" title="新增" @click="handler({} as any, 'create')" />
         <icon-button icon="icon-import" title="批量导入" @click="importList" />
         <icon-button icon="icon-template" title="模板下载" @click="useTemplateDownload('设备信息管理模块')" />
         <icon-button icon="icon-export" title="导出" @click="exportList" />
@@ -508,30 +587,29 @@
         <normal-table
           v-show=" tableFlage "
           ref="normalTableRef" :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="listLoading" :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
+          :list-loading="listLoading"
+          :is-showmulti-select="true" :is-multi="true" @sort-change="sortChange" @change="changePage" @multi-select="multiSelect"
         >
           <template #columns>
             <!-- 全部状态 -->
-            <el-table-column
-              v-for=" column of allColums " :key=" column.value "
-              :label=" column.text " :prop=" column.value " :align=" column.align "
-              :show-overflow-tooltip="true"
-            >
-              <template v-if="$props.statusName === '全部' " #default=" scope ">
-                <span>{{ scope.row[column.value] }}</span>
-              </template>
-            </el-table-column>
+            <template v-if="$props.statusName === '全部' ">
+              <el-table-column
+                v-for=" column of allColums " :key=" column.value "
+                :label=" column.text " :prop=" column.value " :align=" column.align "
+                :show-overflow-tooltip="true"
+                :sortable="column.sortable"
+              />
+            </template>
             <!-- 其他审批状态 -->
-            <el-table-column
-              v-for=" column of otherColums " :key="column.value" :label=" column.text "
-              :prop=" column.value " :align=" column.align "
-              :show-overflow-tooltip="true"
-            >
-              <template v-if="$props.statusName !== '全部' " #default=" scope ">
-                <span>
-                  {{ scope.row[column.value] }}</span>
-              </template>
-            </el-table-column>
+            <template v-if="$props.statusName !== '全部' ">
+              <el-table-column
+                v-for=" column of otherColums " :key="column.value"
+                :label=" column.text "
+                :prop=" column.value " :align=" column.align "
+                :show-overflow-tooltip="true"
+              />
+            </template>
+
             <el-table-column label="操作" width="160" align="center">
               <template #default=" scope ">
                 <el-button link type="primary" size="small" @click="detail(scope.row)">
@@ -580,6 +658,7 @@
       </div>
       <div v-if=" !tableFlage ">
         <!-- 展开行表格 -->
+        <!-- 头部 -->
         <normal-table
           v-show=" !tableFlage " class="nortable-header" :data=" [] " :total=" 0 " :columns=" columns " :options="
             {
@@ -587,12 +666,23 @@
               border: true, // 是否需要上方边框
             }
           " :pagination=" false " :is-showmulti-select=" true " :query="{}"
-        />
-        <el-table
-          v-show=" !tableFlage " v-loading=" togetherLoading " :data=" togetherList " border style="width: 100%;"
-          :row-key=" getRowKeys " :expand-row-keys=" expands " :show-header=" false " @expand-change=" expandChange "
         >
+          <template #columns>
+            <el-table-column label="操作" width="160" align="center" />
+          </template>
+        </normal-table>
+        <!-- 身体 -->
+        <el-table
+          v-show=" !tableFlage "
+          ref="togetherTableRef" v-loading=" togetherLoading " :data=" togetherList " border style="width: 100%;"
+          :row-key=" getRowKeys " :expand-row-keys=" expands " :show-header=" false " @expand-change=" expandChange "
+          @select="togetherSelect"
+        >
+          <el-table-column type="selection" width="38" />
           <el-table-column type="expand">
+            <template #default="props">
+              <!-- 展开表格身体 -->
+              <!-- <normal-table
             <template #default>
               <normal-table
                 :data=" expandList " :total=" 0 " :columns=" columns " :list-loading=" expandLoading " :options="
@@ -601,7 +691,58 @@
                     border: true, // 是否需要上方边框
                   }
                 " :pagination=" false " :is-showmulti-select=" true " :show-header=" false " :query="{}"
-              />
+              /> -->
+              <el-table
+                ref="expandTableRef"
+                v-loading=" expandLoading " :data=" expandList " border style="width: 100%;"
+                :show-header=" false " @select="expandSelect"
+              >
+                <el-table-column type="selection" width="38" />
+                <el-table-column v-for="item in columns" :key="item.value" :labe="item.text" :prop="item.value" align="center" />
+                <el-table-column label="操作" width="160" align="center">
+                  <template #default=" scope ">
+                    <el-button link type="primary" size="small" @click="detail(scope.row)">
+                      查看
+                    </el-button>
+                    <el-button
+                      v-if="proxy.buttonPerm.edit.if({ approvalStatusName: $props.statusName }, permUrl.edit)" link type="primary" size="small"
+                      @click="handler(scope.row, 'update')"
+                    >
+                      编辑
+                    </el-button>
+                    <el-button
+                      v-if="proxy.buttonPerm.agree.if({ approvalStatusName: $props.statusName }, permUrl.agree)" link type="primary" size="small"
+                      @click="approveHandler(scope.row, 'agree')"
+                    >
+                      同意
+                    </el-button>
+                    <el-button
+                      v-if="proxy.buttonPerm.reject.if({ approvalStatusName: $props.statusName }, permUrl.reject)" link type="primary" size="small"
+                      @click="approveHandler(scope.row, 'refuse')"
+                    >
+                      拒绝
+                    </el-button>
+                    <el-button
+                      v-if="proxy.buttonPerm.submit.if({ approvalStatusName: $props.statusName }, permUrl.submit)" link type="primary" size="small"
+                      @click="submit(scope.row)"
+                    >
+                      提交
+                    </el-button>
+                    <el-button
+                      v-if="proxy.buttonPerm.cancel.if({ approvalStatusName: $props.statusName }, permUrl.cancel)" link type="primary" size="small"
+                      @click="canHandler(scope.row)"
+                    >
+                      取消
+                    </el-button>
+                    <el-button
+                      v-if="proxy.buttonPerm.delete.if({ approvalStatusName: $props.statusName }, permUrl.del)" link type="danger" size="small"
+                      @click="delHandler(scope.row)"
+                    >
+                      删除
+                    </el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
             </template>
           </el-table-column>
           <el-table-column label="设备名称" prop="equipmentName" align="center" />
diff --git a/src/views/tested/device/model/components/edit.vue b/src/views/tested/device/model/components/edit.vue
new file mode 100644
index 0000000..0783b12
--- /dev/null
+++ b/src/views/tested/device/model/components/edit.vue
@@ -0,0 +1,251 @@
+<!-- 设备规格型号-编辑 -->
+<script lang="ts" setup name="DeviceModelEdit">
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import tableList from './technology.vue'
+import { getDictByCode } from '@/api/system/dict'
+import { handlerFunApi } from '@/api/eqpt/device/model'
+import useUserStore from '@/store/modules/user'
+import { getUserDept } from '@/api/system/user'
+import { uploadApi } from '@/api/system/notice'
+import showPhoto from '@/views/tested/device/info/components/showPhoto.vue'
+const $route = useRoute()
+const $router = useRouter()
+const userStore = useUserStore()
+const ruleFormRef = ref<FormInstance>() // from组件
+const title = ref('')
+// 显示标题
+const textMap: { [key: string]: string } = {
+  update: '编辑',
+  create: '新增',
+  detail: '详情',
+}
+// 对话框类型：create,update
+const dialogStatus = ref('create')
+const ruleForm = ref({
+  category: '', // 设备分类
+  categoryName: '', // 设备分类名称
+  checkCycle: '', // 检定周期
+  createDeptId: '',
+  createTime: '',
+  createUserId: '',
+  equipmentName: '', // 设备名称
+  helpInstruction: '', // 辅助字段
+  id: '',
+  instructionsFile: '', // 附件
+  model: '', // 规格型号
+  modelNo: '', // 规格型号编号
+  remark: '', // 备注
+  technicalTargetList: [], // 技术指标
+  updateTime: '',
+}) // 表单
+const rules = ref<FormRules>({
+  equipmentName: [{ required: true, message: '设备名称名称必填', trigger: 'blur' }],
+  category: [{ required: true, message: '设备分类必选', trigger: 'blur' }],
+  model: [{ required: true, message: '规格型号必填', trigger: 'blur' }],
+  checkCycle: [{ required: true, message: '检定周期必填', trigger: 'blur' }],
+}) // 表单验证规则
+// 弹窗初始化
+const initDialog = () => {
+  dialogStatus.value = $route.params.type as string
+  ruleFormRef.value?.resetFields()
+  if ($route.params.type === 'create') {
+    ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+    ruleForm.value.createUserId = userStore.id
+    // 获取当前用户所在单位
+    getUserDept().then((res) => {
+      ruleForm.value.createDeptId = res.data.id
+    })
+  }
+  else {
+    console.log($route.query.row, 'data')
+    const data = JSON.parse($route.query.row as string)
+    // detailGroup({ groupId: data.id }).then((res) => {
+    ruleForm.value = data
+    // })
+  }
+}
+onMounted(() => {
+  initDialog()
+})
+// 关闭弹窗
+const close = () => {
+  $router.back()
+}
+const tableRef = ref()
+// 保存
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid && tableRef.value.checkCertificateList()) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        ruleForm.value.equipmentList = tableRef.value.list
+        if ($route.params.type === 'create') {
+          handlerFunApi('create', ruleForm.value).then((res) => {
+            ElMessage.success('添加成功')
+            close()
+          })
+        }
+        else {
+          handlerFunApi('update', ruleForm.value).then((res) => {
+            ElMessage.success('修改成功')
+            close()
+          })
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    fd.append('multipartFile', event.target.files[0])
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        ruleForm.value.instructionsFile = ruleForm.value.instructionsFile ? `${ruleForm.value.instructionsFile},${res.data[0]}` : res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
+        loading.close()
+      }
+      else {
+        // ElMessage.error(res.message)
+        loading.close()
+      }
+    })
+  }
+}
+// 上传
+const upload = () => {
+  fileRef.value.click()
+}
+// 删除上传的文件
+const deleteFile = (fileName: string) => {
+  const data = ruleForm.value.instructionsFile.split(',')
+  const filterData = data.filter(item => item !== fileName)
+  ruleForm.value.instructionsFile = filterData.length ? filterData.join(',') : ''
+}
+// 设备分类
+const deviceTypeList = ref<{ id: string; value: string; name: string }[]>([])
+const fetchSelect = () => {
+  // 设备分类
+  getDictByCode('eqptDeviceType').then((res) => {
+    deviceTypeList.value = res.data
+  })
+}
+fetchSelect()
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <approval-dialog ref="approvalDialogRef" @on-success="() => { $router.back() }" />
+    <detail-page :title="`设备规格型号管理-${textMap[dialogStatus]}`">
+      <template #btns>
+        <el-button v-if="dialogStatus !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-com>
+      <el-form
+        ref="ruleFormRef"
+        :model="ruleForm"
+        :rules="rules" label-position="right" label-width="110px" class="form"
+        :disabled="dialogStatus === 'detail'"
+        :class="$route.path.includes('detail') ? 'isDetail' : ''"
+      >
+        <el-row :gutter="24" class="marg">
+          <el-col :span="8">
+            <el-form-item label="型号规格编号">
+              <el-input v-model.trim="ruleForm.modelNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm.equipmentName" placeholder="设备名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="规格型号" prop="model">
+              <el-input v-model.trim="ruleForm.model" placeholder="规格型号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="8">
+            <el-form-item label="辅助字段" prop="helpInstruction">
+              <el-input v-model.trim="ruleForm.helpInstruction" placeholder="辅助字段" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="设备分类" prop="category">
+              <el-select v-model.trim="ruleForm.category" placeholder="设备名称" style="width: 100%;">
+                <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="检定周期" prop="checkCycle">
+              <!-- <el-input v-model.trim="ruleForm.checkCycle" placeholder="检定周期" /> -->
+              <el-input v-model.trim="ruleForm.checkCycle">
+                <template #append>
+                  月
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="使用说明书" prop="instructionsFile">
+              <!-- <el-input v-model.trim="ruleForm.helpInstruction" placeholder="辅助字段" /> -->
+              <show-photo :minio-file-name="ruleForm.instructionsFile" @delete="deleteFile" />
+              <input ref="fileRef" style="display: none;" type="file" accept="application/msword,application/pdf" @change="onFileChange">
+              <el-button v-if="dialogStatus !== 'detail'" type="primary" @click="upload">
+                上传
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="18">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.remark" type="textarea" :row="3" maxlength="100" show-word-limit />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block-com>
+    <detail-block-com>
+      <table-list ref="tableRef" :data="ruleForm.technicalTargetList" :status="dialogStatus" />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/tested/device/model/components/list.vue b/src/views/tested/device/model/components/list.vue
new file mode 100644
index 0000000..60a0a42
--- /dev/null
+++ b/src/views/tested/device/model/components/list.vue
@@ -0,0 +1,266 @@
+<!-- 设备规格型号管理列表 -->
+<script lang="ts" setup name="DeviceModelList">
+import { reactive, ref, watch } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { deleteModel, exportModelList, getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
+import { exportFile } from '@/utils/exportUtils'
+import { getDictByCode } from '@/api/system/dict'
+const { proxy } = getCurrentInstance() as any
+const listQuery = reactive({
+  category: '',
+  equipmentName: '',
+  helpInstruction: '',
+  model: '',
+  offset: 1,
+  limit: 20,
+})
+const columns = ref([
+  {
+    text: '型号规格编号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '型号规格',
+    value: 'model',
+    align: 'center',
+  },
+  {
+    text: '辅助字段',
+    value: 'helpInstruction',
+    align: 'center',
+  },
+  {
+    text: '设备分类',
+    value: 'categoryName',
+    align: 'center',
+  },
+  {
+    text: '检定周期',
+    value: 'checkCycle',
+    align: 'center',
+  },
+  {
+    text: '使用说明书',
+    value: 'instructionsFile',
+    align: 'center',
+  },
+  {
+    text: '备注',
+    value: 'remark',
+    align: 'center',
+  },
+])
+const list = ref([])
+const total = ref(0)
+const listLoading = ref(true)
+
+// 获取数据
+const fetchData = (isNowPage = true) => {
+  listLoading.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  getModelList(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  })
+}
+fetchData()
+// 查询数据
+const search = () => {
+  fetchData(false)
+}
+// 重置
+const reset = () => {
+  listQuery.category = ''
+  listQuery.equipmentName = ''
+  listQuery.helpInstruction = ''
+  listQuery.model = ''
+  listQuery.offset = 1
+  listQuery.limit = 20
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData()
+}
+const $router = useRouter()
+// 新建编辑操作
+const handler = (row: any, type: string) => {
+  $router.push({
+    path: `/dmodel/${type}`,
+    query: {
+      row: JSON.stringify(row),
+      id: row.id,
+    },
+  })
+}
+// 删除
+const delHandler = (row: any) => {
+  ElMessageBox.confirm(
+    '确认删除操作？注意删除不可逆。',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    // 判断设备是否被绑定
+    // 此设备型号与已存在设备绑定，请先删除设备
+    deleteModel({ id: row.id }).then((res) => {
+      ElMessage.success('操作成功')
+      search()
+    })
+  })
+}
+// 表格被选中的行
+const selectList = ref<any[]>([])
+// 表格多选
+const multiSelect = (row: any[]) => {
+  selectList.value = row
+}
+// 导出列表
+const exportList = () => {
+  if (list.value.length) {
+    const loading = ElLoading.service({
+      lock: true,
+      text: 'Loading',
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const data = {
+      ...listQuery,
+      offset: undefined,
+      limit: undefined,
+      ids: selectList.value.map(item => item.id),
+    }
+    exportModelList(data).then((res) => {
+      exportFile('设备规格型号')
+      loading.close()
+    })
+      .catch((_) => {
+        loading.close()
+      })
+  }
+  else {
+    ElMessage.warning('无可导出内容')
+  }
+}
+// 获取下拉列表相关
+// 设备名称
+const deviceNameList = ref<{ id: string; value: string; name: string }[]>([])
+// 设备分类
+const deviceTypeList = ref<{ id: string; value: string; name: string }[]>([])
+// 规格型号
+const modelList = ref<any[]>([])
+// 辅助字段
+const helpList = ref<any[]>([])
+const allList = ref<any[]>([])
+const fetchSelect = () => {
+  // 设备分类
+  getDictByCode('eqptDeviceType').then((res) => {
+    deviceTypeList.value = res.data
+  })
+  // 设备名称
+  getDeviceNameList().then((res) => {
+    deviceNameList.value = res.data
+  })
+  // 规格型号及辅助字段
+  getModelAllList({}).then((res) => {
+    allList.value = res.data
+    modelList.value = res.data
+    helpList.value = res.data.filter(item => item.helpInstruction)
+  })
+}
+fetchSelect()
+// 监听设备名称下拉框，修改规格型号和辅助字段
+watch(() => listQuery.equipmentName, (newVal) => {
+  if (newVal) {
+    listQuery.helpInstruction = ''
+    listQuery.model = ''
+    // 修改规格型号和辅助字段列表
+    const data = allList.value.filter(item => item.equipmentName === newVal)
+    modelList.value = data
+    helpList.value = data.filter(item => item.helpInstruction)
+  }
+})
+// 监听规格型号下拉框，修改辅助字段
+watch(() => listQuery.model, (newVal) => {
+  if (newVal) {
+    listQuery.helpInstruction = ''
+    // 修改规格型号和辅助字段列表
+    console.log(helpList.value, 'helpList.value')
+    helpList.value = helpList.value.filter(item => item.model === newVal)
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-select v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable>
+          <el-option v-for="item in deviceNameList" :key="item" :label="item" :value="item" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model.trim="listQuery.model" placeholder="规格型号" clearable>
+          <el-option v-for="item in modelList" :key="item.id" :label="item.model" :value="item.model" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model.trim="listQuery.helpInstruction" placeholder="辅助字段" clearable>
+          <el-option v-for="item in helpList" :key="item.id" :label="item.helpInstruction" :value="item.helpInstruction" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model.trim="listQuery.category" placeholder="设备分类" clearable>
+          <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-add" title="新增" @click="handler({}, 'create')" />
+        <icon-button icon="icon-export" title="导出" @click="exportList" />
+      </template>
+      <!-- 普通表格 -->
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
+      >
+        <template #columns>
+          <el-table-column label="操作" width="140" align="center">
+            <template #default="scope">
+              <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
+                查看
+              </el-button>
+              <el-button link type="primary" size="small" @click="handler(scope.row, 'update')">
+                编辑
+              </el-button>
+              <el-button link type="danger" size="small" @click="delHandler(scope.row)">
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
diff --git a/src/views/tested/device/model/components/technology.vue b/src/views/tested/device/model/components/technology.vue
new file mode 100644
index 0000000..d31fb2d
--- /dev/null
+++ b/src/views/tested/device/model/components/technology.vue
@@ -0,0 +1,141 @@
+<!-- 技术指标 -->
+<script lang="ts" setup name="DeviceTechnologyTable">
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { useCheckList } from '@/utils/useCheckList'
+const $props = defineProps({
+  data: {
+    type: Array,
+    default: () => ([]),
+  },
+})
+const $route = useRoute()
+// 表头显示标题
+const columns = ref([
+  {
+    text: '测量范围',
+    value: 'measureRange',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+  {
+    text: '不确定度或允许误差极限或准确度等级',
+    value: 'uncertainty',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+  {
+    text: '依据的技术文件',
+    value: 'basedDocuments',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+])
+const list = ref<any[]>([])
+// 检查数据列表
+function checkCertificateList() {
+  return useCheckList(list.value, columns.value, '技术指标')
+}
+// 将列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of list.value) {
+    item.editable = false
+  }
+}
+// 双击行显示输入框
+const dblclickRow = (row: any) => {
+  if ($route.path.includes('detail')) {
+    return
+  }
+  setAllRowReadable()
+  row.editable = true
+}
+const SelectionList = ref()
+// 表格选中
+const handleSelectionChange = (e: any[]) => {
+  SelectionList.value = e
+}
+// 添加行
+const addRow = () => {
+  if (checkCertificateList()) {
+    setAllRowReadable()
+    list.value.push({
+      measureRange: '',
+      uncertainty: '',
+      basedDocuments: '',
+      editable: true,
+    })
+  }
+}
+// 删除行
+const removeRow = () => {
+  list.value = list.value.filter((item) => {
+    return !SelectionList.value.includes(item)
+  })
+}
+watch(() => $props.data, (newVal) => {
+  if (newVal) {
+    list.value = newVal
+  }
+})
+const initDialog = () => {
+  list.value = $props.data
+}
+initDialog()
+defineExpose({
+  list,
+  checkCertificateList,
+})
+</script>
+
+<template>
+  <detail-block-switch title="技术指标">
+    <template v-if="!$route.path.includes('detail')" #btns>
+      <el-button type="primary" @click="addRow">
+        增加行
+      </el-button>
+      <el-button type="info" @click="removeRow">
+        删除行
+      </el-button>
+    </template>
+    <el-table
+      ref="multipleTableRef" :data="list" style="width: 100%;" border @selection-change="handleSelectionChange"
+      @row-dblclick="dblclickRow"
+    >
+      <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
+      <el-table-column align="center" label="序号" width="80" type="index" />
+      <el-table-column
+        v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text"
+        align="center"
+      >
+        <template #header>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
+        </template>
+        <template #default="scope">
+          <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+          <el-input
+            v-if="scope.row.editable && !item.isSelect" v-model="scope.row[item.value]" :autofocus="true"
+            :placeholder="`${item.text}`" class="input"
+          />
+          <!-- <el-date-picker v-if="scope.row.editable && item.isDate" v-model="scope.row[item.value]" type="date"
+              format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`" /> -->
+          <!-- <el-select
+            v-if="scope.row.editable && item.isSelect" v-model="scope.row[item.value]"
+            :placeholder="`${item.text}`"
+          >
+            <el-option v-for="item in platformListBak" :key="item.id" :label="item.name" :value="item.name" />
+          </el-select> -->
+        </template>
+      </el-table-column>
+    </el-table>
+  </detail-block-switch>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>
diff --git a/src/views/tested/device/model/index.vue b/src/views/tested/device/model/index.vue
new file mode 100644
index 0000000..e0524d9
--- /dev/null
+++ b/src/views/tested/device/model/index.vue
@@ -0,0 +1,8 @@
+<!-- 设备规格型号管理 -->
+<script lang="ts" setup name="DeviceModelIndex">
+import list from './components/list.vue'
+</script>
+
+<template>
+  <list />
+</template>
diff --git a/src/views/tested/device/remind/index.vue b/src/views/tested/device/remind/index.vue
index e29c9e7..63937cb 100644
--- a/src/views/tested/device/remind/index.vue
+++ b/src/views/tested/device/remind/index.vue
@@ -92,7 +92,7 @@
 }
 const range = ref()
 watch(() => range.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.certificateValidStart = `${newVal[0]} 00:00:00`
     listQuery.certificateValidEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/subpackage/certificate/index.vue b/src/views/tested/subpackage/certificate/index.vue
index 0620ef5..cea2db2 100644
--- a/src/views/tested/subpackage/certificate/index.vue
+++ b/src/views/tested/subpackage/certificate/index.vue
@@ -19,7 +19,7 @@
 })
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }

diff --git a/.env.development b/.env.development
index debe1a8..f2fee42 100644
--- a/.env.development
+++ b/.env.development
@@ -4,7 +4,7 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
-VITE_APP_API_BASEURL = http://127.0.0.1:5909
+VITE_APP_API_BASEURL = http://192.168.8.101:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..313fcf7 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://192.168.8.101:5909"
 }
diff --git a/src/api/eqpt/device/model.ts b/src/api/eqpt/device/model.ts
new file mode 100644
index 0000000..a8fa0f1
--- /dev/null
+++ b/src/api/eqpt/device/model.ts
@@ -0,0 +1,61 @@
+/**
+ * 设备型号规格管理相关
+ */
+import request from '@/api/index'
+
+// 列表
+export function getModelList(params: any) {
+  return request({
+    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}`,
+    method: 'post',
+    data: params,
+  })
+}
+// 列表-不分页
+export function getModelAllList(params: any) {
+  return request({
+    url: '/equipment/model/list',
+    method: 'post',
+    data: params,
+  })
+}
+// 设备名称列表/equipment/model/listEquipmentName
+export function getDeviceNameList(params: any) {
+  return request({
+    url: '/equipment/model/listEquipmentName',
+    method: 'get',
+    params,
+  })
+}
+// 导出
+export function exportModelList(data: any) {
+  return request({
+    url: '/equipment/model/export',
+    method: 'post',
+    data,
+  })
+}
+// 新建或编辑
+export function handlerFunApi(type: string, data: any) {
+  if (type === 'create') {
+    return request({
+      url: '/equipment/model/add',
+      method: 'post',
+      data,
+    })
+  }
+  else if (type === 'update') {
+    return request({
+      url: '/equipment/model/update',
+      method: 'post',
+      data,
+    })
+  }
+}
+// 删除
+export function deleteModel(data: any) {
+  return request({
+    url: `/equipment/model/delete?id=${data.id}`,
+    method: 'post',
+  })
+}
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 14ec12e..64e6f48 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -55,11 +55,12 @@
   // listQuery.value.offset = 1
   // }
   fetchApproval({ processId: listQuery.value.processId }).then((response) => {
+    console.log(response.data, 'response')
     response.data.forEach((item: Array<IList>, index: number) => {
       item.forEach((i: any) => {
         list.value.push({
           cindex: index,
-          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[i.cindex].nodeNumber + 1,
+          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[index - 1].nodeNumber + 1,
           assigneeName: i.assigneeName, // 姓名
           approvalStatus: i.approvalStatus, // 审批类型
           finishTime: i.finishTime ? i.finishTime : '-', // 完成时间
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index f08078d..aefbd8b 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -90,8 +90,16 @@
     type: String,
     default: 'default',
   }, // 表格大小，默认，small,mini等，与el-table条件相同
+  // 排序
+  sort: {
+    type: Object,
+    default() {
+      return {
+      }
+    },
+  },
 })
-const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'multiSelect'])
+const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'multiSelect', 'sortChange'])
 // -------定义数据--------------
 interface columnsCheckInfo {
   text: string
@@ -139,6 +147,10 @@
 function selectionChange(selection: []) {
   emit('selectionChange', selection)
 }
+// 点击排序
+function sortClick(column: any, prop: any, order: any) {
+  emit('sortChange', { column, prop, order })
+}
 // 点击行
 function rowClick(row: object, column?: any, event?: any) {
   emit('rowClick', row)
@@ -196,11 +208,13 @@
       border
       stripe
       :size="size"
+      :default-sort="props.sort"
       :show-header="showHeader"
       style="width: 100%;"
       @selection-change="handleSelectionChange"
       @select="selectClick"
       @row-click="rowClick"
+      @sort-change="sortClick"
     >
       <slot name="preColumns" />
 
@@ -210,7 +224,7 @@
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
+      <el-table-column v-for="column of columns" :key="column.value" :sortable="column.sortable" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
           <span v-else :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ column.filter(scope.row) }}</span>
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index 5cf6445..2cd73de 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -320,7 +320,7 @@
   {
     path: '/meteringdevice',
     component: Layout,
-    redirect: '/devicelist',
+    redirect: '/modellist',
     name: 'MeteringDevice',
     meta: {
       title: '设备台账',
@@ -329,6 +329,43 @@
     },
     children: [
       {
+        path: '/modellist',
+        component: Layout,
+        redirect: '/dmodel',
+        name: 'DeviceModel',
+        meta: {
+          title: '设备规格型号管理',
+          icon: 'ep:key',
+          auth: '/tested/device/model',
+        },
+        children: [
+          {
+            path: '/dmodel',
+            name: 'DeviceModelPage',
+            component: () => import('@/views/tested/device/model/index.vue'),
+            meta: {
+              title: '设备规格型号管理',
+              auth: '/tested/device/model',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/modellist',
+            },
+          },
+          {
+            path: '/dmodel/:type',
+            name: 'ModelEdit',
+            component: () => import('@/views/tested/device/model/components/edit.vue'),
+            meta: {
+              title: '设备规格型号管理',
+              auth: '/tested/device/model',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/modellist',
+            },
+          },
+        ],
+      },
+      {
         path: '/devicelist',
         component: Layout,
         redirect: '/dinfo',
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 6c9383f..879a207 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -158,7 +158,11 @@
 }
 // 批量删除
 const batchDeleteLabel = () => {
-  if (selectList.value.length) {
+  if (selectList.value.filter(item => item.usageStatusName === '已使用').length) {
+    ElMessage.warning('请选择未使用的标签')
+    return
+  }
+  if (selectList.value.filter(item => item.usageStatusName !== '已使用').length) {
     ElMessageBox.confirm(
       '确认删除所选数据吗？',
       '提示',
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index 60d55d6..ba91cbf 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -25,7 +25,7 @@
   offset: 1,
 }) // 查询参数
 watch(() => noticeTime.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     searchQuery.noticeStartTime = `${newVal[0]} 00:00:00`
     searchQuery.noticeEndTime = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/system/signature/autograph.vue b/src/views/system/signature/autograph.vue
index e5a32c8..9c1d0ca 100644
--- a/src/views/system/signature/autograph.vue
+++ b/src/views/system/signature/autograph.vue
@@ -23,7 +23,7 @@
   ids: [],
 }) // 查询参数
 watch(() => createTime.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     searchQuery.createStartTime = `${newVal[0]} 00:00:00`
     searchQuery.createEndTime = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 5f57089..b557683 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -16,7 +16,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index 8f31905..e140eaa 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.applicantTimeStart = `${newVal[0]} 00:00:00`
     listQuery.applicantTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/opinion/index.vue b/src/views/tested/MeasurementBusiness/opinion/index.vue
index 6c7e13c..c6683c0 100644
--- a/src/views/tested/MeasurementBusiness/opinion/index.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue
index b15f27b..e204a69 100644
--- a/src/views/tested/MeasurementBusiness/review/index.vue
+++ b/src/views/tested/MeasurementBusiness/review/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
@@ -76,21 +76,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
-  // getListPage(listQuery).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   listLoading.value = false
-  // })
-  list.value = [{
-    formNo: '12345',
-    formName: '评审表1',
-    labCode: '海口实验室',
-    groupCode: '组别1',
-    signStatusName: '同意',
-    createUserName: '张三',
-    createTime: '2023-09-05',
-  }]
-  listLoading.value = false
+  getListPage(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  })
 }
 fetchData()
 // 查询数据
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 0e2fd1c..217365a 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -14,7 +14,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.sendTimeStart = `${newVal[0]} 00:00:00`
     listQuery.sendTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index e117705..e2d0ea2 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -12,6 +12,7 @@
     required: true,
   },
 })
+const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
 const userStore = useUserStore()
 const listQuery = reactive({
@@ -20,8 +21,8 @@
   createTimeEnd: '',
   createTimeStart: '',
   notifyType: $props.notifyType, // 通知类型(负责人/部门，字典值)
-  notifyDept: userStore.deptId,
-  notifyUser: userStore.id,
+  notifyDept: $route.path.includes('curatorpage') ? '' : userStore.deptId,
+  notifyUser: $route.path.includes('curatorpage') ? userStore.id : '',
   offset: 1,
   limit: 20,
 })
@@ -30,7 +31,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/dept/index.vue b/src/views/tested/MeasurementPlan/dept/index.vue
index aafe5e1..a25835f 100644
--- a/src/views/tested/MeasurementPlan/dept/index.vue
+++ b/src/views/tested/MeasurementPlan/dept/index.vue
@@ -5,5 +5,5 @@
 
 <template>
   <!-- notifyType 通知类型(负责人/部门，字典值) -->
-  <page notify-type="1" />
+  <page notify-type="2" />
 </template>
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 3cdecdc..429acf5 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -53,7 +53,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index f599508..2c53a36 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -24,7 +24,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index 6af790b..f17af59 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -39,7 +39,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 6fa4355..d0e9936 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -27,7 +27,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.value.certificateValidStart = `${newVal[0]} 00:00:00`
     listQuery.value.certificateValidEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/task/index.vue b/src/views/tested/MeasurementPlan/task/index.vue
index 4ab62d9..aa759a8 100644
--- a/src/views/tested/MeasurementPlan/task/index.vue
+++ b/src/views/tested/MeasurementPlan/task/index.vue
@@ -17,7 +17,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createStartTime = `${newVal[0]} 00:00:00`
     listQuery.createEndTime = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index c7d63b8..67b4dac 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -99,7 +99,7 @@
 }
 const range = ref()
 watch(() => range.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.certificateValidStart = `${newVal[0]} 00:00:00`
     listQuery.certificateValidEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index 5d8d328..af479a6 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -41,7 +41,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.value.certificateValidStart = `${newVal[0]} 00:00:00`
     listQuery.value.certificateValidEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/device/group/components/tableList.vue b/src/views/tested/device/group/components/tableList.vue
index d1f60ce..f1b817a 100644
--- a/src/views/tested/device/group/components/tableList.vue
+++ b/src/views/tested/device/group/components/tableList.vue
@@ -177,7 +177,16 @@
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
           <el-input
-            v-if="scope.row.editable && !item.isSelect" v-model="scope.row[item.value]" :autofocus="true"
+            v-if="scope.row.editable && !item.isSelect && item.text === '设备名称'" v-model="scope.row[item.value]" :autofocus="true"
+            :placeholder="`${item.text}`" class="input"
+            @focus="select(item.text, scope.$index)"
+          >
+            <template #append>
+              <span @click="select(item.text, scope.$index)">选择</span>
+            </template>
+          </el-input>
+          <el-input
+            v-if="scope.row.editable && !item.isSelect && item.text !== '设备名称'" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
             @focus="select(item.text, scope.$index)"
           />
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 7443364..db05d4d 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -50,6 +50,7 @@
     text: '统一编号',
     value: 'equipmentNo',
     align: 'center',
+    sortable: 'custom',
   },
   {
     text: '设备名称',
@@ -60,11 +61,13 @@
     text: '型号规格',
     value: 'model',
     align: 'center',
+    sortable: 'custom',
   },
   {
     text: '出厂编号',
     value: 'manufactureNo',
     align: 'center',
+    sortable: 'custom',
   },
   {
     text: '使用岗位',
@@ -85,6 +88,7 @@
     text: '证书有效期',
     value: 'certificateValid',
     align: 'center',
+    sortable: 'custom',
   },
 ])
 const allColums = ref([
@@ -92,6 +96,7 @@
     text: '使用状态',
     value: 'usageStatusName',
     align: 'center',
+    sortable: 'custom',
   },
   {
     text: '备注',
@@ -121,6 +126,21 @@
     align: 'center',
   },
 ])
+// 排序条件发生变化
+const sortChange = ({ column }: any) => {
+  if (column.order === 'ascending') {
+    console.log(column.prop)
+    console.log('升序')
+  }
+  else if (column.order === 'descending') {
+    console.log(column.prop)
+    console.log('倒叙')
+  }
+}
+// 聚合表格实例
+const togetherTableRef = ref()
+// 展开表格实例
+const expandTableRef = ref()
 const list = ref([])
 const total = ref(0)
 const listLoading = ref(true)
@@ -157,7 +177,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.certificateValidStart = `${newVal[0]} 00:00:00`
     listQuery.certificateValidEnd = `${newVal[1]} 23:59:59`
   }
@@ -209,12 +229,29 @@
   expandLoading.value = true
   getInfoList(params).then((res) => {
     expandList.value = res.data
+    // 获取聚合表格选中，判断展开表格是否需要全选
+    const selectList = togetherTableRef.value.getSelectionRows()
+    if (selectList.length) {
+      const select = selectList.filter((item: any) => item.equipmentName === params.equipmentName)
+      if (select.length) {
+        nextTick(() => {
+          expandTableRef.value.toggleAllSelection()
+        })
+      }
+    }
     expandLoading.value = false
   })
 }
 const getRowKeys = (row: any) => { // 获取当前行id
   return row.equipmentName // 这里看这一行中需要根据哪个属性值是id
 }
+// 监听聚合表格多选
+// watch(() => togetherTableRef.value?.getSelectionRows(), (newVal, oldVal) => {
+//   console.log(newVal, 'newVal')
+// }, {
+//   deep: true,
+// })
+
 // 表格被选中的行
 const selectList = ref<any[]>([])
 // 表格多选
@@ -240,6 +277,48 @@
 {
   deep: true,
 })
+const togetherSelect = (selection: any, row: any) => {
+  if (selection.includes(row)) {
+    // 勾选
+    console.log('勾选')
+    if (expands.value && expands.value[0] === row.equipmentName) {
+      expandTableRef.value.toggleAllSelection()
+    }
+  }
+  else {
+    // 取消勾选
+    console.log('取消勾选')
+    if (expands.value && expands.value[0] === row.equipmentName) {
+      expandTableRef.value.toggleAllSelection()
+    }
+  }
+}
+const expandSelect = (selection: any, row: any) => {
+  if (selection.length === expandList.value.length) {
+    // 全选
+    console.log('全选')
+    // 获取聚合
+    console.log(expands.value[0])
+    const data = togetherList.value.filter((item: any) => item.equipmentName === expands.value[0])
+    console.log(data)
+    if (data.length) {
+      nextTick(() => {
+        togetherTableRef.value.toggleRowSelection(data[0], true)
+      })
+    }
+  }
+  else {
+    // 全不选
+    console.log('全不选')
+    // 获取聚合
+    const data = togetherList.value.filter((item: any) => item.equipmentName === expands.value[0])
+    if (data.length) {
+      nextTick(() => {
+        togetherTableRef.value.toggleRowSelection(data[0], false)
+      })
+    }
+  }
+}
 const $router = useRouter()
 // 新建编辑操作
 const handler = (row: IlistObjType, type: string) => {
@@ -497,7 +576,7 @@
       <template v-if="$props.statusName === '全部'" #btns-right>
         <icon-button icon="icon-change" title="切换列表状态" @click="changeTable" />
         <icon-button icon="icon-sweep" title="扫描" />
-        <icon-button icon="icon-add" title="新增" @click="handler({}, 'create')" />
+        <icon-button icon="icon-add" title="新增" @click="handler({} as any, 'create')" />
         <icon-button icon="icon-import" title="批量导入" @click="importList" />
         <icon-button icon="icon-template" title="模板下载" @click="useTemplateDownload('设备信息管理模块')" />
         <icon-button icon="icon-export" title="导出" @click="exportList" />
@@ -508,30 +587,29 @@
         <normal-table
           v-show=" tableFlage "
           ref="normalTableRef" :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="listLoading" :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
+          :list-loading="listLoading"
+          :is-showmulti-select="true" :is-multi="true" @sort-change="sortChange" @change="changePage" @multi-select="multiSelect"
         >
           <template #columns>
             <!-- 全部状态 -->
-            <el-table-column
-              v-for=" column of allColums " :key=" column.value "
-              :label=" column.text " :prop=" column.value " :align=" column.align "
-              :show-overflow-tooltip="true"
-            >
-              <template v-if="$props.statusName === '全部' " #default=" scope ">
-                <span>{{ scope.row[column.value] }}</span>
-              </template>
-            </el-table-column>
+            <template v-if="$props.statusName === '全部' ">
+              <el-table-column
+                v-for=" column of allColums " :key=" column.value "
+                :label=" column.text " :prop=" column.value " :align=" column.align "
+                :show-overflow-tooltip="true"
+                :sortable="column.sortable"
+              />
+            </template>
             <!-- 其他审批状态 -->
-            <el-table-column
-              v-for=" column of otherColums " :key="column.value" :label=" column.text "
-              :prop=" column.value " :align=" column.align "
-              :show-overflow-tooltip="true"
-            >
-              <template v-if="$props.statusName !== '全部' " #default=" scope ">
-                <span>
-                  {{ scope.row[column.value] }}</span>
-              </template>
-            </el-table-column>
+            <template v-if="$props.statusName !== '全部' ">
+              <el-table-column
+                v-for=" column of otherColums " :key="column.value"
+                :label=" column.text "
+                :prop=" column.value " :align=" column.align "
+                :show-overflow-tooltip="true"
+              />
+            </template>
+
             <el-table-column label="操作" width="160" align="center">
               <template #default=" scope ">
                 <el-button link type="primary" size="small" @click="detail(scope.row)">
@@ -580,6 +658,7 @@
       </div>
       <div v-if=" !tableFlage ">
         <!-- 展开行表格 -->
+        <!-- 头部 -->
         <normal-table
           v-show=" !tableFlage " class="nortable-header" :data=" [] " :total=" 0 " :columns=" columns " :options="
             {
@@ -587,12 +666,23 @@
               border: true, // 是否需要上方边框
             }
           " :pagination=" false " :is-showmulti-select=" true " :query="{}"
-        />
-        <el-table
-          v-show=" !tableFlage " v-loading=" togetherLoading " :data=" togetherList " border style="width: 100%;"
-          :row-key=" getRowKeys " :expand-row-keys=" expands " :show-header=" false " @expand-change=" expandChange "
         >
+          <template #columns>
+            <el-table-column label="操作" width="160" align="center" />
+          </template>
+        </normal-table>
+        <!-- 身体 -->
+        <el-table
+          v-show=" !tableFlage "
+          ref="togetherTableRef" v-loading=" togetherLoading " :data=" togetherList " border style="width: 100%;"
+          :row-key=" getRowKeys " :expand-row-keys=" expands " :show-header=" false " @expand-change=" expandChange "
+          @select="togetherSelect"
+        >
+          <el-table-column type="selection" width="38" />
           <el-table-column type="expand">
+            <template #default="props">
+              <!-- 展开表格身体 -->
+              <!-- <normal-table
             <template #default>
               <normal-table
                 :data=" expandList " :total=" 0 " :columns=" columns " :list-loading=" expandLoading " :options="
@@ -601,7 +691,58 @@
                     border: true, // 是否需要上方边框
                   }
                 " :pagination=" false " :is-showmulti-select=" true " :show-header=" false " :query="{}"
-              />
+              /> -->
+              <el-table
+                ref="expandTableRef"
+                v-loading=" expandLoading " :data=" expandList " border style="width: 100%;"
+                :show-header=" false " @select="expandSelect"
+              >
+                <el-table-column type="selection" width="38" />
+                <el-table-column v-for="item in columns" :key="item.value" :labe="item.text" :prop="item.value" align="center" />
+                <el-table-column label="操作" width="160" align="center">
+                  <template #default=" scope ">
+                    <el-button link type="primary" size="small" @click="detail(scope.row)">
+                      查看
+                    </el-button>
+                    <el-button
+                      v-if="proxy.buttonPerm.edit.if({ approvalStatusName: $props.statusName }, permUrl.edit)" link type="primary" size="small"
+                      @click="handler(scope.row, 'update')"
+                    >
+                      编辑
+                    </el-button>
+                    <el-button
+                      v-if="proxy.buttonPerm.agree.if({ approvalStatusName: $props.statusName }, permUrl.agree)" link type="primary" size="small"
+                      @click="approveHandler(scope.row, 'agree')"
+                    >
+                      同意
+                    </el-button>
+                    <el-button
+                      v-if="proxy.buttonPerm.reject.if({ approvalStatusName: $props.statusName }, permUrl.reject)" link type="primary" size="small"
+                      @click="approveHandler(scope.row, 'refuse')"
+                    >
+                      拒绝
+                    </el-button>
+                    <el-button
+                      v-if="proxy.buttonPerm.submit.if({ approvalStatusName: $props.statusName }, permUrl.submit)" link type="primary" size="small"
+                      @click="submit(scope.row)"
+                    >
+                      提交
+                    </el-button>
+                    <el-button
+                      v-if="proxy.buttonPerm.cancel.if({ approvalStatusName: $props.statusName }, permUrl.cancel)" link type="primary" size="small"
+                      @click="canHandler(scope.row)"
+                    >
+                      取消
+                    </el-button>
+                    <el-button
+                      v-if="proxy.buttonPerm.delete.if({ approvalStatusName: $props.statusName }, permUrl.del)" link type="danger" size="small"
+                      @click="delHandler(scope.row)"
+                    >
+                      删除
+                    </el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
             </template>
           </el-table-column>
           <el-table-column label="设备名称" prop="equipmentName" align="center" />
diff --git a/src/views/tested/device/model/components/edit.vue b/src/views/tested/device/model/components/edit.vue
new file mode 100644
index 0000000..0783b12
--- /dev/null
+++ b/src/views/tested/device/model/components/edit.vue
@@ -0,0 +1,251 @@
+<!-- 设备规格型号-编辑 -->
+<script lang="ts" setup name="DeviceModelEdit">
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import tableList from './technology.vue'
+import { getDictByCode } from '@/api/system/dict'
+import { handlerFunApi } from '@/api/eqpt/device/model'
+import useUserStore from '@/store/modules/user'
+import { getUserDept } from '@/api/system/user'
+import { uploadApi } from '@/api/system/notice'
+import showPhoto from '@/views/tested/device/info/components/showPhoto.vue'
+const $route = useRoute()
+const $router = useRouter()
+const userStore = useUserStore()
+const ruleFormRef = ref<FormInstance>() // from组件
+const title = ref('')
+// 显示标题
+const textMap: { [key: string]: string } = {
+  update: '编辑',
+  create: '新增',
+  detail: '详情',
+}
+// 对话框类型：create,update
+const dialogStatus = ref('create')
+const ruleForm = ref({
+  category: '', // 设备分类
+  categoryName: '', // 设备分类名称
+  checkCycle: '', // 检定周期
+  createDeptId: '',
+  createTime: '',
+  createUserId: '',
+  equipmentName: '', // 设备名称
+  helpInstruction: '', // 辅助字段
+  id: '',
+  instructionsFile: '', // 附件
+  model: '', // 规格型号
+  modelNo: '', // 规格型号编号
+  remark: '', // 备注
+  technicalTargetList: [], // 技术指标
+  updateTime: '',
+}) // 表单
+const rules = ref<FormRules>({
+  equipmentName: [{ required: true, message: '设备名称名称必填', trigger: 'blur' }],
+  category: [{ required: true, message: '设备分类必选', trigger: 'blur' }],
+  model: [{ required: true, message: '规格型号必填', trigger: 'blur' }],
+  checkCycle: [{ required: true, message: '检定周期必填', trigger: 'blur' }],
+}) // 表单验证规则
+// 弹窗初始化
+const initDialog = () => {
+  dialogStatus.value = $route.params.type as string
+  ruleFormRef.value?.resetFields()
+  if ($route.params.type === 'create') {
+    ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+    ruleForm.value.createUserId = userStore.id
+    // 获取当前用户所在单位
+    getUserDept().then((res) => {
+      ruleForm.value.createDeptId = res.data.id
+    })
+  }
+  else {
+    console.log($route.query.row, 'data')
+    const data = JSON.parse($route.query.row as string)
+    // detailGroup({ groupId: data.id }).then((res) => {
+    ruleForm.value = data
+    // })
+  }
+}
+onMounted(() => {
+  initDialog()
+})
+// 关闭弹窗
+const close = () => {
+  $router.back()
+}
+const tableRef = ref()
+// 保存
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid && tableRef.value.checkCertificateList()) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        ruleForm.value.equipmentList = tableRef.value.list
+        if ($route.params.type === 'create') {
+          handlerFunApi('create', ruleForm.value).then((res) => {
+            ElMessage.success('添加成功')
+            close()
+          })
+        }
+        else {
+          handlerFunApi('update', ruleForm.value).then((res) => {
+            ElMessage.success('修改成功')
+            close()
+          })
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    fd.append('multipartFile', event.target.files[0])
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        ruleForm.value.instructionsFile = ruleForm.value.instructionsFile ? `${ruleForm.value.instructionsFile},${res.data[0]}` : res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
+        loading.close()
+      }
+      else {
+        // ElMessage.error(res.message)
+        loading.close()
+      }
+    })
+  }
+}
+// 上传
+const upload = () => {
+  fileRef.value.click()
+}
+// 删除上传的文件
+const deleteFile = (fileName: string) => {
+  const data = ruleForm.value.instructionsFile.split(',')
+  const filterData = data.filter(item => item !== fileName)
+  ruleForm.value.instructionsFile = filterData.length ? filterData.join(',') : ''
+}
+// 设备分类
+const deviceTypeList = ref<{ id: string; value: string; name: string }[]>([])
+const fetchSelect = () => {
+  // 设备分类
+  getDictByCode('eqptDeviceType').then((res) => {
+    deviceTypeList.value = res.data
+  })
+}
+fetchSelect()
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <approval-dialog ref="approvalDialogRef" @on-success="() => { $router.back() }" />
+    <detail-page :title="`设备规格型号管理-${textMap[dialogStatus]}`">
+      <template #btns>
+        <el-button v-if="dialogStatus !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-com>
+      <el-form
+        ref="ruleFormRef"
+        :model="ruleForm"
+        :rules="rules" label-position="right" label-width="110px" class="form"
+        :disabled="dialogStatus === 'detail'"
+        :class="$route.path.includes('detail') ? 'isDetail' : ''"
+      >
+        <el-row :gutter="24" class="marg">
+          <el-col :span="8">
+            <el-form-item label="型号规格编号">
+              <el-input v-model.trim="ruleForm.modelNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm.equipmentName" placeholder="设备名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="规格型号" prop="model">
+              <el-input v-model.trim="ruleForm.model" placeholder="规格型号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="8">
+            <el-form-item label="辅助字段" prop="helpInstruction">
+              <el-input v-model.trim="ruleForm.helpInstruction" placeholder="辅助字段" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="设备分类" prop="category">
+              <el-select v-model.trim="ruleForm.category" placeholder="设备名称" style="width: 100%;">
+                <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="检定周期" prop="checkCycle">
+              <!-- <el-input v-model.trim="ruleForm.checkCycle" placeholder="检定周期" /> -->
+              <el-input v-model.trim="ruleForm.checkCycle">
+                <template #append>
+                  月
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="使用说明书" prop="instructionsFile">
+              <!-- <el-input v-model.trim="ruleForm.helpInstruction" placeholder="辅助字段" /> -->
+              <show-photo :minio-file-name="ruleForm.instructionsFile" @delete="deleteFile" />
+              <input ref="fileRef" style="display: none;" type="file" accept="application/msword,application/pdf" @change="onFileChange">
+              <el-button v-if="dialogStatus !== 'detail'" type="primary" @click="upload">
+                上传
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="18">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.remark" type="textarea" :row="3" maxlength="100" show-word-limit />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block-com>
+    <detail-block-com>
+      <table-list ref="tableRef" :data="ruleForm.technicalTargetList" :status="dialogStatus" />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/tested/device/model/components/list.vue b/src/views/tested/device/model/components/list.vue
new file mode 100644
index 0000000..60a0a42
--- /dev/null
+++ b/src/views/tested/device/model/components/list.vue
@@ -0,0 +1,266 @@
+<!-- 设备规格型号管理列表 -->
+<script lang="ts" setup name="DeviceModelList">
+import { reactive, ref, watch } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { deleteModel, exportModelList, getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
+import { exportFile } from '@/utils/exportUtils'
+import { getDictByCode } from '@/api/system/dict'
+const { proxy } = getCurrentInstance() as any
+const listQuery = reactive({
+  category: '',
+  equipmentName: '',
+  helpInstruction: '',
+  model: '',
+  offset: 1,
+  limit: 20,
+})
+const columns = ref([
+  {
+    text: '型号规格编号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '型号规格',
+    value: 'model',
+    align: 'center',
+  },
+  {
+    text: '辅助字段',
+    value: 'helpInstruction',
+    align: 'center',
+  },
+  {
+    text: '设备分类',
+    value: 'categoryName',
+    align: 'center',
+  },
+  {
+    text: '检定周期',
+    value: 'checkCycle',
+    align: 'center',
+  },
+  {
+    text: '使用说明书',
+    value: 'instructionsFile',
+    align: 'center',
+  },
+  {
+    text: '备注',
+    value: 'remark',
+    align: 'center',
+  },
+])
+const list = ref([])
+const total = ref(0)
+const listLoading = ref(true)
+
+// 获取数据
+const fetchData = (isNowPage = true) => {
+  listLoading.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  getModelList(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  })
+}
+fetchData()
+// 查询数据
+const search = () => {
+  fetchData(false)
+}
+// 重置
+const reset = () => {
+  listQuery.category = ''
+  listQuery.equipmentName = ''
+  listQuery.helpInstruction = ''
+  listQuery.model = ''
+  listQuery.offset = 1
+  listQuery.limit = 20
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData()
+}
+const $router = useRouter()
+// 新建编辑操作
+const handler = (row: any, type: string) => {
+  $router.push({
+    path: `/dmodel/${type}`,
+    query: {
+      row: JSON.stringify(row),
+      id: row.id,
+    },
+  })
+}
+// 删除
+const delHandler = (row: any) => {
+  ElMessageBox.confirm(
+    '确认删除操作？注意删除不可逆。',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    // 判断设备是否被绑定
+    // 此设备型号与已存在设备绑定，请先删除设备
+    deleteModel({ id: row.id }).then((res) => {
+      ElMessage.success('操作成功')
+      search()
+    })
+  })
+}
+// 表格被选中的行
+const selectList = ref<any[]>([])
+// 表格多选
+const multiSelect = (row: any[]) => {
+  selectList.value = row
+}
+// 导出列表
+const exportList = () => {
+  if (list.value.length) {
+    const loading = ElLoading.service({
+      lock: true,
+      text: 'Loading',
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const data = {
+      ...listQuery,
+      offset: undefined,
+      limit: undefined,
+      ids: selectList.value.map(item => item.id),
+    }
+    exportModelList(data).then((res) => {
+      exportFile('设备规格型号')
+      loading.close()
+    })
+      .catch((_) => {
+        loading.close()
+      })
+  }
+  else {
+    ElMessage.warning('无可导出内容')
+  }
+}
+// 获取下拉列表相关
+// 设备名称
+const deviceNameList = ref<{ id: string; value: string; name: string }[]>([])
+// 设备分类
+const deviceTypeList = ref<{ id: string; value: string; name: string }[]>([])
+// 规格型号
+const modelList = ref<any[]>([])
+// 辅助字段
+const helpList = ref<any[]>([])
+const allList = ref<any[]>([])
+const fetchSelect = () => {
+  // 设备分类
+  getDictByCode('eqptDeviceType').then((res) => {
+    deviceTypeList.value = res.data
+  })
+  // 设备名称
+  getDeviceNameList().then((res) => {
+    deviceNameList.value = res.data
+  })
+  // 规格型号及辅助字段
+  getModelAllList({}).then((res) => {
+    allList.value = res.data
+    modelList.value = res.data
+    helpList.value = res.data.filter(item => item.helpInstruction)
+  })
+}
+fetchSelect()
+// 监听设备名称下拉框，修改规格型号和辅助字段
+watch(() => listQuery.equipmentName, (newVal) => {
+  if (newVal) {
+    listQuery.helpInstruction = ''
+    listQuery.model = ''
+    // 修改规格型号和辅助字段列表
+    const data = allList.value.filter(item => item.equipmentName === newVal)
+    modelList.value = data
+    helpList.value = data.filter(item => item.helpInstruction)
+  }
+})
+// 监听规格型号下拉框，修改辅助字段
+watch(() => listQuery.model, (newVal) => {
+  if (newVal) {
+    listQuery.helpInstruction = ''
+    // 修改规格型号和辅助字段列表
+    console.log(helpList.value, 'helpList.value')
+    helpList.value = helpList.value.filter(item => item.model === newVal)
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-select v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable>
+          <el-option v-for="item in deviceNameList" :key="item" :label="item" :value="item" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model.trim="listQuery.model" placeholder="规格型号" clearable>
+          <el-option v-for="item in modelList" :key="item.id" :label="item.model" :value="item.model" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model.trim="listQuery.helpInstruction" placeholder="辅助字段" clearable>
+          <el-option v-for="item in helpList" :key="item.id" :label="item.helpInstruction" :value="item.helpInstruction" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model.trim="listQuery.category" placeholder="设备分类" clearable>
+          <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-add" title="新增" @click="handler({}, 'create')" />
+        <icon-button icon="icon-export" title="导出" @click="exportList" />
+      </template>
+      <!-- 普通表格 -->
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
+      >
+        <template #columns>
+          <el-table-column label="操作" width="140" align="center">
+            <template #default="scope">
+              <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
+                查看
+              </el-button>
+              <el-button link type="primary" size="small" @click="handler(scope.row, 'update')">
+                编辑
+              </el-button>
+              <el-button link type="danger" size="small" @click="delHandler(scope.row)">
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
diff --git a/src/views/tested/device/model/components/technology.vue b/src/views/tested/device/model/components/technology.vue
new file mode 100644
index 0000000..d31fb2d
--- /dev/null
+++ b/src/views/tested/device/model/components/technology.vue
@@ -0,0 +1,141 @@
+<!-- 技术指标 -->
+<script lang="ts" setup name="DeviceTechnologyTable">
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { useCheckList } from '@/utils/useCheckList'
+const $props = defineProps({
+  data: {
+    type: Array,
+    default: () => ([]),
+  },
+})
+const $route = useRoute()
+// 表头显示标题
+const columns = ref([
+  {
+    text: '测量范围',
+    value: 'measureRange',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+  {
+    text: '不确定度或允许误差极限或准确度等级',
+    value: 'uncertainty',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+  {
+    text: '依据的技术文件',
+    value: 'basedDocuments',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+])
+const list = ref<any[]>([])
+// 检查数据列表
+function checkCertificateList() {
+  return useCheckList(list.value, columns.value, '技术指标')
+}
+// 将列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of list.value) {
+    item.editable = false
+  }
+}
+// 双击行显示输入框
+const dblclickRow = (row: any) => {
+  if ($route.path.includes('detail')) {
+    return
+  }
+  setAllRowReadable()
+  row.editable = true
+}
+const SelectionList = ref()
+// 表格选中
+const handleSelectionChange = (e: any[]) => {
+  SelectionList.value = e
+}
+// 添加行
+const addRow = () => {
+  if (checkCertificateList()) {
+    setAllRowReadable()
+    list.value.push({
+      measureRange: '',
+      uncertainty: '',
+      basedDocuments: '',
+      editable: true,
+    })
+  }
+}
+// 删除行
+const removeRow = () => {
+  list.value = list.value.filter((item) => {
+    return !SelectionList.value.includes(item)
+  })
+}
+watch(() => $props.data, (newVal) => {
+  if (newVal) {
+    list.value = newVal
+  }
+})
+const initDialog = () => {
+  list.value = $props.data
+}
+initDialog()
+defineExpose({
+  list,
+  checkCertificateList,
+})
+</script>
+
+<template>
+  <detail-block-switch title="技术指标">
+    <template v-if="!$route.path.includes('detail')" #btns>
+      <el-button type="primary" @click="addRow">
+        增加行
+      </el-button>
+      <el-button type="info" @click="removeRow">
+        删除行
+      </el-button>
+    </template>
+    <el-table
+      ref="multipleTableRef" :data="list" style="width: 100%;" border @selection-change="handleSelectionChange"
+      @row-dblclick="dblclickRow"
+    >
+      <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
+      <el-table-column align="center" label="序号" width="80" type="index" />
+      <el-table-column
+        v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text"
+        align="center"
+      >
+        <template #header>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
+        </template>
+        <template #default="scope">
+          <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+          <el-input
+            v-if="scope.row.editable && !item.isSelect" v-model="scope.row[item.value]" :autofocus="true"
+            :placeholder="`${item.text}`" class="input"
+          />
+          <!-- <el-date-picker v-if="scope.row.editable && item.isDate" v-model="scope.row[item.value]" type="date"
+              format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`" /> -->
+          <!-- <el-select
+            v-if="scope.row.editable && item.isSelect" v-model="scope.row[item.value]"
+            :placeholder="`${item.text}`"
+          >
+            <el-option v-for="item in platformListBak" :key="item.id" :label="item.name" :value="item.name" />
+          </el-select> -->
+        </template>
+      </el-table-column>
+    </el-table>
+  </detail-block-switch>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>
diff --git a/src/views/tested/device/model/index.vue b/src/views/tested/device/model/index.vue
new file mode 100644
index 0000000..e0524d9
--- /dev/null
+++ b/src/views/tested/device/model/index.vue
@@ -0,0 +1,8 @@
+<!-- 设备规格型号管理 -->
+<script lang="ts" setup name="DeviceModelIndex">
+import list from './components/list.vue'
+</script>
+
+<template>
+  <list />
+</template>
diff --git a/src/views/tested/device/remind/index.vue b/src/views/tested/device/remind/index.vue
index e29c9e7..63937cb 100644
--- a/src/views/tested/device/remind/index.vue
+++ b/src/views/tested/device/remind/index.vue
@@ -92,7 +92,7 @@
 }
 const range = ref()
 watch(() => range.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.certificateValidStart = `${newVal[0]} 00:00:00`
     listQuery.certificateValidEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/subpackage/certificate/index.vue b/src/views/tested/subpackage/certificate/index.vue
index 0620ef5..cea2db2 100644
--- a/src/views/tested/subpackage/certificate/index.vue
+++ b/src/views/tested/subpackage/certificate/index.vue
@@ -19,7 +19,7 @@
 })
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/subpackage/directory/components/list.vue b/src/views/tested/subpackage/directory/components/list.vue
index 17aff60..0c60cee 100644
--- a/src/views/tested/subpackage/directory/components/list.vue
+++ b/src/views/tested/subpackage/directory/components/list.vue
@@ -98,7 +98,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }

diff --git a/.env.development b/.env.development
index debe1a8..f2fee42 100644
--- a/.env.development
+++ b/.env.development
@@ -4,7 +4,7 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
-VITE_APP_API_BASEURL = http://127.0.0.1:5909
+VITE_APP_API_BASEURL = http://192.168.8.101:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..313fcf7 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://192.168.8.101:5909"
 }
diff --git a/src/api/eqpt/device/model.ts b/src/api/eqpt/device/model.ts
new file mode 100644
index 0000000..a8fa0f1
--- /dev/null
+++ b/src/api/eqpt/device/model.ts
@@ -0,0 +1,61 @@
+/**
+ * 设备型号规格管理相关
+ */
+import request from '@/api/index'
+
+// 列表
+export function getModelList(params: any) {
+  return request({
+    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}`,
+    method: 'post',
+    data: params,
+  })
+}
+// 列表-不分页
+export function getModelAllList(params: any) {
+  return request({
+    url: '/equipment/model/list',
+    method: 'post',
+    data: params,
+  })
+}
+// 设备名称列表/equipment/model/listEquipmentName
+export function getDeviceNameList(params: any) {
+  return request({
+    url: '/equipment/model/listEquipmentName',
+    method: 'get',
+    params,
+  })
+}
+// 导出
+export function exportModelList(data: any) {
+  return request({
+    url: '/equipment/model/export',
+    method: 'post',
+    data,
+  })
+}
+// 新建或编辑
+export function handlerFunApi(type: string, data: any) {
+  if (type === 'create') {
+    return request({
+      url: '/equipment/model/add',
+      method: 'post',
+      data,
+    })
+  }
+  else if (type === 'update') {
+    return request({
+      url: '/equipment/model/update',
+      method: 'post',
+      data,
+    })
+  }
+}
+// 删除
+export function deleteModel(data: any) {
+  return request({
+    url: `/equipment/model/delete?id=${data.id}`,
+    method: 'post',
+  })
+}
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 14ec12e..64e6f48 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -55,11 +55,12 @@
   // listQuery.value.offset = 1
   // }
   fetchApproval({ processId: listQuery.value.processId }).then((response) => {
+    console.log(response.data, 'response')
     response.data.forEach((item: Array<IList>, index: number) => {
       item.forEach((i: any) => {
         list.value.push({
           cindex: index,
-          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[i.cindex].nodeNumber + 1,
+          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[index - 1].nodeNumber + 1,
           assigneeName: i.assigneeName, // 姓名
           approvalStatus: i.approvalStatus, // 审批类型
           finishTime: i.finishTime ? i.finishTime : '-', // 完成时间
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index f08078d..aefbd8b 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -90,8 +90,16 @@
     type: String,
     default: 'default',
   }, // 表格大小，默认，small,mini等，与el-table条件相同
+  // 排序
+  sort: {
+    type: Object,
+    default() {
+      return {
+      }
+    },
+  },
 })
-const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'multiSelect'])
+const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'multiSelect', 'sortChange'])
 // -------定义数据--------------
 interface columnsCheckInfo {
   text: string
@@ -139,6 +147,10 @@
 function selectionChange(selection: []) {
   emit('selectionChange', selection)
 }
+// 点击排序
+function sortClick(column: any, prop: any, order: any) {
+  emit('sortChange', { column, prop, order })
+}
 // 点击行
 function rowClick(row: object, column?: any, event?: any) {
   emit('rowClick', row)
@@ -196,11 +208,13 @@
       border
       stripe
       :size="size"
+      :default-sort="props.sort"
       :show-header="showHeader"
       style="width: 100%;"
       @selection-change="handleSelectionChange"
       @select="selectClick"
       @row-click="rowClick"
+      @sort-change="sortClick"
     >
       <slot name="preColumns" />
 
@@ -210,7 +224,7 @@
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
+      <el-table-column v-for="column of columns" :key="column.value" :sortable="column.sortable" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
           <span v-else :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ column.filter(scope.row) }}</span>
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index 5cf6445..2cd73de 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -320,7 +320,7 @@
   {
     path: '/meteringdevice',
     component: Layout,
-    redirect: '/devicelist',
+    redirect: '/modellist',
     name: 'MeteringDevice',
     meta: {
       title: '设备台账',
@@ -329,6 +329,43 @@
     },
     children: [
       {
+        path: '/modellist',
+        component: Layout,
+        redirect: '/dmodel',
+        name: 'DeviceModel',
+        meta: {
+          title: '设备规格型号管理',
+          icon: 'ep:key',
+          auth: '/tested/device/model',
+        },
+        children: [
+          {
+            path: '/dmodel',
+            name: 'DeviceModelPage',
+            component: () => import('@/views/tested/device/model/index.vue'),
+            meta: {
+              title: '设备规格型号管理',
+              auth: '/tested/device/model',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/modellist',
+            },
+          },
+          {
+            path: '/dmodel/:type',
+            name: 'ModelEdit',
+            component: () => import('@/views/tested/device/model/components/edit.vue'),
+            meta: {
+              title: '设备规格型号管理',
+              auth: '/tested/device/model',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/modellist',
+            },
+          },
+        ],
+      },
+      {
         path: '/devicelist',
         component: Layout,
         redirect: '/dinfo',
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 6c9383f..879a207 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -158,7 +158,11 @@
 }
 // 批量删除
 const batchDeleteLabel = () => {
-  if (selectList.value.length) {
+  if (selectList.value.filter(item => item.usageStatusName === '已使用').length) {
+    ElMessage.warning('请选择未使用的标签')
+    return
+  }
+  if (selectList.value.filter(item => item.usageStatusName !== '已使用').length) {
     ElMessageBox.confirm(
       '确认删除所选数据吗？',
       '提示',
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index 60d55d6..ba91cbf 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -25,7 +25,7 @@
   offset: 1,
 }) // 查询参数
 watch(() => noticeTime.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     searchQuery.noticeStartTime = `${newVal[0]} 00:00:00`
     searchQuery.noticeEndTime = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/system/signature/autograph.vue b/src/views/system/signature/autograph.vue
index e5a32c8..9c1d0ca 100644
--- a/src/views/system/signature/autograph.vue
+++ b/src/views/system/signature/autograph.vue
@@ -23,7 +23,7 @@
   ids: [],
 }) // 查询参数
 watch(() => createTime.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     searchQuery.createStartTime = `${newVal[0]} 00:00:00`
     searchQuery.createEndTime = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 5f57089..b557683 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -16,7 +16,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index 8f31905..e140eaa 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.applicantTimeStart = `${newVal[0]} 00:00:00`
     listQuery.applicantTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/opinion/index.vue b/src/views/tested/MeasurementBusiness/opinion/index.vue
index 6c7e13c..c6683c0 100644
--- a/src/views/tested/MeasurementBusiness/opinion/index.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue
index b15f27b..e204a69 100644
--- a/src/views/tested/MeasurementBusiness/review/index.vue
+++ b/src/views/tested/MeasurementBusiness/review/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
@@ -76,21 +76,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
-  // getListPage(listQuery).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   listLoading.value = false
-  // })
-  list.value = [{
-    formNo: '12345',
-    formName: '评审表1',
-    labCode: '海口实验室',
-    groupCode: '组别1',
-    signStatusName: '同意',
-    createUserName: '张三',
-    createTime: '2023-09-05',
-  }]
-  listLoading.value = false
+  getListPage(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  })
 }
 fetchData()
 // 查询数据
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 0e2fd1c..217365a 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -14,7 +14,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.sendTimeStart = `${newVal[0]} 00:00:00`
     listQuery.sendTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index e117705..e2d0ea2 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -12,6 +12,7 @@
     required: true,
   },
 })
+const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
 const userStore = useUserStore()
 const listQuery = reactive({
@@ -20,8 +21,8 @@
   createTimeEnd: '',
   createTimeStart: '',
   notifyType: $props.notifyType, // 通知类型(负责人/部门，字典值)
-  notifyDept: userStore.deptId,
-  notifyUser: userStore.id,
+  notifyDept: $route.path.includes('curatorpage') ? '' : userStore.deptId,
+  notifyUser: $route.path.includes('curatorpage') ? userStore.id : '',
   offset: 1,
   limit: 20,
 })
@@ -30,7 +31,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/dept/index.vue b/src/views/tested/MeasurementPlan/dept/index.vue
index aafe5e1..a25835f 100644
--- a/src/views/tested/MeasurementPlan/dept/index.vue
+++ b/src/views/tested/MeasurementPlan/dept/index.vue
@@ -5,5 +5,5 @@
 
 <template>
   <!-- notifyType 通知类型(负责人/部门，字典值) -->
-  <page notify-type="1" />
+  <page notify-type="2" />
 </template>
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 3cdecdc..429acf5 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -53,7 +53,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index f599508..2c53a36 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -24,7 +24,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index 6af790b..f17af59 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -39,7 +39,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 6fa4355..d0e9936 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -27,7 +27,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.value.certificateValidStart = `${newVal[0]} 00:00:00`
     listQuery.value.certificateValidEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/task/index.vue b/src/views/tested/MeasurementPlan/task/index.vue
index 4ab62d9..aa759a8 100644
--- a/src/views/tested/MeasurementPlan/task/index.vue
+++ b/src/views/tested/MeasurementPlan/task/index.vue
@@ -17,7 +17,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createStartTime = `${newVal[0]} 00:00:00`
     listQuery.createEndTime = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index c7d63b8..67b4dac 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -99,7 +99,7 @@
 }
 const range = ref()
 watch(() => range.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.certificateValidStart = `${newVal[0]} 00:00:00`
     listQuery.certificateValidEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index 5d8d328..af479a6 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -41,7 +41,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.value.certificateValidStart = `${newVal[0]} 00:00:00`
     listQuery.value.certificateValidEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/device/group/components/tableList.vue b/src/views/tested/device/group/components/tableList.vue
index d1f60ce..f1b817a 100644
--- a/src/views/tested/device/group/components/tableList.vue
+++ b/src/views/tested/device/group/components/tableList.vue
@@ -177,7 +177,16 @@
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
           <el-input
-            v-if="scope.row.editable && !item.isSelect" v-model="scope.row[item.value]" :autofocus="true"
+            v-if="scope.row.editable && !item.isSelect && item.text === '设备名称'" v-model="scope.row[item.value]" :autofocus="true"
+            :placeholder="`${item.text}`" class="input"
+            @focus="select(item.text, scope.$index)"
+          >
+            <template #append>
+              <span @click="select(item.text, scope.$index)">选择</span>
+            </template>
+          </el-input>
+          <el-input
+            v-if="scope.row.editable && !item.isSelect && item.text !== '设备名称'" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
             @focus="select(item.text, scope.$index)"
           />
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 7443364..db05d4d 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -50,6 +50,7 @@
     text: '统一编号',
     value: 'equipmentNo',
     align: 'center',
+    sortable: 'custom',
   },
   {
     text: '设备名称',
@@ -60,11 +61,13 @@
     text: '型号规格',
     value: 'model',
     align: 'center',
+    sortable: 'custom',
   },
   {
     text: '出厂编号',
     value: 'manufactureNo',
     align: 'center',
+    sortable: 'custom',
   },
   {
     text: '使用岗位',
@@ -85,6 +88,7 @@
     text: '证书有效期',
     value: 'certificateValid',
     align: 'center',
+    sortable: 'custom',
   },
 ])
 const allColums = ref([
@@ -92,6 +96,7 @@
     text: '使用状态',
     value: 'usageStatusName',
     align: 'center',
+    sortable: 'custom',
   },
   {
     text: '备注',
@@ -121,6 +126,21 @@
     align: 'center',
   },
 ])
+// 排序条件发生变化
+const sortChange = ({ column }: any) => {
+  if (column.order === 'ascending') {
+    console.log(column.prop)
+    console.log('升序')
+  }
+  else if (column.order === 'descending') {
+    console.log(column.prop)
+    console.log('倒叙')
+  }
+}
+// 聚合表格实例
+const togetherTableRef = ref()
+// 展开表格实例
+const expandTableRef = ref()
 const list = ref([])
 const total = ref(0)
 const listLoading = ref(true)
@@ -157,7 +177,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.certificateValidStart = `${newVal[0]} 00:00:00`
     listQuery.certificateValidEnd = `${newVal[1]} 23:59:59`
   }
@@ -209,12 +229,29 @@
   expandLoading.value = true
   getInfoList(params).then((res) => {
     expandList.value = res.data
+    // 获取聚合表格选中，判断展开表格是否需要全选
+    const selectList = togetherTableRef.value.getSelectionRows()
+    if (selectList.length) {
+      const select = selectList.filter((item: any) => item.equipmentName === params.equipmentName)
+      if (select.length) {
+        nextTick(() => {
+          expandTableRef.value.toggleAllSelection()
+        })
+      }
+    }
     expandLoading.value = false
   })
 }
 const getRowKeys = (row: any) => { // 获取当前行id
   return row.equipmentName // 这里看这一行中需要根据哪个属性值是id
 }
+// 监听聚合表格多选
+// watch(() => togetherTableRef.value?.getSelectionRows(), (newVal, oldVal) => {
+//   console.log(newVal, 'newVal')
+// }, {
+//   deep: true,
+// })
+
 // 表格被选中的行
 const selectList = ref<any[]>([])
 // 表格多选
@@ -240,6 +277,48 @@
 {
   deep: true,
 })
+const togetherSelect = (selection: any, row: any) => {
+  if (selection.includes(row)) {
+    // 勾选
+    console.log('勾选')
+    if (expands.value && expands.value[0] === row.equipmentName) {
+      expandTableRef.value.toggleAllSelection()
+    }
+  }
+  else {
+    // 取消勾选
+    console.log('取消勾选')
+    if (expands.value && expands.value[0] === row.equipmentName) {
+      expandTableRef.value.toggleAllSelection()
+    }
+  }
+}
+const expandSelect = (selection: any, row: any) => {
+  if (selection.length === expandList.value.length) {
+    // 全选
+    console.log('全选')
+    // 获取聚合
+    console.log(expands.value[0])
+    const data = togetherList.value.filter((item: any) => item.equipmentName === expands.value[0])
+    console.log(data)
+    if (data.length) {
+      nextTick(() => {
+        togetherTableRef.value.toggleRowSelection(data[0], true)
+      })
+    }
+  }
+  else {
+    // 全不选
+    console.log('全不选')
+    // 获取聚合
+    const data = togetherList.value.filter((item: any) => item.equipmentName === expands.value[0])
+    if (data.length) {
+      nextTick(() => {
+        togetherTableRef.value.toggleRowSelection(data[0], false)
+      })
+    }
+  }
+}
 const $router = useRouter()
 // 新建编辑操作
 const handler = (row: IlistObjType, type: string) => {
@@ -497,7 +576,7 @@
       <template v-if="$props.statusName === '全部'" #btns-right>
         <icon-button icon="icon-change" title="切换列表状态" @click="changeTable" />
         <icon-button icon="icon-sweep" title="扫描" />
-        <icon-button icon="icon-add" title="新增" @click="handler({}, 'create')" />
+        <icon-button icon="icon-add" title="新增" @click="handler({} as any, 'create')" />
         <icon-button icon="icon-import" title="批量导入" @click="importList" />
         <icon-button icon="icon-template" title="模板下载" @click="useTemplateDownload('设备信息管理模块')" />
         <icon-button icon="icon-export" title="导出" @click="exportList" />
@@ -508,30 +587,29 @@
         <normal-table
           v-show=" tableFlage "
           ref="normalTableRef" :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="listLoading" :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
+          :list-loading="listLoading"
+          :is-showmulti-select="true" :is-multi="true" @sort-change="sortChange" @change="changePage" @multi-select="multiSelect"
         >
           <template #columns>
             <!-- 全部状态 -->
-            <el-table-column
-              v-for=" column of allColums " :key=" column.value "
-              :label=" column.text " :prop=" column.value " :align=" column.align "
-              :show-overflow-tooltip="true"
-            >
-              <template v-if="$props.statusName === '全部' " #default=" scope ">
-                <span>{{ scope.row[column.value] }}</span>
-              </template>
-            </el-table-column>
+            <template v-if="$props.statusName === '全部' ">
+              <el-table-column
+                v-for=" column of allColums " :key=" column.value "
+                :label=" column.text " :prop=" column.value " :align=" column.align "
+                :show-overflow-tooltip="true"
+                :sortable="column.sortable"
+              />
+            </template>
             <!-- 其他审批状态 -->
-            <el-table-column
-              v-for=" column of otherColums " :key="column.value" :label=" column.text "
-              :prop=" column.value " :align=" column.align "
-              :show-overflow-tooltip="true"
-            >
-              <template v-if="$props.statusName !== '全部' " #default=" scope ">
-                <span>
-                  {{ scope.row[column.value] }}</span>
-              </template>
-            </el-table-column>
+            <template v-if="$props.statusName !== '全部' ">
+              <el-table-column
+                v-for=" column of otherColums " :key="column.value"
+                :label=" column.text "
+                :prop=" column.value " :align=" column.align "
+                :show-overflow-tooltip="true"
+              />
+            </template>
+
             <el-table-column label="操作" width="160" align="center">
               <template #default=" scope ">
                 <el-button link type="primary" size="small" @click="detail(scope.row)">
@@ -580,6 +658,7 @@
       </div>
       <div v-if=" !tableFlage ">
         <!-- 展开行表格 -->
+        <!-- 头部 -->
         <normal-table
           v-show=" !tableFlage " class="nortable-header" :data=" [] " :total=" 0 " :columns=" columns " :options="
             {
@@ -587,12 +666,23 @@
               border: true, // 是否需要上方边框
             }
           " :pagination=" false " :is-showmulti-select=" true " :query="{}"
-        />
-        <el-table
-          v-show=" !tableFlage " v-loading=" togetherLoading " :data=" togetherList " border style="width: 100%;"
-          :row-key=" getRowKeys " :expand-row-keys=" expands " :show-header=" false " @expand-change=" expandChange "
         >
+          <template #columns>
+            <el-table-column label="操作" width="160" align="center" />
+          </template>
+        </normal-table>
+        <!-- 身体 -->
+        <el-table
+          v-show=" !tableFlage "
+          ref="togetherTableRef" v-loading=" togetherLoading " :data=" togetherList " border style="width: 100%;"
+          :row-key=" getRowKeys " :expand-row-keys=" expands " :show-header=" false " @expand-change=" expandChange "
+          @select="togetherSelect"
+        >
+          <el-table-column type="selection" width="38" />
           <el-table-column type="expand">
+            <template #default="props">
+              <!-- 展开表格身体 -->
+              <!-- <normal-table
             <template #default>
               <normal-table
                 :data=" expandList " :total=" 0 " :columns=" columns " :list-loading=" expandLoading " :options="
@@ -601,7 +691,58 @@
                     border: true, // 是否需要上方边框
                   }
                 " :pagination=" false " :is-showmulti-select=" true " :show-header=" false " :query="{}"
-              />
+              /> -->
+              <el-table
+                ref="expandTableRef"
+                v-loading=" expandLoading " :data=" expandList " border style="width: 100%;"
+                :show-header=" false " @select="expandSelect"
+              >
+                <el-table-column type="selection" width="38" />
+                <el-table-column v-for="item in columns" :key="item.value" :labe="item.text" :prop="item.value" align="center" />
+                <el-table-column label="操作" width="160" align="center">
+                  <template #default=" scope ">
+                    <el-button link type="primary" size="small" @click="detail(scope.row)">
+                      查看
+                    </el-button>
+                    <el-button
+                      v-if="proxy.buttonPerm.edit.if({ approvalStatusName: $props.statusName }, permUrl.edit)" link type="primary" size="small"
+                      @click="handler(scope.row, 'update')"
+                    >
+                      编辑
+                    </el-button>
+                    <el-button
+                      v-if="proxy.buttonPerm.agree.if({ approvalStatusName: $props.statusName }, permUrl.agree)" link type="primary" size="small"
+                      @click="approveHandler(scope.row, 'agree')"
+                    >
+                      同意
+                    </el-button>
+                    <el-button
+                      v-if="proxy.buttonPerm.reject.if({ approvalStatusName: $props.statusName }, permUrl.reject)" link type="primary" size="small"
+                      @click="approveHandler(scope.row, 'refuse')"
+                    >
+                      拒绝
+                    </el-button>
+                    <el-button
+                      v-if="proxy.buttonPerm.submit.if({ approvalStatusName: $props.statusName }, permUrl.submit)" link type="primary" size="small"
+                      @click="submit(scope.row)"
+                    >
+                      提交
+                    </el-button>
+                    <el-button
+                      v-if="proxy.buttonPerm.cancel.if({ approvalStatusName: $props.statusName }, permUrl.cancel)" link type="primary" size="small"
+                      @click="canHandler(scope.row)"
+                    >
+                      取消
+                    </el-button>
+                    <el-button
+                      v-if="proxy.buttonPerm.delete.if({ approvalStatusName: $props.statusName }, permUrl.del)" link type="danger" size="small"
+                      @click="delHandler(scope.row)"
+                    >
+                      删除
+                    </el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
             </template>
           </el-table-column>
           <el-table-column label="设备名称" prop="equipmentName" align="center" />
diff --git a/src/views/tested/device/model/components/edit.vue b/src/views/tested/device/model/components/edit.vue
new file mode 100644
index 0000000..0783b12
--- /dev/null
+++ b/src/views/tested/device/model/components/edit.vue
@@ -0,0 +1,251 @@
+<!-- 设备规格型号-编辑 -->
+<script lang="ts" setup name="DeviceModelEdit">
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import tableList from './technology.vue'
+import { getDictByCode } from '@/api/system/dict'
+import { handlerFunApi } from '@/api/eqpt/device/model'
+import useUserStore from '@/store/modules/user'
+import { getUserDept } from '@/api/system/user'
+import { uploadApi } from '@/api/system/notice'
+import showPhoto from '@/views/tested/device/info/components/showPhoto.vue'
+const $route = useRoute()
+const $router = useRouter()
+const userStore = useUserStore()
+const ruleFormRef = ref<FormInstance>() // from组件
+const title = ref('')
+// 显示标题
+const textMap: { [key: string]: string } = {
+  update: '编辑',
+  create: '新增',
+  detail: '详情',
+}
+// 对话框类型：create,update
+const dialogStatus = ref('create')
+const ruleForm = ref({
+  category: '', // 设备分类
+  categoryName: '', // 设备分类名称
+  checkCycle: '', // 检定周期
+  createDeptId: '',
+  createTime: '',
+  createUserId: '',
+  equipmentName: '', // 设备名称
+  helpInstruction: '', // 辅助字段
+  id: '',
+  instructionsFile: '', // 附件
+  model: '', // 规格型号
+  modelNo: '', // 规格型号编号
+  remark: '', // 备注
+  technicalTargetList: [], // 技术指标
+  updateTime: '',
+}) // 表单
+const rules = ref<FormRules>({
+  equipmentName: [{ required: true, message: '设备名称名称必填', trigger: 'blur' }],
+  category: [{ required: true, message: '设备分类必选', trigger: 'blur' }],
+  model: [{ required: true, message: '规格型号必填', trigger: 'blur' }],
+  checkCycle: [{ required: true, message: '检定周期必填', trigger: 'blur' }],
+}) // 表单验证规则
+// 弹窗初始化
+const initDialog = () => {
+  dialogStatus.value = $route.params.type as string
+  ruleFormRef.value?.resetFields()
+  if ($route.params.type === 'create') {
+    ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+    ruleForm.value.createUserId = userStore.id
+    // 获取当前用户所在单位
+    getUserDept().then((res) => {
+      ruleForm.value.createDeptId = res.data.id
+    })
+  }
+  else {
+    console.log($route.query.row, 'data')
+    const data = JSON.parse($route.query.row as string)
+    // detailGroup({ groupId: data.id }).then((res) => {
+    ruleForm.value = data
+    // })
+  }
+}
+onMounted(() => {
+  initDialog()
+})
+// 关闭弹窗
+const close = () => {
+  $router.back()
+}
+const tableRef = ref()
+// 保存
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid && tableRef.value.checkCertificateList()) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        ruleForm.value.equipmentList = tableRef.value.list
+        if ($route.params.type === 'create') {
+          handlerFunApi('create', ruleForm.value).then((res) => {
+            ElMessage.success('添加成功')
+            close()
+          })
+        }
+        else {
+          handlerFunApi('update', ruleForm.value).then((res) => {
+            ElMessage.success('修改成功')
+            close()
+          })
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    fd.append('multipartFile', event.target.files[0])
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        ruleForm.value.instructionsFile = ruleForm.value.instructionsFile ? `${ruleForm.value.instructionsFile},${res.data[0]}` : res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
+        loading.close()
+      }
+      else {
+        // ElMessage.error(res.message)
+        loading.close()
+      }
+    })
+  }
+}
+// 上传
+const upload = () => {
+  fileRef.value.click()
+}
+// 删除上传的文件
+const deleteFile = (fileName: string) => {
+  const data = ruleForm.value.instructionsFile.split(',')
+  const filterData = data.filter(item => item !== fileName)
+  ruleForm.value.instructionsFile = filterData.length ? filterData.join(',') : ''
+}
+// 设备分类
+const deviceTypeList = ref<{ id: string; value: string; name: string }[]>([])
+const fetchSelect = () => {
+  // 设备分类
+  getDictByCode('eqptDeviceType').then((res) => {
+    deviceTypeList.value = res.data
+  })
+}
+fetchSelect()
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <approval-dialog ref="approvalDialogRef" @on-success="() => { $router.back() }" />
+    <detail-page :title="`设备规格型号管理-${textMap[dialogStatus]}`">
+      <template #btns>
+        <el-button v-if="dialogStatus !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-com>
+      <el-form
+        ref="ruleFormRef"
+        :model="ruleForm"
+        :rules="rules" label-position="right" label-width="110px" class="form"
+        :disabled="dialogStatus === 'detail'"
+        :class="$route.path.includes('detail') ? 'isDetail' : ''"
+      >
+        <el-row :gutter="24" class="marg">
+          <el-col :span="8">
+            <el-form-item label="型号规格编号">
+              <el-input v-model.trim="ruleForm.modelNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm.equipmentName" placeholder="设备名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="规格型号" prop="model">
+              <el-input v-model.trim="ruleForm.model" placeholder="规格型号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="8">
+            <el-form-item label="辅助字段" prop="helpInstruction">
+              <el-input v-model.trim="ruleForm.helpInstruction" placeholder="辅助字段" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="设备分类" prop="category">
+              <el-select v-model.trim="ruleForm.category" placeholder="设备名称" style="width: 100%;">
+                <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="检定周期" prop="checkCycle">
+              <!-- <el-input v-model.trim="ruleForm.checkCycle" placeholder="检定周期" /> -->
+              <el-input v-model.trim="ruleForm.checkCycle">
+                <template #append>
+                  月
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="使用说明书" prop="instructionsFile">
+              <!-- <el-input v-model.trim="ruleForm.helpInstruction" placeholder="辅助字段" /> -->
+              <show-photo :minio-file-name="ruleForm.instructionsFile" @delete="deleteFile" />
+              <input ref="fileRef" style="display: none;" type="file" accept="application/msword,application/pdf" @change="onFileChange">
+              <el-button v-if="dialogStatus !== 'detail'" type="primary" @click="upload">
+                上传
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="18">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.remark" type="textarea" :row="3" maxlength="100" show-word-limit />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block-com>
+    <detail-block-com>
+      <table-list ref="tableRef" :data="ruleForm.technicalTargetList" :status="dialogStatus" />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/tested/device/model/components/list.vue b/src/views/tested/device/model/components/list.vue
new file mode 100644
index 0000000..60a0a42
--- /dev/null
+++ b/src/views/tested/device/model/components/list.vue
@@ -0,0 +1,266 @@
+<!-- 设备规格型号管理列表 -->
+<script lang="ts" setup name="DeviceModelList">
+import { reactive, ref, watch } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { deleteModel, exportModelList, getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
+import { exportFile } from '@/utils/exportUtils'
+import { getDictByCode } from '@/api/system/dict'
+const { proxy } = getCurrentInstance() as any
+const listQuery = reactive({
+  category: '',
+  equipmentName: '',
+  helpInstruction: '',
+  model: '',
+  offset: 1,
+  limit: 20,
+})
+const columns = ref([
+  {
+    text: '型号规格编号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '型号规格',
+    value: 'model',
+    align: 'center',
+  },
+  {
+    text: '辅助字段',
+    value: 'helpInstruction',
+    align: 'center',
+  },
+  {
+    text: '设备分类',
+    value: 'categoryName',
+    align: 'center',
+  },
+  {
+    text: '检定周期',
+    value: 'checkCycle',
+    align: 'center',
+  },
+  {
+    text: '使用说明书',
+    value: 'instructionsFile',
+    align: 'center',
+  },
+  {
+    text: '备注',
+    value: 'remark',
+    align: 'center',
+  },
+])
+const list = ref([])
+const total = ref(0)
+const listLoading = ref(true)
+
+// 获取数据
+const fetchData = (isNowPage = true) => {
+  listLoading.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  getModelList(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  })
+}
+fetchData()
+// 查询数据
+const search = () => {
+  fetchData(false)
+}
+// 重置
+const reset = () => {
+  listQuery.category = ''
+  listQuery.equipmentName = ''
+  listQuery.helpInstruction = ''
+  listQuery.model = ''
+  listQuery.offset = 1
+  listQuery.limit = 20
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData()
+}
+const $router = useRouter()
+// 新建编辑操作
+const handler = (row: any, type: string) => {
+  $router.push({
+    path: `/dmodel/${type}`,
+    query: {
+      row: JSON.stringify(row),
+      id: row.id,
+    },
+  })
+}
+// 删除
+const delHandler = (row: any) => {
+  ElMessageBox.confirm(
+    '确认删除操作？注意删除不可逆。',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    // 判断设备是否被绑定
+    // 此设备型号与已存在设备绑定，请先删除设备
+    deleteModel({ id: row.id }).then((res) => {
+      ElMessage.success('操作成功')
+      search()
+    })
+  })
+}
+// 表格被选中的行
+const selectList = ref<any[]>([])
+// 表格多选
+const multiSelect = (row: any[]) => {
+  selectList.value = row
+}
+// 导出列表
+const exportList = () => {
+  if (list.value.length) {
+    const loading = ElLoading.service({
+      lock: true,
+      text: 'Loading',
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const data = {
+      ...listQuery,
+      offset: undefined,
+      limit: undefined,
+      ids: selectList.value.map(item => item.id),
+    }
+    exportModelList(data).then((res) => {
+      exportFile('设备规格型号')
+      loading.close()
+    })
+      .catch((_) => {
+        loading.close()
+      })
+  }
+  else {
+    ElMessage.warning('无可导出内容')
+  }
+}
+// 获取下拉列表相关
+// 设备名称
+const deviceNameList = ref<{ id: string; value: string; name: string }[]>([])
+// 设备分类
+const deviceTypeList = ref<{ id: string; value: string; name: string }[]>([])
+// 规格型号
+const modelList = ref<any[]>([])
+// 辅助字段
+const helpList = ref<any[]>([])
+const allList = ref<any[]>([])
+const fetchSelect = () => {
+  // 设备分类
+  getDictByCode('eqptDeviceType').then((res) => {
+    deviceTypeList.value = res.data
+  })
+  // 设备名称
+  getDeviceNameList().then((res) => {
+    deviceNameList.value = res.data
+  })
+  // 规格型号及辅助字段
+  getModelAllList({}).then((res) => {
+    allList.value = res.data
+    modelList.value = res.data
+    helpList.value = res.data.filter(item => item.helpInstruction)
+  })
+}
+fetchSelect()
+// 监听设备名称下拉框，修改规格型号和辅助字段
+watch(() => listQuery.equipmentName, (newVal) => {
+  if (newVal) {
+    listQuery.helpInstruction = ''
+    listQuery.model = ''
+    // 修改规格型号和辅助字段列表
+    const data = allList.value.filter(item => item.equipmentName === newVal)
+    modelList.value = data
+    helpList.value = data.filter(item => item.helpInstruction)
+  }
+})
+// 监听规格型号下拉框，修改辅助字段
+watch(() => listQuery.model, (newVal) => {
+  if (newVal) {
+    listQuery.helpInstruction = ''
+    // 修改规格型号和辅助字段列表
+    console.log(helpList.value, 'helpList.value')
+    helpList.value = helpList.value.filter(item => item.model === newVal)
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-select v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable>
+          <el-option v-for="item in deviceNameList" :key="item" :label="item" :value="item" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model.trim="listQuery.model" placeholder="规格型号" clearable>
+          <el-option v-for="item in modelList" :key="item.id" :label="item.model" :value="item.model" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model.trim="listQuery.helpInstruction" placeholder="辅助字段" clearable>
+          <el-option v-for="item in helpList" :key="item.id" :label="item.helpInstruction" :value="item.helpInstruction" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model.trim="listQuery.category" placeholder="设备分类" clearable>
+          <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-add" title="新增" @click="handler({}, 'create')" />
+        <icon-button icon="icon-export" title="导出" @click="exportList" />
+      </template>
+      <!-- 普通表格 -->
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
+      >
+        <template #columns>
+          <el-table-column label="操作" width="140" align="center">
+            <template #default="scope">
+              <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
+                查看
+              </el-button>
+              <el-button link type="primary" size="small" @click="handler(scope.row, 'update')">
+                编辑
+              </el-button>
+              <el-button link type="danger" size="small" @click="delHandler(scope.row)">
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
diff --git a/src/views/tested/device/model/components/technology.vue b/src/views/tested/device/model/components/technology.vue
new file mode 100644
index 0000000..d31fb2d
--- /dev/null
+++ b/src/views/tested/device/model/components/technology.vue
@@ -0,0 +1,141 @@
+<!-- 技术指标 -->
+<script lang="ts" setup name="DeviceTechnologyTable">
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { useCheckList } from '@/utils/useCheckList'
+const $props = defineProps({
+  data: {
+    type: Array,
+    default: () => ([]),
+  },
+})
+const $route = useRoute()
+// 表头显示标题
+const columns = ref([
+  {
+    text: '测量范围',
+    value: 'measureRange',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+  {
+    text: '不确定度或允许误差极限或准确度等级',
+    value: 'uncertainty',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+  {
+    text: '依据的技术文件',
+    value: 'basedDocuments',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+])
+const list = ref<any[]>([])
+// 检查数据列表
+function checkCertificateList() {
+  return useCheckList(list.value, columns.value, '技术指标')
+}
+// 将列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of list.value) {
+    item.editable = false
+  }
+}
+// 双击行显示输入框
+const dblclickRow = (row: any) => {
+  if ($route.path.includes('detail')) {
+    return
+  }
+  setAllRowReadable()
+  row.editable = true
+}
+const SelectionList = ref()
+// 表格选中
+const handleSelectionChange = (e: any[]) => {
+  SelectionList.value = e
+}
+// 添加行
+const addRow = () => {
+  if (checkCertificateList()) {
+    setAllRowReadable()
+    list.value.push({
+      measureRange: '',
+      uncertainty: '',
+      basedDocuments: '',
+      editable: true,
+    })
+  }
+}
+// 删除行
+const removeRow = () => {
+  list.value = list.value.filter((item) => {
+    return !SelectionList.value.includes(item)
+  })
+}
+watch(() => $props.data, (newVal) => {
+  if (newVal) {
+    list.value = newVal
+  }
+})
+const initDialog = () => {
+  list.value = $props.data
+}
+initDialog()
+defineExpose({
+  list,
+  checkCertificateList,
+})
+</script>
+
+<template>
+  <detail-block-switch title="技术指标">
+    <template v-if="!$route.path.includes('detail')" #btns>
+      <el-button type="primary" @click="addRow">
+        增加行
+      </el-button>
+      <el-button type="info" @click="removeRow">
+        删除行
+      </el-button>
+    </template>
+    <el-table
+      ref="multipleTableRef" :data="list" style="width: 100%;" border @selection-change="handleSelectionChange"
+      @row-dblclick="dblclickRow"
+    >
+      <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
+      <el-table-column align="center" label="序号" width="80" type="index" />
+      <el-table-column
+        v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text"
+        align="center"
+      >
+        <template #header>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
+        </template>
+        <template #default="scope">
+          <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+          <el-input
+            v-if="scope.row.editable && !item.isSelect" v-model="scope.row[item.value]" :autofocus="true"
+            :placeholder="`${item.text}`" class="input"
+          />
+          <!-- <el-date-picker v-if="scope.row.editable && item.isDate" v-model="scope.row[item.value]" type="date"
+              format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`" /> -->
+          <!-- <el-select
+            v-if="scope.row.editable && item.isSelect" v-model="scope.row[item.value]"
+            :placeholder="`${item.text}`"
+          >
+            <el-option v-for="item in platformListBak" :key="item.id" :label="item.name" :value="item.name" />
+          </el-select> -->
+        </template>
+      </el-table-column>
+    </el-table>
+  </detail-block-switch>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>
diff --git a/src/views/tested/device/model/index.vue b/src/views/tested/device/model/index.vue
new file mode 100644
index 0000000..e0524d9
--- /dev/null
+++ b/src/views/tested/device/model/index.vue
@@ -0,0 +1,8 @@
+<!-- 设备规格型号管理 -->
+<script lang="ts" setup name="DeviceModelIndex">
+import list from './components/list.vue'
+</script>
+
+<template>
+  <list />
+</template>
diff --git a/src/views/tested/device/remind/index.vue b/src/views/tested/device/remind/index.vue
index e29c9e7..63937cb 100644
--- a/src/views/tested/device/remind/index.vue
+++ b/src/views/tested/device/remind/index.vue
@@ -92,7 +92,7 @@
 }
 const range = ref()
 watch(() => range.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.certificateValidStart = `${newVal[0]} 00:00:00`
     listQuery.certificateValidEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/subpackage/certificate/index.vue b/src/views/tested/subpackage/certificate/index.vue
index 0620ef5..cea2db2 100644
--- a/src/views/tested/subpackage/certificate/index.vue
+++ b/src/views/tested/subpackage/certificate/index.vue
@@ -19,7 +19,7 @@
 })
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/subpackage/directory/components/list.vue b/src/views/tested/subpackage/directory/components/list.vue
index 17aff60..0c60cee 100644
--- a/src/views/tested/subpackage/directory/components/list.vue
+++ b/src/views/tested/subpackage/directory/components/list.vue
@@ -98,7 +98,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/subpackage/review/components/list.vue b/src/views/tested/subpackage/review/components/list.vue
index 2787693..11cf08e 100644
--- a/src/views/tested/subpackage/review/components/list.vue
+++ b/src/views/tested/subpackage/review/components/list.vue
@@ -92,7 +92,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }

diff --git a/.env.development b/.env.development
index debe1a8..f2fee42 100644
--- a/.env.development
+++ b/.env.development
@@ -4,7 +4,7 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
-VITE_APP_API_BASEURL = http://127.0.0.1:5909
+VITE_APP_API_BASEURL = http://192.168.8.101:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
diff --git a/public/config/config.json b/public/config/config.json
index 3bd0a89..313fcf7 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://111.198.10.15:21611"
+  "baseUrl": "http://192.168.8.101:5909"
 }
diff --git a/src/api/eqpt/device/model.ts b/src/api/eqpt/device/model.ts
new file mode 100644
index 0000000..a8fa0f1
--- /dev/null
+++ b/src/api/eqpt/device/model.ts
@@ -0,0 +1,61 @@
+/**
+ * 设备型号规格管理相关
+ */
+import request from '@/api/index'
+
+// 列表
+export function getModelList(params: any) {
+  return request({
+    url: `/equipment/model/listPage?limit=${params.limit}&offset=${params.offset}`,
+    method: 'post',
+    data: params,
+  })
+}
+// 列表-不分页
+export function getModelAllList(params: any) {
+  return request({
+    url: '/equipment/model/list',
+    method: 'post',
+    data: params,
+  })
+}
+// 设备名称列表/equipment/model/listEquipmentName
+export function getDeviceNameList(params: any) {
+  return request({
+    url: '/equipment/model/listEquipmentName',
+    method: 'get',
+    params,
+  })
+}
+// 导出
+export function exportModelList(data: any) {
+  return request({
+    url: '/equipment/model/export',
+    method: 'post',
+    data,
+  })
+}
+// 新建或编辑
+export function handlerFunApi(type: string, data: any) {
+  if (type === 'create') {
+    return request({
+      url: '/equipment/model/add',
+      method: 'post',
+      data,
+    })
+  }
+  else if (type === 'update') {
+    return request({
+      url: '/equipment/model/update',
+      method: 'post',
+      data,
+    })
+  }
+}
+// 删除
+export function deleteModel(data: any) {
+  return request({
+    url: `/equipment/model/delete?id=${data.id}`,
+    method: 'post',
+  })
+}
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 14ec12e..64e6f48 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -55,11 +55,12 @@
   // listQuery.value.offset = 1
   // }
   fetchApproval({ processId: listQuery.value.processId }).then((response) => {
+    console.log(response.data, 'response')
     response.data.forEach((item: Array<IList>, index: number) => {
       item.forEach((i: any) => {
         list.value.push({
           cindex: index,
-          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[i.cindex].nodeNumber + 1,
+          nodeNumber: i.approvalStatus === '发起人' ? 0 : list.value[index - 1].nodeNumber + 1,
           assigneeName: i.assigneeName, // 姓名
           approvalStatus: i.approvalStatus, // 审批类型
           finishTime: i.finishTime ? i.finishTime : '-', // 完成时间
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index f08078d..aefbd8b 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -90,8 +90,16 @@
     type: String,
     default: 'default',
   }, // 表格大小，默认，small,mini等，与el-table条件相同
+  // 排序
+  sort: {
+    type: Object,
+    default() {
+      return {
+      }
+    },
+  },
 })
-const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'multiSelect'])
+const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'multiSelect', 'sortChange'])
 // -------定义数据--------------
 interface columnsCheckInfo {
   text: string
@@ -139,6 +147,10 @@
 function selectionChange(selection: []) {
   emit('selectionChange', selection)
 }
+// 点击排序
+function sortClick(column: any, prop: any, order: any) {
+  emit('sortChange', { column, prop, order })
+}
 // 点击行
 function rowClick(row: object, column?: any, event?: any) {
   emit('rowClick', row)
@@ -196,11 +208,13 @@
       border
       stripe
       :size="size"
+      :default-sort="props.sort"
       :show-header="showHeader"
       style="width: 100%;"
       @selection-change="handleSelectionChange"
       @select="selectClick"
       @row-click="rowClick"
+      @sort-change="sortClick"
     >
       <slot name="preColumns" />
 
@@ -210,7 +224,7 @@
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
+      <el-table-column v-for="column of columns" :key="column.value" :sortable="column.sortable" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
           <span v-else :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ column.filter(scope.row) }}</span>
diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index 5cf6445..2cd73de 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -320,7 +320,7 @@
   {
     path: '/meteringdevice',
     component: Layout,
-    redirect: '/devicelist',
+    redirect: '/modellist',
     name: 'MeteringDevice',
     meta: {
       title: '设备台账',
@@ -329,6 +329,43 @@
     },
     children: [
       {
+        path: '/modellist',
+        component: Layout,
+        redirect: '/dmodel',
+        name: 'DeviceModel',
+        meta: {
+          title: '设备规格型号管理',
+          icon: 'ep:key',
+          auth: '/tested/device/model',
+        },
+        children: [
+          {
+            path: '/dmodel',
+            name: 'DeviceModelPage',
+            component: () => import('@/views/tested/device/model/index.vue'),
+            meta: {
+              title: '设备规格型号管理',
+              auth: '/tested/device/model',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/modellist',
+            },
+          },
+          {
+            path: '/dmodel/:type',
+            name: 'ModelEdit',
+            component: () => import('@/views/tested/device/model/components/edit.vue'),
+            meta: {
+              title: '设备规格型号管理',
+              auth: '/tested/device/model',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/modellist',
+            },
+          },
+        ],
+      },
+      {
         path: '/devicelist',
         component: Layout,
         redirect: '/dinfo',
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 6c9383f..879a207 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -158,7 +158,11 @@
 }
 // 批量删除
 const batchDeleteLabel = () => {
-  if (selectList.value.length) {
+  if (selectList.value.filter(item => item.usageStatusName === '已使用').length) {
+    ElMessage.warning('请选择未使用的标签')
+    return
+  }
+  if (selectList.value.filter(item => item.usageStatusName !== '已使用').length) {
     ElMessageBox.confirm(
       '确认删除所选数据吗？',
       '提示',
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index 60d55d6..ba91cbf 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -25,7 +25,7 @@
   offset: 1,
 }) // 查询参数
 watch(() => noticeTime.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     searchQuery.noticeStartTime = `${newVal[0]} 00:00:00`
     searchQuery.noticeEndTime = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/system/signature/autograph.vue b/src/views/system/signature/autograph.vue
index e5a32c8..9c1d0ca 100644
--- a/src/views/system/signature/autograph.vue
+++ b/src/views/system/signature/autograph.vue
@@ -23,7 +23,7 @@
   ids: [],
 }) // 查询参数
 watch(() => createTime.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     searchQuery.createStartTime = `${newVal[0]} 00:00:00`
     searchQuery.createEndTime = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 5f57089..b557683 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -16,7 +16,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index 8f31905..e140eaa 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.applicantTimeStart = `${newVal[0]} 00:00:00`
     listQuery.applicantTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/opinion/index.vue b/src/views/tested/MeasurementBusiness/opinion/index.vue
index 6c7e13c..c6683c0 100644
--- a/src/views/tested/MeasurementBusiness/opinion/index.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue
index b15f27b..e204a69 100644
--- a/src/views/tested/MeasurementBusiness/review/index.vue
+++ b/src/views/tested/MeasurementBusiness/review/index.vue
@@ -19,7 +19,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
@@ -76,21 +76,11 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
-  // getListPage(listQuery).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   listLoading.value = false
-  // })
-  list.value = [{
-    formNo: '12345',
-    formName: '评审表1',
-    labCode: '海口实验室',
-    groupCode: '组别1',
-    signStatusName: '同意',
-    createUserName: '张三',
-    createTime: '2023-09-05',
-  }]
-  listLoading.value = false
+  getListPage(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  })
 }
 fetchData()
 // 查询数据
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 0e2fd1c..217365a 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -14,7 +14,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.sendTimeStart = `${newVal[0]} 00:00:00`
     listQuery.sendTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index e117705..e2d0ea2 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -12,6 +12,7 @@
     required: true,
   },
 })
+const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
 const userStore = useUserStore()
 const listQuery = reactive({
@@ -20,8 +21,8 @@
   createTimeEnd: '',
   createTimeStart: '',
   notifyType: $props.notifyType, // 通知类型(负责人/部门，字典值)
-  notifyDept: userStore.deptId,
-  notifyUser: userStore.id,
+  notifyDept: $route.path.includes('curatorpage') ? '' : userStore.deptId,
+  notifyUser: $route.path.includes('curatorpage') ? userStore.id : '',
   offset: 1,
   limit: 20,
 })
@@ -30,7 +31,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/dept/index.vue b/src/views/tested/MeasurementPlan/dept/index.vue
index aafe5e1..a25835f 100644
--- a/src/views/tested/MeasurementPlan/dept/index.vue
+++ b/src/views/tested/MeasurementPlan/dept/index.vue
@@ -5,5 +5,5 @@
 
 <template>
   <!-- notifyType 通知类型(负责人/部门，字典值) -->
-  <page notify-type="1" />
+  <page notify-type="2" />
 </template>
diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue
index 3cdecdc..429acf5 100644
--- a/src/views/tested/MeasurementPlan/early/components/list.vue
+++ b/src/views/tested/MeasurementPlan/early/components/list.vue
@@ -53,7 +53,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index f599508..2c53a36 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -24,7 +24,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index 6af790b..f17af59 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -39,7 +39,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 6fa4355..d0e9936 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -27,7 +27,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.value.certificateValidStart = `${newVal[0]} 00:00:00`
     listQuery.value.certificateValidEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/MeasurementPlan/task/index.vue b/src/views/tested/MeasurementPlan/task/index.vue
index 4ab62d9..aa759a8 100644
--- a/src/views/tested/MeasurementPlan/task/index.vue
+++ b/src/views/tested/MeasurementPlan/task/index.vue
@@ -17,7 +17,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createStartTime = `${newVal[0]} 00:00:00`
     listQuery.createEndTime = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index c7d63b8..67b4dac 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -99,7 +99,7 @@
 }
 const range = ref()
 watch(() => range.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.certificateValidStart = `${newVal[0]} 00:00:00`
     listQuery.certificateValidEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index 5d8d328..af479a6 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -41,7 +41,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.value.certificateValidStart = `${newVal[0]} 00:00:00`
     listQuery.value.certificateValidEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/device/group/components/tableList.vue b/src/views/tested/device/group/components/tableList.vue
index d1f60ce..f1b817a 100644
--- a/src/views/tested/device/group/components/tableList.vue
+++ b/src/views/tested/device/group/components/tableList.vue
@@ -177,7 +177,16 @@
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
           <el-input
-            v-if="scope.row.editable && !item.isSelect" v-model="scope.row[item.value]" :autofocus="true"
+            v-if="scope.row.editable && !item.isSelect && item.text === '设备名称'" v-model="scope.row[item.value]" :autofocus="true"
+            :placeholder="`${item.text}`" class="input"
+            @focus="select(item.text, scope.$index)"
+          >
+            <template #append>
+              <span @click="select(item.text, scope.$index)">选择</span>
+            </template>
+          </el-input>
+          <el-input
+            v-if="scope.row.editable && !item.isSelect && item.text !== '设备名称'" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
             @focus="select(item.text, scope.$index)"
           />
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 7443364..db05d4d 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -50,6 +50,7 @@
     text: '统一编号',
     value: 'equipmentNo',
     align: 'center',
+    sortable: 'custom',
   },
   {
     text: '设备名称',
@@ -60,11 +61,13 @@
     text: '型号规格',
     value: 'model',
     align: 'center',
+    sortable: 'custom',
   },
   {
     text: '出厂编号',
     value: 'manufactureNo',
     align: 'center',
+    sortable: 'custom',
   },
   {
     text: '使用岗位',
@@ -85,6 +88,7 @@
     text: '证书有效期',
     value: 'certificateValid',
     align: 'center',
+    sortable: 'custom',
   },
 ])
 const allColums = ref([
@@ -92,6 +96,7 @@
     text: '使用状态',
     value: 'usageStatusName',
     align: 'center',
+    sortable: 'custom',
   },
   {
     text: '备注',
@@ -121,6 +126,21 @@
     align: 'center',
   },
 ])
+// 排序条件发生变化
+const sortChange = ({ column }: any) => {
+  if (column.order === 'ascending') {
+    console.log(column.prop)
+    console.log('升序')
+  }
+  else if (column.order === 'descending') {
+    console.log(column.prop)
+    console.log('倒叙')
+  }
+}
+// 聚合表格实例
+const togetherTableRef = ref()
+// 展开表格实例
+const expandTableRef = ref()
 const list = ref([])
 const total = ref(0)
 const listLoading = ref(true)
@@ -157,7 +177,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.certificateValidStart = `${newVal[0]} 00:00:00`
     listQuery.certificateValidEnd = `${newVal[1]} 23:59:59`
   }
@@ -209,12 +229,29 @@
   expandLoading.value = true
   getInfoList(params).then((res) => {
     expandList.value = res.data
+    // 获取聚合表格选中，判断展开表格是否需要全选
+    const selectList = togetherTableRef.value.getSelectionRows()
+    if (selectList.length) {
+      const select = selectList.filter((item: any) => item.equipmentName === params.equipmentName)
+      if (select.length) {
+        nextTick(() => {
+          expandTableRef.value.toggleAllSelection()
+        })
+      }
+    }
     expandLoading.value = false
   })
 }
 const getRowKeys = (row: any) => { // 获取当前行id
   return row.equipmentName // 这里看这一行中需要根据哪个属性值是id
 }
+// 监听聚合表格多选
+// watch(() => togetherTableRef.value?.getSelectionRows(), (newVal, oldVal) => {
+//   console.log(newVal, 'newVal')
+// }, {
+//   deep: true,
+// })
+
 // 表格被选中的行
 const selectList = ref<any[]>([])
 // 表格多选
@@ -240,6 +277,48 @@
 {
   deep: true,
 })
+const togetherSelect = (selection: any, row: any) => {
+  if (selection.includes(row)) {
+    // 勾选
+    console.log('勾选')
+    if (expands.value && expands.value[0] === row.equipmentName) {
+      expandTableRef.value.toggleAllSelection()
+    }
+  }
+  else {
+    // 取消勾选
+    console.log('取消勾选')
+    if (expands.value && expands.value[0] === row.equipmentName) {
+      expandTableRef.value.toggleAllSelection()
+    }
+  }
+}
+const expandSelect = (selection: any, row: any) => {
+  if (selection.length === expandList.value.length) {
+    // 全选
+    console.log('全选')
+    // 获取聚合
+    console.log(expands.value[0])
+    const data = togetherList.value.filter((item: any) => item.equipmentName === expands.value[0])
+    console.log(data)
+    if (data.length) {
+      nextTick(() => {
+        togetherTableRef.value.toggleRowSelection(data[0], true)
+      })
+    }
+  }
+  else {
+    // 全不选
+    console.log('全不选')
+    // 获取聚合
+    const data = togetherList.value.filter((item: any) => item.equipmentName === expands.value[0])
+    if (data.length) {
+      nextTick(() => {
+        togetherTableRef.value.toggleRowSelection(data[0], false)
+      })
+    }
+  }
+}
 const $router = useRouter()
 // 新建编辑操作
 const handler = (row: IlistObjType, type: string) => {
@@ -497,7 +576,7 @@
       <template v-if="$props.statusName === '全部'" #btns-right>
         <icon-button icon="icon-change" title="切换列表状态" @click="changeTable" />
         <icon-button icon="icon-sweep" title="扫描" />
-        <icon-button icon="icon-add" title="新增" @click="handler({}, 'create')" />
+        <icon-button icon="icon-add" title="新增" @click="handler({} as any, 'create')" />
         <icon-button icon="icon-import" title="批量导入" @click="importList" />
         <icon-button icon="icon-template" title="模板下载" @click="useTemplateDownload('设备信息管理模块')" />
         <icon-button icon="icon-export" title="导出" @click="exportList" />
@@ -508,30 +587,29 @@
         <normal-table
           v-show=" tableFlage "
           ref="normalTableRef" :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="listLoading" :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
+          :list-loading="listLoading"
+          :is-showmulti-select="true" :is-multi="true" @sort-change="sortChange" @change="changePage" @multi-select="multiSelect"
         >
           <template #columns>
             <!-- 全部状态 -->
-            <el-table-column
-              v-for=" column of allColums " :key=" column.value "
-              :label=" column.text " :prop=" column.value " :align=" column.align "
-              :show-overflow-tooltip="true"
-            >
-              <template v-if="$props.statusName === '全部' " #default=" scope ">
-                <span>{{ scope.row[column.value] }}</span>
-              </template>
-            </el-table-column>
+            <template v-if="$props.statusName === '全部' ">
+              <el-table-column
+                v-for=" column of allColums " :key=" column.value "
+                :label=" column.text " :prop=" column.value " :align=" column.align "
+                :show-overflow-tooltip="true"
+                :sortable="column.sortable"
+              />
+            </template>
             <!-- 其他审批状态 -->
-            <el-table-column
-              v-for=" column of otherColums " :key="column.value" :label=" column.text "
-              :prop=" column.value " :align=" column.align "
-              :show-overflow-tooltip="true"
-            >
-              <template v-if="$props.statusName !== '全部' " #default=" scope ">
-                <span>
-                  {{ scope.row[column.value] }}</span>
-              </template>
-            </el-table-column>
+            <template v-if="$props.statusName !== '全部' ">
+              <el-table-column
+                v-for=" column of otherColums " :key="column.value"
+                :label=" column.text "
+                :prop=" column.value " :align=" column.align "
+                :show-overflow-tooltip="true"
+              />
+            </template>
+
             <el-table-column label="操作" width="160" align="center">
               <template #default=" scope ">
                 <el-button link type="primary" size="small" @click="detail(scope.row)">
@@ -580,6 +658,7 @@
       </div>
       <div v-if=" !tableFlage ">
         <!-- 展开行表格 -->
+        <!-- 头部 -->
         <normal-table
           v-show=" !tableFlage " class="nortable-header" :data=" [] " :total=" 0 " :columns=" columns " :options="
             {
@@ -587,12 +666,23 @@
               border: true, // 是否需要上方边框
             }
           " :pagination=" false " :is-showmulti-select=" true " :query="{}"
-        />
-        <el-table
-          v-show=" !tableFlage " v-loading=" togetherLoading " :data=" togetherList " border style="width: 100%;"
-          :row-key=" getRowKeys " :expand-row-keys=" expands " :show-header=" false " @expand-change=" expandChange "
         >
+          <template #columns>
+            <el-table-column label="操作" width="160" align="center" />
+          </template>
+        </normal-table>
+        <!-- 身体 -->
+        <el-table
+          v-show=" !tableFlage "
+          ref="togetherTableRef" v-loading=" togetherLoading " :data=" togetherList " border style="width: 100%;"
+          :row-key=" getRowKeys " :expand-row-keys=" expands " :show-header=" false " @expand-change=" expandChange "
+          @select="togetherSelect"
+        >
+          <el-table-column type="selection" width="38" />
           <el-table-column type="expand">
+            <template #default="props">
+              <!-- 展开表格身体 -->
+              <!-- <normal-table
             <template #default>
               <normal-table
                 :data=" expandList " :total=" 0 " :columns=" columns " :list-loading=" expandLoading " :options="
@@ -601,7 +691,58 @@
                     border: true, // 是否需要上方边框
                   }
                 " :pagination=" false " :is-showmulti-select=" true " :show-header=" false " :query="{}"
-              />
+              /> -->
+              <el-table
+                ref="expandTableRef"
+                v-loading=" expandLoading " :data=" expandList " border style="width: 100%;"
+                :show-header=" false " @select="expandSelect"
+              >
+                <el-table-column type="selection" width="38" />
+                <el-table-column v-for="item in columns" :key="item.value" :labe="item.text" :prop="item.value" align="center" />
+                <el-table-column label="操作" width="160" align="center">
+                  <template #default=" scope ">
+                    <el-button link type="primary" size="small" @click="detail(scope.row)">
+                      查看
+                    </el-button>
+                    <el-button
+                      v-if="proxy.buttonPerm.edit.if({ approvalStatusName: $props.statusName }, permUrl.edit)" link type="primary" size="small"
+                      @click="handler(scope.row, 'update')"
+                    >
+                      编辑
+                    </el-button>
+                    <el-button
+                      v-if="proxy.buttonPerm.agree.if({ approvalStatusName: $props.statusName }, permUrl.agree)" link type="primary" size="small"
+                      @click="approveHandler(scope.row, 'agree')"
+                    >
+                      同意
+                    </el-button>
+                    <el-button
+                      v-if="proxy.buttonPerm.reject.if({ approvalStatusName: $props.statusName }, permUrl.reject)" link type="primary" size="small"
+                      @click="approveHandler(scope.row, 'refuse')"
+                    >
+                      拒绝
+                    </el-button>
+                    <el-button
+                      v-if="proxy.buttonPerm.submit.if({ approvalStatusName: $props.statusName }, permUrl.submit)" link type="primary" size="small"
+                      @click="submit(scope.row)"
+                    >
+                      提交
+                    </el-button>
+                    <el-button
+                      v-if="proxy.buttonPerm.cancel.if({ approvalStatusName: $props.statusName }, permUrl.cancel)" link type="primary" size="small"
+                      @click="canHandler(scope.row)"
+                    >
+                      取消
+                    </el-button>
+                    <el-button
+                      v-if="proxy.buttonPerm.delete.if({ approvalStatusName: $props.statusName }, permUrl.del)" link type="danger" size="small"
+                      @click="delHandler(scope.row)"
+                    >
+                      删除
+                    </el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
             </template>
           </el-table-column>
           <el-table-column label="设备名称" prop="equipmentName" align="center" />
diff --git a/src/views/tested/device/model/components/edit.vue b/src/views/tested/device/model/components/edit.vue
new file mode 100644
index 0000000..0783b12
--- /dev/null
+++ b/src/views/tested/device/model/components/edit.vue
@@ -0,0 +1,251 @@
+<!-- 设备规格型号-编辑 -->
+<script lang="ts" setup name="DeviceModelEdit">
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import tableList from './technology.vue'
+import { getDictByCode } from '@/api/system/dict'
+import { handlerFunApi } from '@/api/eqpt/device/model'
+import useUserStore from '@/store/modules/user'
+import { getUserDept } from '@/api/system/user'
+import { uploadApi } from '@/api/system/notice'
+import showPhoto from '@/views/tested/device/info/components/showPhoto.vue'
+const $route = useRoute()
+const $router = useRouter()
+const userStore = useUserStore()
+const ruleFormRef = ref<FormInstance>() // from组件
+const title = ref('')
+// 显示标题
+const textMap: { [key: string]: string } = {
+  update: '编辑',
+  create: '新增',
+  detail: '详情',
+}
+// 对话框类型：create,update
+const dialogStatus = ref('create')
+const ruleForm = ref({
+  category: '', // 设备分类
+  categoryName: '', // 设备分类名称
+  checkCycle: '', // 检定周期
+  createDeptId: '',
+  createTime: '',
+  createUserId: '',
+  equipmentName: '', // 设备名称
+  helpInstruction: '', // 辅助字段
+  id: '',
+  instructionsFile: '', // 附件
+  model: '', // 规格型号
+  modelNo: '', // 规格型号编号
+  remark: '', // 备注
+  technicalTargetList: [], // 技术指标
+  updateTime: '',
+}) // 表单
+const rules = ref<FormRules>({
+  equipmentName: [{ required: true, message: '设备名称名称必填', trigger: 'blur' }],
+  category: [{ required: true, message: '设备分类必选', trigger: 'blur' }],
+  model: [{ required: true, message: '规格型号必填', trigger: 'blur' }],
+  checkCycle: [{ required: true, message: '检定周期必填', trigger: 'blur' }],
+}) // 表单验证规则
+// 弹窗初始化
+const initDialog = () => {
+  dialogStatus.value = $route.params.type as string
+  ruleFormRef.value?.resetFields()
+  if ($route.params.type === 'create') {
+    ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+    ruleForm.value.createUserId = userStore.id
+    // 获取当前用户所在单位
+    getUserDept().then((res) => {
+      ruleForm.value.createDeptId = res.data.id
+    })
+  }
+  else {
+    console.log($route.query.row, 'data')
+    const data = JSON.parse($route.query.row as string)
+    // detailGroup({ groupId: data.id }).then((res) => {
+    ruleForm.value = data
+    // })
+  }
+}
+onMounted(() => {
+  initDialog()
+})
+// 关闭弹窗
+const close = () => {
+  $router.back()
+}
+const tableRef = ref()
+// 保存
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid && tableRef.value.checkCertificateList()) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        ruleForm.value.equipmentList = tableRef.value.list
+        if ($route.params.type === 'create') {
+          handlerFunApi('create', ruleForm.value).then((res) => {
+            ElMessage.success('添加成功')
+            close()
+          })
+        }
+        else {
+          handlerFunApi('update', ruleForm.value).then((res) => {
+            ElMessage.success('修改成功')
+            close()
+          })
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    fd.append('multipartFile', event.target.files[0])
+    uploadApi(fd).then((res) => {
+      if (res.code === 200) {
+        ruleForm.value.instructionsFile = ruleForm.value.instructionsFile ? `${ruleForm.value.instructionsFile},${res.data[0]}` : res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+        fileRef.value.value = ''
+        loading.close()
+      }
+      else {
+        // ElMessage.error(res.message)
+        loading.close()
+      }
+    })
+  }
+}
+// 上传
+const upload = () => {
+  fileRef.value.click()
+}
+// 删除上传的文件
+const deleteFile = (fileName: string) => {
+  const data = ruleForm.value.instructionsFile.split(',')
+  const filterData = data.filter(item => item !== fileName)
+  ruleForm.value.instructionsFile = filterData.length ? filterData.join(',') : ''
+}
+// 设备分类
+const deviceTypeList = ref<{ id: string; value: string; name: string }[]>([])
+const fetchSelect = () => {
+  // 设备分类
+  getDictByCode('eqptDeviceType').then((res) => {
+    deviceTypeList.value = res.data
+  })
+}
+fetchSelect()
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <approval-dialog ref="approvalDialogRef" @on-success="() => { $router.back() }" />
+    <detail-page :title="`设备规格型号管理-${textMap[dialogStatus]}`">
+      <template #btns>
+        <el-button v-if="dialogStatus !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-com>
+      <el-form
+        ref="ruleFormRef"
+        :model="ruleForm"
+        :rules="rules" label-position="right" label-width="110px" class="form"
+        :disabled="dialogStatus === 'detail'"
+        :class="$route.path.includes('detail') ? 'isDetail' : ''"
+      >
+        <el-row :gutter="24" class="marg">
+          <el-col :span="8">
+            <el-form-item label="型号规格编号">
+              <el-input v-model.trim="ruleForm.modelNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm.equipmentName" placeholder="设备名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="规格型号" prop="model">
+              <el-input v-model.trim="ruleForm.model" placeholder="规格型号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="8">
+            <el-form-item label="辅助字段" prop="helpInstruction">
+              <el-input v-model.trim="ruleForm.helpInstruction" placeholder="辅助字段" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="设备分类" prop="category">
+              <el-select v-model.trim="ruleForm.category" placeholder="设备名称" style="width: 100%;">
+                <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="检定周期" prop="checkCycle">
+              <!-- <el-input v-model.trim="ruleForm.checkCycle" placeholder="检定周期" /> -->
+              <el-input v-model.trim="ruleForm.checkCycle">
+                <template #append>
+                  月
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="使用说明书" prop="instructionsFile">
+              <!-- <el-input v-model.trim="ruleForm.helpInstruction" placeholder="辅助字段" /> -->
+              <show-photo :minio-file-name="ruleForm.instructionsFile" @delete="deleteFile" />
+              <input ref="fileRef" style="display: none;" type="file" accept="application/msword,application/pdf" @change="onFileChange">
+              <el-button v-if="dialogStatus !== 'detail'" type="primary" @click="upload">
+                上传
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="18">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.remark" type="textarea" :row="3" maxlength="100" show-word-limit />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block-com>
+    <detail-block-com>
+      <table-list ref="tableRef" :data="ruleForm.technicalTargetList" :status="dialogStatus" />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/tested/device/model/components/list.vue b/src/views/tested/device/model/components/list.vue
new file mode 100644
index 0000000..60a0a42
--- /dev/null
+++ b/src/views/tested/device/model/components/list.vue
@@ -0,0 +1,266 @@
+<!-- 设备规格型号管理列表 -->
+<script lang="ts" setup name="DeviceModelList">
+import { reactive, ref, watch } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { deleteModel, exportModelList, getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
+import { exportFile } from '@/utils/exportUtils'
+import { getDictByCode } from '@/api/system/dict'
+const { proxy } = getCurrentInstance() as any
+const listQuery = reactive({
+  category: '',
+  equipmentName: '',
+  helpInstruction: '',
+  model: '',
+  offset: 1,
+  limit: 20,
+})
+const columns = ref([
+  {
+    text: '型号规格编号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '型号规格',
+    value: 'model',
+    align: 'center',
+  },
+  {
+    text: '辅助字段',
+    value: 'helpInstruction',
+    align: 'center',
+  },
+  {
+    text: '设备分类',
+    value: 'categoryName',
+    align: 'center',
+  },
+  {
+    text: '检定周期',
+    value: 'checkCycle',
+    align: 'center',
+  },
+  {
+    text: '使用说明书',
+    value: 'instructionsFile',
+    align: 'center',
+  },
+  {
+    text: '备注',
+    value: 'remark',
+    align: 'center',
+  },
+])
+const list = ref([])
+const total = ref(0)
+const listLoading = ref(true)
+
+// 获取数据
+const fetchData = (isNowPage = true) => {
+  listLoading.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  getModelList(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  })
+}
+fetchData()
+// 查询数据
+const search = () => {
+  fetchData(false)
+}
+// 重置
+const reset = () => {
+  listQuery.category = ''
+  listQuery.equipmentName = ''
+  listQuery.helpInstruction = ''
+  listQuery.model = ''
+  listQuery.offset = 1
+  listQuery.limit = 20
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData()
+}
+const $router = useRouter()
+// 新建编辑操作
+const handler = (row: any, type: string) => {
+  $router.push({
+    path: `/dmodel/${type}`,
+    query: {
+      row: JSON.stringify(row),
+      id: row.id,
+    },
+  })
+}
+// 删除
+const delHandler = (row: any) => {
+  ElMessageBox.confirm(
+    '确认删除操作？注意删除不可逆。',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    // 判断设备是否被绑定
+    // 此设备型号与已存在设备绑定，请先删除设备
+    deleteModel({ id: row.id }).then((res) => {
+      ElMessage.success('操作成功')
+      search()
+    })
+  })
+}
+// 表格被选中的行
+const selectList = ref<any[]>([])
+// 表格多选
+const multiSelect = (row: any[]) => {
+  selectList.value = row
+}
+// 导出列表
+const exportList = () => {
+  if (list.value.length) {
+    const loading = ElLoading.service({
+      lock: true,
+      text: 'Loading',
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const data = {
+      ...listQuery,
+      offset: undefined,
+      limit: undefined,
+      ids: selectList.value.map(item => item.id),
+    }
+    exportModelList(data).then((res) => {
+      exportFile('设备规格型号')
+      loading.close()
+    })
+      .catch((_) => {
+        loading.close()
+      })
+  }
+  else {
+    ElMessage.warning('无可导出内容')
+  }
+}
+// 获取下拉列表相关
+// 设备名称
+const deviceNameList = ref<{ id: string; value: string; name: string }[]>([])
+// 设备分类
+const deviceTypeList = ref<{ id: string; value: string; name: string }[]>([])
+// 规格型号
+const modelList = ref<any[]>([])
+// 辅助字段
+const helpList = ref<any[]>([])
+const allList = ref<any[]>([])
+const fetchSelect = () => {
+  // 设备分类
+  getDictByCode('eqptDeviceType').then((res) => {
+    deviceTypeList.value = res.data
+  })
+  // 设备名称
+  getDeviceNameList().then((res) => {
+    deviceNameList.value = res.data
+  })
+  // 规格型号及辅助字段
+  getModelAllList({}).then((res) => {
+    allList.value = res.data
+    modelList.value = res.data
+    helpList.value = res.data.filter(item => item.helpInstruction)
+  })
+}
+fetchSelect()
+// 监听设备名称下拉框，修改规格型号和辅助字段
+watch(() => listQuery.equipmentName, (newVal) => {
+  if (newVal) {
+    listQuery.helpInstruction = ''
+    listQuery.model = ''
+    // 修改规格型号和辅助字段列表
+    const data = allList.value.filter(item => item.equipmentName === newVal)
+    modelList.value = data
+    helpList.value = data.filter(item => item.helpInstruction)
+  }
+})
+// 监听规格型号下拉框，修改辅助字段
+watch(() => listQuery.model, (newVal) => {
+  if (newVal) {
+    listQuery.helpInstruction = ''
+    // 修改规格型号和辅助字段列表
+    console.log(helpList.value, 'helpList.value')
+    helpList.value = helpList.value.filter(item => item.model === newVal)
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-select v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable>
+          <el-option v-for="item in deviceNameList" :key="item" :label="item" :value="item" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model.trim="listQuery.model" placeholder="规格型号" clearable>
+          <el-option v-for="item in modelList" :key="item.id" :label="item.model" :value="item.model" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model.trim="listQuery.helpInstruction" placeholder="辅助字段" clearable>
+          <el-option v-for="item in helpList" :key="item.id" :label="item.helpInstruction" :value="item.helpInstruction" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model.trim="listQuery.category" placeholder="设备分类" clearable>
+          <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-add" title="新增" @click="handler({}, 'create')" />
+        <icon-button icon="icon-export" title="导出" @click="exportList" />
+      </template>
+      <!-- 普通表格 -->
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
+      >
+        <template #columns>
+          <el-table-column label="操作" width="140" align="center">
+            <template #default="scope">
+              <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
+                查看
+              </el-button>
+              <el-button link type="primary" size="small" @click="handler(scope.row, 'update')">
+                编辑
+              </el-button>
+              <el-button link type="danger" size="small" @click="delHandler(scope.row)">
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
diff --git a/src/views/tested/device/model/components/technology.vue b/src/views/tested/device/model/components/technology.vue
new file mode 100644
index 0000000..d31fb2d
--- /dev/null
+++ b/src/views/tested/device/model/components/technology.vue
@@ -0,0 +1,141 @@
+<!-- 技术指标 -->
+<script lang="ts" setup name="DeviceTechnologyTable">
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { useCheckList } from '@/utils/useCheckList'
+const $props = defineProps({
+  data: {
+    type: Array,
+    default: () => ([]),
+  },
+})
+const $route = useRoute()
+// 表头显示标题
+const columns = ref([
+  {
+    text: '测量范围',
+    value: 'measureRange',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+  {
+    text: '不确定度或允许误差极限或准确度等级',
+    value: 'uncertainty',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+  {
+    text: '依据的技术文件',
+    value: 'basedDocuments',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+])
+const list = ref<any[]>([])
+// 检查数据列表
+function checkCertificateList() {
+  return useCheckList(list.value, columns.value, '技术指标')
+}
+// 将列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of list.value) {
+    item.editable = false
+  }
+}
+// 双击行显示输入框
+const dblclickRow = (row: any) => {
+  if ($route.path.includes('detail')) {
+    return
+  }
+  setAllRowReadable()
+  row.editable = true
+}
+const SelectionList = ref()
+// 表格选中
+const handleSelectionChange = (e: any[]) => {
+  SelectionList.value = e
+}
+// 添加行
+const addRow = () => {
+  if (checkCertificateList()) {
+    setAllRowReadable()
+    list.value.push({
+      measureRange: '',
+      uncertainty: '',
+      basedDocuments: '',
+      editable: true,
+    })
+  }
+}
+// 删除行
+const removeRow = () => {
+  list.value = list.value.filter((item) => {
+    return !SelectionList.value.includes(item)
+  })
+}
+watch(() => $props.data, (newVal) => {
+  if (newVal) {
+    list.value = newVal
+  }
+})
+const initDialog = () => {
+  list.value = $props.data
+}
+initDialog()
+defineExpose({
+  list,
+  checkCertificateList,
+})
+</script>
+
+<template>
+  <detail-block-switch title="技术指标">
+    <template v-if="!$route.path.includes('detail')" #btns>
+      <el-button type="primary" @click="addRow">
+        增加行
+      </el-button>
+      <el-button type="info" @click="removeRow">
+        删除行
+      </el-button>
+    </template>
+    <el-table
+      ref="multipleTableRef" :data="list" style="width: 100%;" border @selection-change="handleSelectionChange"
+      @row-dblclick="dblclickRow"
+    >
+      <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
+      <el-table-column align="center" label="序号" width="80" type="index" />
+      <el-table-column
+        v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text"
+        align="center"
+      >
+        <template #header>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
+        </template>
+        <template #default="scope">
+          <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+          <el-input
+            v-if="scope.row.editable && !item.isSelect" v-model="scope.row[item.value]" :autofocus="true"
+            :placeholder="`${item.text}`" class="input"
+          />
+          <!-- <el-date-picker v-if="scope.row.editable && item.isDate" v-model="scope.row[item.value]" type="date"
+              format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`" /> -->
+          <!-- <el-select
+            v-if="scope.row.editable && item.isSelect" v-model="scope.row[item.value]"
+            :placeholder="`${item.text}`"
+          >
+            <el-option v-for="item in platformListBak" :key="item.id" :label="item.name" :value="item.name" />
+          </el-select> -->
+        </template>
+      </el-table-column>
+    </el-table>
+  </detail-block-switch>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>
diff --git a/src/views/tested/device/model/index.vue b/src/views/tested/device/model/index.vue
new file mode 100644
index 0000000..e0524d9
--- /dev/null
+++ b/src/views/tested/device/model/index.vue
@@ -0,0 +1,8 @@
+<!-- 设备规格型号管理 -->
+<script lang="ts" setup name="DeviceModelIndex">
+import list from './components/list.vue'
+</script>
+
+<template>
+  <list />
+</template>
diff --git a/src/views/tested/device/remind/index.vue b/src/views/tested/device/remind/index.vue
index e29c9e7..63937cb 100644
--- a/src/views/tested/device/remind/index.vue
+++ b/src/views/tested/device/remind/index.vue
@@ -92,7 +92,7 @@
 }
 const range = ref()
 watch(() => range.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.certificateValidStart = `${newVal[0]} 00:00:00`
     listQuery.certificateValidEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/subpackage/certificate/index.vue b/src/views/tested/subpackage/certificate/index.vue
index 0620ef5..cea2db2 100644
--- a/src/views/tested/subpackage/certificate/index.vue
+++ b/src/views/tested/subpackage/certificate/index.vue
@@ -19,7 +19,7 @@
 })
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/subpackage/directory/components/list.vue b/src/views/tested/subpackage/directory/components/list.vue
index 17aff60..0c60cee 100644
--- a/src/views/tested/subpackage/directory/components/list.vue
+++ b/src/views/tested/subpackage/directory/components/list.vue
@@ -98,7 +98,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/subpackage/review/components/list.vue b/src/views/tested/subpackage/review/components/list.vue
index 2787693..11cf08e 100644
--- a/src/views/tested/subpackage/review/components/list.vue
+++ b/src/views/tested/subpackage/review/components/list.vue
@@ -92,7 +92,7 @@
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
   }
diff --git a/src/views/tested/subpackage/review/components/subpackageDialog.vue b/src/views/tested/subpackage/review/components/subpackageDialog.vue
index 832251e..d7a8985 100644
--- a/src/views/tested/subpackage/review/components/subpackageDialog.vue
+++ b/src/views/tested/subpackage/review/components/subpackageDialog.vue
@@ -27,7 +27,7 @@
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  if (newVal) {
+  if (newVal.length) {
     listQuery.value.createTimeStart = `${newVal[0]} 00:00:00`
     listQuery.value.createTimeEnd = `${newVal[1]} 23:59:59`
   }