diff --git a/.env.development b/.env.development
index 3b6f68d..4aea391 100644
--- a/.env.development
+++ b/.env.development
@@ -3,8 +3,8 @@
 VITE_SYS_TITLE = 受检设备管理系统
 # 接口请求地址，会设置到 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://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
+VITE_APP_API_BASEURL = http://192.168.8.101:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空

diff --git a/.env.development b/.env.development
index 3b6f68d..4aea391 100644
--- a/.env.development
+++ b/.env.development
@@ -3,8 +3,8 @@
 VITE_SYS_TITLE = 受检设备管理系统
 # 接口请求地址，会设置到 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://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
+VITE_APP_API_BASEURL = http://192.168.8.101:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
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 3b6f68d..4aea391 100644
--- a/.env.development
+++ b/.env.development
@@ -3,8 +3,8 @@
 VITE_SYS_TITLE = 受检设备管理系统
 # 接口请求地址，会设置到 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://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
+VITE_APP_API_BASEURL = http://192.168.8.101:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
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/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 3b6f68d..4aea391 100644
--- a/.env.development
+++ b/.env.development
@@ -3,8 +3,8 @@
 VITE_SYS_TITLE = 受检设备管理系统
 # 接口请求地址，会设置到 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://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
+VITE_APP_API_BASEURL = http://192.168.8.101:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
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/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 3b6f68d..4aea391 100644
--- a/.env.development
+++ b/.env.development
@@ -3,8 +3,8 @@
 VITE_SYS_TITLE = 受检设备管理系统
 # 接口请求地址，会设置到 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://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
+VITE_APP_API_BASEURL = http://192.168.8.101:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
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/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/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 3b6f68d..4aea391 100644
--- a/.env.development
+++ b/.env.development
@@ -3,8 +3,8 @@
 VITE_SYS_TITLE = 受检设备管理系统
 # 接口请求地址，会设置到 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://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
+VITE_APP_API_BASEURL = http://192.168.8.101:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
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/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/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 3b6f68d..4aea391 100644
--- a/.env.development
+++ b/.env.development
@@ -3,8 +3,8 @@
 VITE_SYS_TITLE = 受检设备管理系统
 # 接口请求地址，会设置到 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://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
+VITE_APP_API_BASEURL = http://192.168.8.101:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
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/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/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 3b6f68d..4aea391 100644
--- a/.env.development
+++ b/.env.development
@@ -3,8 +3,8 @@
 VITE_SYS_TITLE = 受检设备管理系统
 # 接口请求地址，会设置到 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://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
+VITE_APP_API_BASEURL = http://192.168.8.101:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
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/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/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 3b6f68d..4aea391 100644
--- a/.env.development
+++ b/.env.development
@@ -3,8 +3,8 @@
 VITE_SYS_TITLE = 受检设备管理系统
 # 接口请求地址，会设置到 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://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
+VITE_APP_API_BASEURL = http://192.168.8.101:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
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/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/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 3b6f68d..4aea391 100644
--- a/.env.development
+++ b/.env.development
@@ -3,8 +3,8 @@
 VITE_SYS_TITLE = 受检设备管理系统
 # 接口请求地址，会设置到 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://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
+VITE_APP_API_BASEURL = http://192.168.8.101:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
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/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/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 3b6f68d..4aea391 100644
--- a/.env.development
+++ b/.env.development
@@ -3,8 +3,8 @@
 VITE_SYS_TITLE = 受检设备管理系统
 # 接口请求地址，会设置到 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://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
+VITE_APP_API_BASEURL = http://192.168.8.101:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
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/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/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..9804827 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`
   }

diff --git a/.env.development b/.env.development
index 3b6f68d..4aea391 100644
--- a/.env.development
+++ b/.env.development
@@ -3,8 +3,8 @@
 VITE_SYS_TITLE = 受检设备管理系统
 # 接口请求地址，会设置到 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://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
+VITE_APP_API_BASEURL = http://192.168.8.101:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
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/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/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..9804827 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`
   }
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 3b6f68d..4aea391 100644
--- a/.env.development
+++ b/.env.development
@@ -3,8 +3,8 @@
 VITE_SYS_TITLE = 受检设备管理系统
 # 接口请求地址，会设置到 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://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
+VITE_APP_API_BASEURL = http://192.168.8.101:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
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/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/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..9804827 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`
   }
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..a41ea11 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -30,7 +30,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 3b6f68d..4aea391 100644
--- a/.env.development
+++ b/.env.development
@@ -3,8 +3,8 @@
 VITE_SYS_TITLE = 受检设备管理系统
 # 接口请求地址，会设置到 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://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
+VITE_APP_API_BASEURL = http://192.168.8.101:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
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/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/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..9804827 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`
   }
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..a41ea11 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -30,7 +30,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/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 3b6f68d..4aea391 100644
--- a/.env.development
+++ b/.env.development
@@ -3,8 +3,8 @@
 VITE_SYS_TITLE = 受检设备管理系统
 # 接口请求地址，会设置到 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://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
+VITE_APP_API_BASEURL = http://192.168.8.101:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
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/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/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..9804827 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`
   }
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..a41ea11 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -30,7 +30,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/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 3b6f68d..4aea391 100644
--- a/.env.development
+++ b/.env.development
@@ -3,8 +3,8 @@
 VITE_SYS_TITLE = 受检设备管理系统
 # 接口请求地址，会设置到 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://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
+VITE_APP_API_BASEURL = http://192.168.8.101:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
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/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/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..9804827 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`
   }
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..a41ea11 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -30,7 +30,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/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 3b6f68d..4aea391 100644
--- a/.env.development
+++ b/.env.development
@@ -3,8 +3,8 @@
 VITE_SYS_TITLE = 受检设备管理系统
 # 接口请求地址，会设置到 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://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
+VITE_APP_API_BASEURL = http://192.168.8.101:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
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/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/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..9804827 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`
   }
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..a41ea11 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -30,7 +30,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/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 3b6f68d..4aea391 100644
--- a/.env.development
+++ b/.env.development
@@ -3,8 +3,8 @@
 VITE_SYS_TITLE = 受检设备管理系统
 # 接口请求地址，会设置到 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://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
+VITE_APP_API_BASEURL = http://192.168.8.101:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
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/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/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..9804827 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`
   }
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..a41ea11 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -30,7 +30,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/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 3b6f68d..4aea391 100644
--- a/.env.development
+++ b/.env.development
@@ -3,8 +3,8 @@
 VITE_SYS_TITLE = 受检设备管理系统
 # 接口请求地址，会设置到 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://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
+VITE_APP_API_BASEURL = http://192.168.8.101:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
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/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/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..9804827 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`
   }
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..a41ea11 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -30,7 +30,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/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 3b6f68d..4aea391 100644
--- a/.env.development
+++ b/.env.development
@@ -3,8 +3,8 @@
 VITE_SYS_TITLE = 受检设备管理系统
 # 接口请求地址，会设置到 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://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
+VITE_APP_API_BASEURL = http://192.168.8.101:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
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/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/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..9804827 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`
   }
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..a41ea11 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -30,7 +30,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/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 3b6f68d..4aea391 100644
--- a/.env.development
+++ b/.env.development
@@ -3,8 +3,8 @@
 VITE_SYS_TITLE = 受检设备管理系统
 # 接口请求地址，会设置到 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://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
+VITE_APP_API_BASEURL = http://192.168.8.101:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
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/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/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..9804827 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`
   }
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..a41ea11 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -30,7 +30,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/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/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index f419e99..26f705d 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -28,7 +28,7 @@
   未通过: '5',
   已取消: '6',
 })
-const normalTableRef= ref()
+const normalTableRef = ref()
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive<IlistQueryType>({
   certificateValidStart: '',
@@ -49,6 +49,7 @@
     text: '统一编号',
     value: 'equipmentNo',
     align: 'center',
+    sortable: 'custom',
   },
   {
     text: '设备名称',
@@ -59,11 +60,13 @@
     text: '型号规格',
     value: 'model',
     align: 'center',
+    sortable: 'custom',
   },
   {
     text: '出厂编号',
     value: 'manufactureNo',
     align: 'center',
+    sortable: 'custom',
   },
   {
     text: '使用岗位',
@@ -84,6 +87,7 @@
     text: '证书有效期',
     value: 'certificateValid',
     align: 'center',
+    sortable: 'custom',
   },
 ])
 const allColums = ref([
@@ -91,6 +95,7 @@
     text: '使用状态',
     value: 'usageStatusName',
     align: 'center',
+    sortable: 'custom',
   },
   {
     text: '备注',
@@ -120,6 +125,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)
@@ -156,7 +176,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`
   }
@@ -208,12 +228,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[]>([])
 // 表格多选
@@ -239,6 +276,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) => {
@@ -507,7 +586,8 @@
         <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>
             <!-- 全部状态 -->
@@ -515,6 +595,7 @@
               v-for=" column of allColums " v-if=" $props.statusName === '全部' " :key=" column.value "
               :label=" column.text " :prop=" column.value " :align=" column.align "
               :show-overflow-tooltip="true"
+              :sortable="column.sortable"
             >
               <template #default=" scope ">
                 <span>
@@ -580,6 +661,7 @@
       </div>
       <div v-if=" !tableFlage ">
         <!-- 展开行表格 -->
+        <!-- 头部 -->
         <normal-table
           v-show=" !tableFlage " class="nortable-header" :data=" [] " :total=" 0 " :columns=" columns " :options="
             {
@@ -587,21 +669,81 @@
               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
+              <!-- 展开表格身体 -->
+              <!-- <normal-table
                 :data=" expandList " :total=" 0 " :columns=" columns " :list-loading=" expandLoading " :options="
                   {
                     needIndex: false, // 是否需要序号列
                     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 3b6f68d..4aea391 100644
--- a/.env.development
+++ b/.env.development
@@ -3,8 +3,8 @@
 VITE_SYS_TITLE = 受检设备管理系统
 # 接口请求地址，会设置到 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://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
+VITE_APP_API_BASEURL = http://192.168.8.101:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
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/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/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..9804827 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`
   }
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..a41ea11 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -30,7 +30,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/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/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index f419e99..26f705d 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -28,7 +28,7 @@
   未通过: '5',
   已取消: '6',
 })
-const normalTableRef= ref()
+const normalTableRef = ref()
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive<IlistQueryType>({
   certificateValidStart: '',
@@ -49,6 +49,7 @@
     text: '统一编号',
     value: 'equipmentNo',
     align: 'center',
+    sortable: 'custom',
   },
   {
     text: '设备名称',
@@ -59,11 +60,13 @@
     text: '型号规格',
     value: 'model',
     align: 'center',
+    sortable: 'custom',
   },
   {
     text: '出厂编号',
     value: 'manufactureNo',
     align: 'center',
+    sortable: 'custom',
   },
   {
     text: '使用岗位',
@@ -84,6 +87,7 @@
     text: '证书有效期',
     value: 'certificateValid',
     align: 'center',
+    sortable: 'custom',
   },
 ])
 const allColums = ref([
@@ -91,6 +95,7 @@
     text: '使用状态',
     value: 'usageStatusName',
     align: 'center',
+    sortable: 'custom',
   },
   {
     text: '备注',
@@ -120,6 +125,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)
@@ -156,7 +176,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`
   }
@@ -208,12 +228,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[]>([])
 // 表格多选
@@ -239,6 +276,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) => {
@@ -507,7 +586,8 @@
         <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>
             <!-- 全部状态 -->
@@ -515,6 +595,7 @@
               v-for=" column of allColums " v-if=" $props.statusName === '全部' " :key=" column.value "
               :label=" column.text " :prop=" column.value " :align=" column.align "
               :show-overflow-tooltip="true"
+              :sortable="column.sortable"
             >
               <template #default=" scope ">
                 <span>
@@ -580,6 +661,7 @@
       </div>
       <div v-if=" !tableFlage ">
         <!-- 展开行表格 -->
+        <!-- 头部 -->
         <normal-table
           v-show=" !tableFlage " class="nortable-header" :data=" [] " :total=" 0 " :columns=" columns " :options="
             {
@@ -587,21 +669,81 @@
               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
+              <!-- 展开表格身体 -->
+              <!-- <normal-table
                 :data=" expandList " :total=" 0 " :columns=" columns " :list-loading=" expandLoading " :options="
                   {
                     needIndex: false, // 是否需要序号列
                     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/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 3b6f68d..4aea391 100644
--- a/.env.development
+++ b/.env.development
@@ -3,8 +3,8 @@
 VITE_SYS_TITLE = 受检设备管理系统
 # 接口请求地址，会设置到 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://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
+VITE_APP_API_BASEURL = http://192.168.8.101:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
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/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/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..9804827 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`
   }
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..a41ea11 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -30,7 +30,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/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/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index f419e99..26f705d 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -28,7 +28,7 @@
   未通过: '5',
   已取消: '6',
 })
-const normalTableRef= ref()
+const normalTableRef = ref()
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive<IlistQueryType>({
   certificateValidStart: '',
@@ -49,6 +49,7 @@
     text: '统一编号',
     value: 'equipmentNo',
     align: 'center',
+    sortable: 'custom',
   },
   {
     text: '设备名称',
@@ -59,11 +60,13 @@
     text: '型号规格',
     value: 'model',
     align: 'center',
+    sortable: 'custom',
   },
   {
     text: '出厂编号',
     value: 'manufactureNo',
     align: 'center',
+    sortable: 'custom',
   },
   {
     text: '使用岗位',
@@ -84,6 +87,7 @@
     text: '证书有效期',
     value: 'certificateValid',
     align: 'center',
+    sortable: 'custom',
   },
 ])
 const allColums = ref([
@@ -91,6 +95,7 @@
     text: '使用状态',
     value: 'usageStatusName',
     align: 'center',
+    sortable: 'custom',
   },
   {
     text: '备注',
@@ -120,6 +125,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)
@@ -156,7 +176,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`
   }
@@ -208,12 +228,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[]>([])
 // 表格多选
@@ -239,6 +276,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) => {
@@ -507,7 +586,8 @@
         <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>
             <!-- 全部状态 -->
@@ -515,6 +595,7 @@
               v-for=" column of allColums " v-if=" $props.statusName === '全部' " :key=" column.value "
               :label=" column.text " :prop=" column.value " :align=" column.align "
               :show-overflow-tooltip="true"
+              :sortable="column.sortable"
             >
               <template #default=" scope ">
                 <span>
@@ -580,6 +661,7 @@
       </div>
       <div v-if=" !tableFlage ">
         <!-- 展开行表格 -->
+        <!-- 头部 -->
         <normal-table
           v-show=" !tableFlage " class="nortable-header" :data=" [] " :total=" 0 " :columns=" columns " :options="
             {
@@ -587,21 +669,81 @@
               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
+              <!-- 展开表格身体 -->
+              <!-- <normal-table
                 :data=" expandList " :total=" 0 " :columns=" columns " :list-loading=" expandLoading " :options="
                   {
                     needIndex: false, // 是否需要序号列
                     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/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 3b6f68d..4aea391 100644
--- a/.env.development
+++ b/.env.development
@@ -3,8 +3,8 @@
 VITE_SYS_TITLE = 受检设备管理系统
 # 接口请求地址，会设置到 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://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
+VITE_APP_API_BASEURL = http://192.168.8.101:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
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/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/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..9804827 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`
   }
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..a41ea11 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -30,7 +30,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/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/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index f419e99..26f705d 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -28,7 +28,7 @@
   未通过: '5',
   已取消: '6',
 })
-const normalTableRef= ref()
+const normalTableRef = ref()
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive<IlistQueryType>({
   certificateValidStart: '',
@@ -49,6 +49,7 @@
     text: '统一编号',
     value: 'equipmentNo',
     align: 'center',
+    sortable: 'custom',
   },
   {
     text: '设备名称',
@@ -59,11 +60,13 @@
     text: '型号规格',
     value: 'model',
     align: 'center',
+    sortable: 'custom',
   },
   {
     text: '出厂编号',
     value: 'manufactureNo',
     align: 'center',
+    sortable: 'custom',
   },
   {
     text: '使用岗位',
@@ -84,6 +87,7 @@
     text: '证书有效期',
     value: 'certificateValid',
     align: 'center',
+    sortable: 'custom',
   },
 ])
 const allColums = ref([
@@ -91,6 +95,7 @@
     text: '使用状态',
     value: 'usageStatusName',
     align: 'center',
+    sortable: 'custom',
   },
   {
     text: '备注',
@@ -120,6 +125,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)
@@ -156,7 +176,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`
   }
@@ -208,12 +228,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[]>([])
 // 表格多选
@@ -239,6 +276,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) => {
@@ -507,7 +586,8 @@
         <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>
             <!-- 全部状态 -->
@@ -515,6 +595,7 @@
               v-for=" column of allColums " v-if=" $props.statusName === '全部' " :key=" column.value "
               :label=" column.text " :prop=" column.value " :align=" column.align "
               :show-overflow-tooltip="true"
+              :sortable="column.sortable"
             >
               <template #default=" scope ">
                 <span>
@@ -580,6 +661,7 @@
       </div>
       <div v-if=" !tableFlage ">
         <!-- 展开行表格 -->
+        <!-- 头部 -->
         <normal-table
           v-show=" !tableFlage " class="nortable-header" :data=" [] " :total=" 0 " :columns=" columns " :options="
             {
@@ -587,21 +669,81 @@
               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
+              <!-- 展开表格身体 -->
+              <!-- <normal-table
                 :data=" expandList " :total=" 0 " :columns=" columns " :list-loading=" expandLoading " :options="
                   {
                     needIndex: false, // 是否需要序号列
                     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/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 3b6f68d..4aea391 100644
--- a/.env.development
+++ b/.env.development
@@ -3,8 +3,8 @@
 VITE_SYS_TITLE = 受检设备管理系统
 # 接口请求地址，会设置到 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://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
+VITE_APP_API_BASEURL = http://192.168.8.101:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
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/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/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..9804827 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`
   }
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..a41ea11 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -30,7 +30,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/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/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index f419e99..26f705d 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -28,7 +28,7 @@
   未通过: '5',
   已取消: '6',
 })
-const normalTableRef= ref()
+const normalTableRef = ref()
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive<IlistQueryType>({
   certificateValidStart: '',
@@ -49,6 +49,7 @@
     text: '统一编号',
     value: 'equipmentNo',
     align: 'center',
+    sortable: 'custom',
   },
   {
     text: '设备名称',
@@ -59,11 +60,13 @@
     text: '型号规格',
     value: 'model',
     align: 'center',
+    sortable: 'custom',
   },
   {
     text: '出厂编号',
     value: 'manufactureNo',
     align: 'center',
+    sortable: 'custom',
   },
   {
     text: '使用岗位',
@@ -84,6 +87,7 @@
     text: '证书有效期',
     value: 'certificateValid',
     align: 'center',
+    sortable: 'custom',
   },
 ])
 const allColums = ref([
@@ -91,6 +95,7 @@
     text: '使用状态',
     value: 'usageStatusName',
     align: 'center',
+    sortable: 'custom',
   },
   {
     text: '备注',
@@ -120,6 +125,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)
@@ -156,7 +176,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`
   }
@@ -208,12 +228,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[]>([])
 // 表格多选
@@ -239,6 +276,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) => {
@@ -507,7 +586,8 @@
         <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>
             <!-- 全部状态 -->
@@ -515,6 +595,7 @@
               v-for=" column of allColums " v-if=" $props.statusName === '全部' " :key=" column.value "
               :label=" column.text " :prop=" column.value " :align=" column.align "
               :show-overflow-tooltip="true"
+              :sortable="column.sortable"
             >
               <template #default=" scope ">
                 <span>
@@ -580,6 +661,7 @@
       </div>
       <div v-if=" !tableFlage ">
         <!-- 展开行表格 -->
+        <!-- 头部 -->
         <normal-table
           v-show=" !tableFlage " class="nortable-header" :data=" [] " :total=" 0 " :columns=" columns " :options="
             {
@@ -587,21 +669,81 @@
               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
+              <!-- 展开表格身体 -->
+              <!-- <normal-table
                 :data=" expandList " :total=" 0 " :columns=" columns " :list-loading=" expandLoading " :options="
                   {
                     needIndex: false, // 是否需要序号列
                     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/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 3b6f68d..4aea391 100644
--- a/.env.development
+++ b/.env.development
@@ -3,8 +3,8 @@
 VITE_SYS_TITLE = 受检设备管理系统
 # 接口请求地址，会设置到 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://192.168.8.107:5909
+# VITE_APP_API_BASEURL = http://111.198.10.15:21611
+VITE_APP_API_BASEURL = http://192.168.8.101:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
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/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/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..9804827 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`
   }
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..a41ea11 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -30,7 +30,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/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/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index f419e99..26f705d 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -28,7 +28,7 @@
   未通过: '5',
   已取消: '6',
 })
-const normalTableRef= ref()
+const normalTableRef = ref()
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive<IlistQueryType>({
   certificateValidStart: '',
@@ -49,6 +49,7 @@
     text: '统一编号',
     value: 'equipmentNo',
     align: 'center',
+    sortable: 'custom',
   },
   {
     text: '设备名称',
@@ -59,11 +60,13 @@
     text: '型号规格',
     value: 'model',
     align: 'center',
+    sortable: 'custom',
   },
   {
     text: '出厂编号',
     value: 'manufactureNo',
     align: 'center',
+    sortable: 'custom',
   },
   {
     text: '使用岗位',
@@ -84,6 +87,7 @@
     text: '证书有效期',
     value: 'certificateValid',
     align: 'center',
+    sortable: 'custom',
   },
 ])
 const allColums = ref([
@@ -91,6 +95,7 @@
     text: '使用状态',
     value: 'usageStatusName',
     align: 'center',
+    sortable: 'custom',
   },
   {
     text: '备注',
@@ -120,6 +125,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)
@@ -156,7 +176,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`
   }
@@ -208,12 +228,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[]>([])
 // 表格多选
@@ -239,6 +276,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) => {
@@ -507,7 +586,8 @@
         <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>
             <!-- 全部状态 -->
@@ -515,6 +595,7 @@
               v-for=" column of allColums " v-if=" $props.statusName === '全部' " :key=" column.value "
               :label=" column.text " :prop=" column.value " :align=" column.align "
               :show-overflow-tooltip="true"
+              :sortable="column.sortable"
             >
               <template #default=" scope ">
                 <span>
@@ -580,6 +661,7 @@
       </div>
       <div v-if=" !tableFlage ">
         <!-- 展开行表格 -->
+        <!-- 头部 -->
         <normal-table
           v-show=" !tableFlage " class="nortable-header" :data=" [] " :total=" 0 " :columns=" columns " :options="
             {
@@ -587,21 +669,81 @@
               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
+              <!-- 展开表格身体 -->
+              <!-- <normal-table
                 :data=" expandList " :total=" 0 " :columns=" columns " :list-loading=" expandLoading " :options="
                   {
                     needIndex: false, // 是否需要序号列
                     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/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`
   }