diff --git a/public/config/config.json b/public/config/config.json
index 5a9615a..32d78df 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"计量业务系统",
-  "versionByEqpt":"1.2.0.6",
+  "versionByEqpt":"1.2.0.7",
   "baseUrl": "http://111.198.10.15:21611",
   "baseUrlBusiness": "http://111.198.10.15:21606",
   "baseUrlLaboratory": "http://111.198.10.15:21610",

diff --git a/public/config/config.json b/public/config/config.json
index 5a9615a..32d78df 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"计量业务系统",
-  "versionByEqpt":"1.2.0.6",
+  "versionByEqpt":"1.2.0.7",
   "baseUrl": "http://111.198.10.15:21611",
   "baseUrlBusiness": "http://111.198.10.15:21606",
   "baseUrlLaboratory": "http://111.198.10.15:21610",
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index 95d6051..97c2534 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -262,7 +262,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="140" fixed="right">
             <template #default="{ row }">
-              <el-button v-if="proxy.hasPerm('/sys/notice/list/detail')" type="primary" link size="small" @click="detail(row)">
+              <el-button type="primary" link size="small" @click="detail(row)">
                 查看
               </el-button>
               <el-button v-if="proxy.hasPerm('/sys/notice/list/update')" type="primary" link size="small" @click="update(row)">

diff --git a/public/config/config.json b/public/config/config.json
index 5a9615a..32d78df 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"计量业务系统",
-  "versionByEqpt":"1.2.0.6",
+  "versionByEqpt":"1.2.0.7",
   "baseUrl": "http://111.198.10.15:21611",
   "baseUrlBusiness": "http://111.198.10.15:21606",
   "baseUrlLaboratory": "http://111.198.10.15:21610",
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index 95d6051..97c2534 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -262,7 +262,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="140" fixed="right">
             <template #default="{ row }">
-              <el-button v-if="proxy.hasPerm('/sys/notice/list/detail')" type="primary" link size="small" @click="detail(row)">
+              <el-button type="primary" link size="small" @click="detail(row)">
                 查看
               </el-button>
               <el-button v-if="proxy.hasPerm('/sys/notice/list/update')" type="primary" link size="small" @click="update(row)">
diff --git a/src/views/tested/MeasurementPlan/task/index.vue b/src/views/tested/MeasurementPlan/task/index.vue
index e45b72c..b7d8f60 100644
--- a/src/views/tested/MeasurementPlan/task/index.vue
+++ b/src/views/tested/MeasurementPlan/task/index.vue
@@ -273,9 +273,9 @@
               <el-button v-if="proxy.hasPerm(permUrl.edit)" link type="primary" :disabled="scope.row.receiveStatusName !== '未接收'" size="small" @click="handler(scope.row, 'update')">
                 编辑
               </el-button>
-              <el-button v-if="proxy.hasPerm(permUrl.cancel)" link type="danger" size="small" @click="cancelHandler(scope.row)">
+              <!-- <el-button v-if="proxy.hasPerm(permUrl.cancel)" :disabled="scope.row.receiveStatusName !== '未接收'" link type="danger" size="small" @click="cancelHandler(scope.row)">
                 取消
-              </el-button>
+              </el-button> -->
             </template>
           </el-table-column>
         </template>

diff --git a/public/config/config.json b/public/config/config.json
index 5a9615a..32d78df 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"计量业务系统",
-  "versionByEqpt":"1.2.0.6",
+  "versionByEqpt":"1.2.0.7",
   "baseUrl": "http://111.198.10.15:21611",
   "baseUrlBusiness": "http://111.198.10.15:21606",
   "baseUrlLaboratory": "http://111.198.10.15:21610",
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index 95d6051..97c2534 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -262,7 +262,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="140" fixed="right">
             <template #default="{ row }">
-              <el-button v-if="proxy.hasPerm('/sys/notice/list/detail')" type="primary" link size="small" @click="detail(row)">
+              <el-button type="primary" link size="small" @click="detail(row)">
                 查看
               </el-button>
               <el-button v-if="proxy.hasPerm('/sys/notice/list/update')" type="primary" link size="small" @click="update(row)">
diff --git a/src/views/tested/MeasurementPlan/task/index.vue b/src/views/tested/MeasurementPlan/task/index.vue
index e45b72c..b7d8f60 100644
--- a/src/views/tested/MeasurementPlan/task/index.vue
+++ b/src/views/tested/MeasurementPlan/task/index.vue
@@ -273,9 +273,9 @@
               <el-button v-if="proxy.hasPerm(permUrl.edit)" link type="primary" :disabled="scope.row.receiveStatusName !== '未接收'" size="small" @click="handler(scope.row, 'update')">
                 编辑
               </el-button>
-              <el-button v-if="proxy.hasPerm(permUrl.cancel)" link type="danger" size="small" @click="cancelHandler(scope.row)">
+              <!-- <el-button v-if="proxy.hasPerm(permUrl.cancel)" :disabled="scope.row.receiveStatusName !== '未接收'" link type="danger" size="small" @click="cancelHandler(scope.row)">
                 取消
-              </el-button>
+              </el-button> -->
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/tested/dashboard/components/tableList.vue b/src/views/tested/dashboard/components/tableList.vue
index aa72de1..87aab0a 100644
--- a/src/views/tested/dashboard/components/tableList.vue
+++ b/src/views/tested/dashboard/components/tableList.vue
@@ -80,6 +80,9 @@
     .time {
       width: 40%;
       text-align: right;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
     }
   }
 }

diff --git a/public/config/config.json b/public/config/config.json
index 5a9615a..32d78df 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"计量业务系统",
-  "versionByEqpt":"1.2.0.6",
+  "versionByEqpt":"1.2.0.7",
   "baseUrl": "http://111.198.10.15:21611",
   "baseUrlBusiness": "http://111.198.10.15:21606",
   "baseUrlLaboratory": "http://111.198.10.15:21610",
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index 95d6051..97c2534 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -262,7 +262,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="140" fixed="right">
             <template #default="{ row }">
-              <el-button v-if="proxy.hasPerm('/sys/notice/list/detail')" type="primary" link size="small" @click="detail(row)">
+              <el-button type="primary" link size="small" @click="detail(row)">
                 查看
               </el-button>
               <el-button v-if="proxy.hasPerm('/sys/notice/list/update')" type="primary" link size="small" @click="update(row)">
diff --git a/src/views/tested/MeasurementPlan/task/index.vue b/src/views/tested/MeasurementPlan/task/index.vue
index e45b72c..b7d8f60 100644
--- a/src/views/tested/MeasurementPlan/task/index.vue
+++ b/src/views/tested/MeasurementPlan/task/index.vue
@@ -273,9 +273,9 @@
               <el-button v-if="proxy.hasPerm(permUrl.edit)" link type="primary" :disabled="scope.row.receiveStatusName !== '未接收'" size="small" @click="handler(scope.row, 'update')">
                 编辑
               </el-button>
-              <el-button v-if="proxy.hasPerm(permUrl.cancel)" link type="danger" size="small" @click="cancelHandler(scope.row)">
+              <!-- <el-button v-if="proxy.hasPerm(permUrl.cancel)" :disabled="scope.row.receiveStatusName !== '未接收'" link type="danger" size="small" @click="cancelHandler(scope.row)">
                 取消
-              </el-button>
+              </el-button> -->
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/tested/dashboard/components/tableList.vue b/src/views/tested/dashboard/components/tableList.vue
index aa72de1..87aab0a 100644
--- a/src/views/tested/dashboard/components/tableList.vue
+++ b/src/views/tested/dashboard/components/tableList.vue
@@ -80,6 +80,9 @@
     .time {
       width: 40%;
       text-align: right;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
     }
   }
 }
diff --git a/src/views/tested/dashboard/index.vue b/src/views/tested/dashboard/index.vue
index d89cfd5..08855da 100644
--- a/src/views/tested/dashboard/index.vue
+++ b/src/views/tested/dashboard/index.vue
@@ -209,14 +209,14 @@
     resizePage()
   })
 }
-fecthDeviceDetail(user.deptId)
+fecthDeviceDetail('')
 // 设备详情搜索
 const searchDeviceDetail = () => {
   if (Devicedept.value) {
     fecthDeviceDetail(Devicedept.value)
   }
   else {
-    fecthDeviceDetail(user.deptId)
+    fecthDeviceDetail('')
   }
 }
 // -----------------------------------------设备状态-------------------------------------
@@ -295,15 +295,15 @@
   const table = scrollTable.value
   // 拿到表格中承载数据的div元素
   const divData = table?.$refs.bodyWrapper.getElementsByClassName('el-scrollbar__wrap')[0]
-
+  console.log(divData, 'divData')
   // 拿到元素后，对元素进行定时增加距离顶部距离，实现滚动效果(此配置为每100毫秒移动1像素)
-  if (stop) {
+  if (stop || list.length < 5) {
     // 再通过事件监听，监听到 组件销毁 后，再执行关闭计时器。
     window.clearInterval(scrolltimer.value)
     scrolltimer.value = null
   }
   else {
-    if (list.length < 5 && stop) {
+    if (list.length < 5 || stop) {
       return
     }
     if (divData) {
@@ -384,6 +384,9 @@
     else {
       inCheckTable.value = data.deptList
     }
+    if (inCheckTable.value.length) {
+      autoScroll(false, inCheckTable.value)
+    }
     resizePage()
   })
   // 待检设备
@@ -415,6 +418,9 @@
     else {
       toCheckTable.value = data.deptList
     }
+    if (toCheckTable.value.length) {
+      autoScroll(false, toCheckTable.value)
+    }
     resizePage()
   })
   // 再用设备
@@ -428,14 +434,14 @@
     resizePage()
   })
 }
-fecthDeviceStatus(user.deptId)
+fecthDeviceStatus('')
 // 设备状态搜索
 const searchDeviceStatus = () => {
   if (tableDept.value) {
     fecthDeviceStatus(tableDept.value)
   }
   else {
-    fecthDeviceStatus(user.deptId)
+    fecthDeviceStatus('')
   }
   resizePage()
 }

diff --git a/public/config/config.json b/public/config/config.json
index 5a9615a..32d78df 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"计量业务系统",
-  "versionByEqpt":"1.2.0.6",
+  "versionByEqpt":"1.2.0.7",
   "baseUrl": "http://111.198.10.15:21611",
   "baseUrlBusiness": "http://111.198.10.15:21606",
   "baseUrlLaboratory": "http://111.198.10.15:21610",
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index 95d6051..97c2534 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -262,7 +262,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="140" fixed="right">
             <template #default="{ row }">
-              <el-button v-if="proxy.hasPerm('/sys/notice/list/detail')" type="primary" link size="small" @click="detail(row)">
+              <el-button type="primary" link size="small" @click="detail(row)">
                 查看
               </el-button>
               <el-button v-if="proxy.hasPerm('/sys/notice/list/update')" type="primary" link size="small" @click="update(row)">
diff --git a/src/views/tested/MeasurementPlan/task/index.vue b/src/views/tested/MeasurementPlan/task/index.vue
index e45b72c..b7d8f60 100644
--- a/src/views/tested/MeasurementPlan/task/index.vue
+++ b/src/views/tested/MeasurementPlan/task/index.vue
@@ -273,9 +273,9 @@
               <el-button v-if="proxy.hasPerm(permUrl.edit)" link type="primary" :disabled="scope.row.receiveStatusName !== '未接收'" size="small" @click="handler(scope.row, 'update')">
                 编辑
               </el-button>
-              <el-button v-if="proxy.hasPerm(permUrl.cancel)" link type="danger" size="small" @click="cancelHandler(scope.row)">
+              <!-- <el-button v-if="proxy.hasPerm(permUrl.cancel)" :disabled="scope.row.receiveStatusName !== '未接收'" link type="danger" size="small" @click="cancelHandler(scope.row)">
                 取消
-              </el-button>
+              </el-button> -->
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/tested/dashboard/components/tableList.vue b/src/views/tested/dashboard/components/tableList.vue
index aa72de1..87aab0a 100644
--- a/src/views/tested/dashboard/components/tableList.vue
+++ b/src/views/tested/dashboard/components/tableList.vue
@@ -80,6 +80,9 @@
     .time {
       width: 40%;
       text-align: right;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
     }
   }
 }
diff --git a/src/views/tested/dashboard/index.vue b/src/views/tested/dashboard/index.vue
index d89cfd5..08855da 100644
--- a/src/views/tested/dashboard/index.vue
+++ b/src/views/tested/dashboard/index.vue
@@ -209,14 +209,14 @@
     resizePage()
   })
 }
-fecthDeviceDetail(user.deptId)
+fecthDeviceDetail('')
 // 设备详情搜索
 const searchDeviceDetail = () => {
   if (Devicedept.value) {
     fecthDeviceDetail(Devicedept.value)
   }
   else {
-    fecthDeviceDetail(user.deptId)
+    fecthDeviceDetail('')
   }
 }
 // -----------------------------------------设备状态-------------------------------------
@@ -295,15 +295,15 @@
   const table = scrollTable.value
   // 拿到表格中承载数据的div元素
   const divData = table?.$refs.bodyWrapper.getElementsByClassName('el-scrollbar__wrap')[0]
-
+  console.log(divData, 'divData')
   // 拿到元素后，对元素进行定时增加距离顶部距离，实现滚动效果(此配置为每100毫秒移动1像素)
-  if (stop) {
+  if (stop || list.length < 5) {
     // 再通过事件监听，监听到 组件销毁 后，再执行关闭计时器。
     window.clearInterval(scrolltimer.value)
     scrolltimer.value = null
   }
   else {
-    if (list.length < 5 && stop) {
+    if (list.length < 5 || stop) {
       return
     }
     if (divData) {
@@ -384,6 +384,9 @@
     else {
       inCheckTable.value = data.deptList
     }
+    if (inCheckTable.value.length) {
+      autoScroll(false, inCheckTable.value)
+    }
     resizePage()
   })
   // 待检设备
@@ -415,6 +418,9 @@
     else {
       toCheckTable.value = data.deptList
     }
+    if (toCheckTable.value.length) {
+      autoScroll(false, toCheckTable.value)
+    }
     resizePage()
   })
   // 再用设备
@@ -428,14 +434,14 @@
     resizePage()
   })
 }
-fecthDeviceStatus(user.deptId)
+fecthDeviceStatus('')
 // 设备状态搜索
 const searchDeviceStatus = () => {
   if (tableDept.value) {
     fecthDeviceStatus(tableDept.value)
   }
   else {
-    fecthDeviceStatus(user.deptId)
+    fecthDeviceStatus('')
   }
   resizePage()
 }
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index b652d63..143793b 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -113,16 +113,28 @@
     align: 'center',
   },
 ])
+const statusDict = ref<{ [key: string]: string[] }>({
+  1: ['在用', '禁用', '延用'], // 封存
+  2: ['禁用', '封存'], // 启封
+  3: ['在用', '延用'], // 禁用
+  4: ['在用', '禁用', '封存', '延用'], // 报废
+  5: ['在用', '禁用'], // 沿用
+})
 // 获取使用状态列表
 const useStatusList = ref()
 const fetchUseStatus = () => {
   getDictByCode('eqptDeviceUseStatus').then((res) => {
-    useStatusList.value = res.data
+    if ($props.needStatus) {
+      useStatusList.value = res.data.filter((item: any) => statusDict.value[$props.statusType].includes(item.name))
+    }
+    else {
+      useStatusList.value = res.data
+    }
   })
 }
-fetchUseStatus()
 // 获取数据列表
 const fetchData = () => {
+  fetchUseStatus()
   select.value = -1
   loadingTable.value = true
   // 判断是否需要加入设备使用状态查询条件
@@ -139,14 +151,14 @@
         data.usageStatusList = ['1', '3']
         break
       case '3':
-        data.usageStatusList = ['0', '3']
-        break
-      case '4':
         data.usageStatusList = ['0', '4']
         break
-      case '5':
+      case '4':
         data.usageStatusList = ['0', '1', '3', '4']
         break
+      case '5':
+        data.usageStatusList = ['0', '1']
+        break
     }
   }
   getInfoListPage(data, '全部').then((response) => {

diff --git a/public/config/config.json b/public/config/config.json
index 5a9615a..32d78df 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"计量业务系统",
-  "versionByEqpt":"1.2.0.6",
+  "versionByEqpt":"1.2.0.7",
   "baseUrl": "http://111.198.10.15:21611",
   "baseUrlBusiness": "http://111.198.10.15:21606",
   "baseUrlLaboratory": "http://111.198.10.15:21610",
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index 95d6051..97c2534 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -262,7 +262,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="140" fixed="right">
             <template #default="{ row }">
-              <el-button v-if="proxy.hasPerm('/sys/notice/list/detail')" type="primary" link size="small" @click="detail(row)">
+              <el-button type="primary" link size="small" @click="detail(row)">
                 查看
               </el-button>
               <el-button v-if="proxy.hasPerm('/sys/notice/list/update')" type="primary" link size="small" @click="update(row)">
diff --git a/src/views/tested/MeasurementPlan/task/index.vue b/src/views/tested/MeasurementPlan/task/index.vue
index e45b72c..b7d8f60 100644
--- a/src/views/tested/MeasurementPlan/task/index.vue
+++ b/src/views/tested/MeasurementPlan/task/index.vue
@@ -273,9 +273,9 @@
               <el-button v-if="proxy.hasPerm(permUrl.edit)" link type="primary" :disabled="scope.row.receiveStatusName !== '未接收'" size="small" @click="handler(scope.row, 'update')">
                 编辑
               </el-button>
-              <el-button v-if="proxy.hasPerm(permUrl.cancel)" link type="danger" size="small" @click="cancelHandler(scope.row)">
+              <!-- <el-button v-if="proxy.hasPerm(permUrl.cancel)" :disabled="scope.row.receiveStatusName !== '未接收'" link type="danger" size="small" @click="cancelHandler(scope.row)">
                 取消
-              </el-button>
+              </el-button> -->
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/tested/dashboard/components/tableList.vue b/src/views/tested/dashboard/components/tableList.vue
index aa72de1..87aab0a 100644
--- a/src/views/tested/dashboard/components/tableList.vue
+++ b/src/views/tested/dashboard/components/tableList.vue
@@ -80,6 +80,9 @@
     .time {
       width: 40%;
       text-align: right;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
     }
   }
 }
diff --git a/src/views/tested/dashboard/index.vue b/src/views/tested/dashboard/index.vue
index d89cfd5..08855da 100644
--- a/src/views/tested/dashboard/index.vue
+++ b/src/views/tested/dashboard/index.vue
@@ -209,14 +209,14 @@
     resizePage()
   })
 }
-fecthDeviceDetail(user.deptId)
+fecthDeviceDetail('')
 // 设备详情搜索
 const searchDeviceDetail = () => {
   if (Devicedept.value) {
     fecthDeviceDetail(Devicedept.value)
   }
   else {
-    fecthDeviceDetail(user.deptId)
+    fecthDeviceDetail('')
   }
 }
 // -----------------------------------------设备状态-------------------------------------
@@ -295,15 +295,15 @@
   const table = scrollTable.value
   // 拿到表格中承载数据的div元素
   const divData = table?.$refs.bodyWrapper.getElementsByClassName('el-scrollbar__wrap')[0]
-
+  console.log(divData, 'divData')
   // 拿到元素后，对元素进行定时增加距离顶部距离，实现滚动效果(此配置为每100毫秒移动1像素)
-  if (stop) {
+  if (stop || list.length < 5) {
     // 再通过事件监听，监听到 组件销毁 后，再执行关闭计时器。
     window.clearInterval(scrolltimer.value)
     scrolltimer.value = null
   }
   else {
-    if (list.length < 5 && stop) {
+    if (list.length < 5 || stop) {
       return
     }
     if (divData) {
@@ -384,6 +384,9 @@
     else {
       inCheckTable.value = data.deptList
     }
+    if (inCheckTable.value.length) {
+      autoScroll(false, inCheckTable.value)
+    }
     resizePage()
   })
   // 待检设备
@@ -415,6 +418,9 @@
     else {
       toCheckTable.value = data.deptList
     }
+    if (toCheckTable.value.length) {
+      autoScroll(false, toCheckTable.value)
+    }
     resizePage()
   })
   // 再用设备
@@ -428,14 +434,14 @@
     resizePage()
   })
 }
-fecthDeviceStatus(user.deptId)
+fecthDeviceStatus('')
 // 设备状态搜索
 const searchDeviceStatus = () => {
   if (tableDept.value) {
     fecthDeviceStatus(tableDept.value)
   }
   else {
-    fecthDeviceStatus(user.deptId)
+    fecthDeviceStatus('')
   }
   resizePage()
 }
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index b652d63..143793b 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -113,16 +113,28 @@
     align: 'center',
   },
 ])
+const statusDict = ref<{ [key: string]: string[] }>({
+  1: ['在用', '禁用', '延用'], // 封存
+  2: ['禁用', '封存'], // 启封
+  3: ['在用', '延用'], // 禁用
+  4: ['在用', '禁用', '封存', '延用'], // 报废
+  5: ['在用', '禁用'], // 沿用
+})
 // 获取使用状态列表
 const useStatusList = ref()
 const fetchUseStatus = () => {
   getDictByCode('eqptDeviceUseStatus').then((res) => {
-    useStatusList.value = res.data
+    if ($props.needStatus) {
+      useStatusList.value = res.data.filter((item: any) => statusDict.value[$props.statusType].includes(item.name))
+    }
+    else {
+      useStatusList.value = res.data
+    }
   })
 }
-fetchUseStatus()
 // 获取数据列表
 const fetchData = () => {
+  fetchUseStatus()
   select.value = -1
   loadingTable.value = true
   // 判断是否需要加入设备使用状态查询条件
@@ -139,14 +151,14 @@
         data.usageStatusList = ['1', '3']
         break
       case '3':
-        data.usageStatusList = ['0', '3']
-        break
-      case '4':
         data.usageStatusList = ['0', '4']
         break
-      case '5':
+      case '4':
         data.usageStatusList = ['0', '1', '3', '4']
         break
+      case '5':
+        data.usageStatusList = ['0', '1']
+        break
     }
   }
   getInfoListPage(data, '全部').then((response) => {
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index e49461e..5d34aa3 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -942,6 +942,7 @@
                   size="large"
                   active-value="1"
                   inactive-value="0"
+                  :disabled="$route.path.includes('update')"
                 />
               </el-form-item>
             </el-col>
@@ -963,7 +964,7 @@
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="检定(校准)机构" prop="checkOrganization">
-                <el-input v-model.trim="ruleForm.checkOrganization" />
+                <el-input v-model.trim="ruleForm.checkOrganization" :disabled="$route.path.includes('update')" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -971,6 +972,7 @@
                 <el-date-picker
                   v-model="ruleForm.checkDate" type="date" format="YYYY-MM-DD"
                   value-format="YYYY-MM-DD" placeholder="请选择检定(校准)日期" class="normal-date" style="width: 100%;"
+                  :disabled="$route.path.includes('update')"
                 />
               </el-form-item>
             </el-col>
@@ -979,13 +981,14 @@
                 <el-date-picker
                   v-model="ruleForm.certificateValid" type="date" format="YYYY-MM-DD"
                   value-format="YYYY-MM-DD" placeholder="请选择证书有效期" class="normal-date" style="width: 100%;"
+                  :disabled="$route.path.includes('update')"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="计量标识" prop="meterIdentify">
                 <!-- <el-input v-model.trim="ruleForm.meterIdentify" /> -->
-                <el-select v-model="ruleForm.meterIdentify" placeholder="选择计量标识" style="width: 100%;">
+                <el-select v-model="ruleForm.meterIdentify" placeholder="选择计量标识" style="width: 100%;" :disabled="$route.path.includes('update')">
                   <el-option v-for="item in meterIdentifyList" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>

diff --git a/public/config/config.json b/public/config/config.json
index 5a9615a..32d78df 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"计量业务系统",
-  "versionByEqpt":"1.2.0.6",
+  "versionByEqpt":"1.2.0.7",
   "baseUrl": "http://111.198.10.15:21611",
   "baseUrlBusiness": "http://111.198.10.15:21606",
   "baseUrlLaboratory": "http://111.198.10.15:21610",
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index 95d6051..97c2534 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -262,7 +262,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="140" fixed="right">
             <template #default="{ row }">
-              <el-button v-if="proxy.hasPerm('/sys/notice/list/detail')" type="primary" link size="small" @click="detail(row)">
+              <el-button type="primary" link size="small" @click="detail(row)">
                 查看
               </el-button>
               <el-button v-if="proxy.hasPerm('/sys/notice/list/update')" type="primary" link size="small" @click="update(row)">
diff --git a/src/views/tested/MeasurementPlan/task/index.vue b/src/views/tested/MeasurementPlan/task/index.vue
index e45b72c..b7d8f60 100644
--- a/src/views/tested/MeasurementPlan/task/index.vue
+++ b/src/views/tested/MeasurementPlan/task/index.vue
@@ -273,9 +273,9 @@
               <el-button v-if="proxy.hasPerm(permUrl.edit)" link type="primary" :disabled="scope.row.receiveStatusName !== '未接收'" size="small" @click="handler(scope.row, 'update')">
                 编辑
               </el-button>
-              <el-button v-if="proxy.hasPerm(permUrl.cancel)" link type="danger" size="small" @click="cancelHandler(scope.row)">
+              <!-- <el-button v-if="proxy.hasPerm(permUrl.cancel)" :disabled="scope.row.receiveStatusName !== '未接收'" link type="danger" size="small" @click="cancelHandler(scope.row)">
                 取消
-              </el-button>
+              </el-button> -->
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/tested/dashboard/components/tableList.vue b/src/views/tested/dashboard/components/tableList.vue
index aa72de1..87aab0a 100644
--- a/src/views/tested/dashboard/components/tableList.vue
+++ b/src/views/tested/dashboard/components/tableList.vue
@@ -80,6 +80,9 @@
     .time {
       width: 40%;
       text-align: right;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
     }
   }
 }
diff --git a/src/views/tested/dashboard/index.vue b/src/views/tested/dashboard/index.vue
index d89cfd5..08855da 100644
--- a/src/views/tested/dashboard/index.vue
+++ b/src/views/tested/dashboard/index.vue
@@ -209,14 +209,14 @@
     resizePage()
   })
 }
-fecthDeviceDetail(user.deptId)
+fecthDeviceDetail('')
 // 设备详情搜索
 const searchDeviceDetail = () => {
   if (Devicedept.value) {
     fecthDeviceDetail(Devicedept.value)
   }
   else {
-    fecthDeviceDetail(user.deptId)
+    fecthDeviceDetail('')
   }
 }
 // -----------------------------------------设备状态-------------------------------------
@@ -295,15 +295,15 @@
   const table = scrollTable.value
   // 拿到表格中承载数据的div元素
   const divData = table?.$refs.bodyWrapper.getElementsByClassName('el-scrollbar__wrap')[0]
-
+  console.log(divData, 'divData')
   // 拿到元素后，对元素进行定时增加距离顶部距离，实现滚动效果(此配置为每100毫秒移动1像素)
-  if (stop) {
+  if (stop || list.length < 5) {
     // 再通过事件监听，监听到 组件销毁 后，再执行关闭计时器。
     window.clearInterval(scrolltimer.value)
     scrolltimer.value = null
   }
   else {
-    if (list.length < 5 && stop) {
+    if (list.length < 5 || stop) {
       return
     }
     if (divData) {
@@ -384,6 +384,9 @@
     else {
       inCheckTable.value = data.deptList
     }
+    if (inCheckTable.value.length) {
+      autoScroll(false, inCheckTable.value)
+    }
     resizePage()
   })
   // 待检设备
@@ -415,6 +418,9 @@
     else {
       toCheckTable.value = data.deptList
     }
+    if (toCheckTable.value.length) {
+      autoScroll(false, toCheckTable.value)
+    }
     resizePage()
   })
   // 再用设备
@@ -428,14 +434,14 @@
     resizePage()
   })
 }
-fecthDeviceStatus(user.deptId)
+fecthDeviceStatus('')
 // 设备状态搜索
 const searchDeviceStatus = () => {
   if (tableDept.value) {
     fecthDeviceStatus(tableDept.value)
   }
   else {
-    fecthDeviceStatus(user.deptId)
+    fecthDeviceStatus('')
   }
   resizePage()
 }
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index b652d63..143793b 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -113,16 +113,28 @@
     align: 'center',
   },
 ])
+const statusDict = ref<{ [key: string]: string[] }>({
+  1: ['在用', '禁用', '延用'], // 封存
+  2: ['禁用', '封存'], // 启封
+  3: ['在用', '延用'], // 禁用
+  4: ['在用', '禁用', '封存', '延用'], // 报废
+  5: ['在用', '禁用'], // 沿用
+})
 // 获取使用状态列表
 const useStatusList = ref()
 const fetchUseStatus = () => {
   getDictByCode('eqptDeviceUseStatus').then((res) => {
-    useStatusList.value = res.data
+    if ($props.needStatus) {
+      useStatusList.value = res.data.filter((item: any) => statusDict.value[$props.statusType].includes(item.name))
+    }
+    else {
+      useStatusList.value = res.data
+    }
   })
 }
-fetchUseStatus()
 // 获取数据列表
 const fetchData = () => {
+  fetchUseStatus()
   select.value = -1
   loadingTable.value = true
   // 判断是否需要加入设备使用状态查询条件
@@ -139,14 +151,14 @@
         data.usageStatusList = ['1', '3']
         break
       case '3':
-        data.usageStatusList = ['0', '3']
-        break
-      case '4':
         data.usageStatusList = ['0', '4']
         break
-      case '5':
+      case '4':
         data.usageStatusList = ['0', '1', '3', '4']
         break
+      case '5':
+        data.usageStatusList = ['0', '1']
+        break
     }
   }
   getInfoListPage(data, '全部').then((response) => {
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index e49461e..5d34aa3 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -942,6 +942,7 @@
                   size="large"
                   active-value="1"
                   inactive-value="0"
+                  :disabled="$route.path.includes('update')"
                 />
               </el-form-item>
             </el-col>
@@ -963,7 +964,7 @@
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="检定(校准)机构" prop="checkOrganization">
-                <el-input v-model.trim="ruleForm.checkOrganization" />
+                <el-input v-model.trim="ruleForm.checkOrganization" :disabled="$route.path.includes('update')" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -971,6 +972,7 @@
                 <el-date-picker
                   v-model="ruleForm.checkDate" type="date" format="YYYY-MM-DD"
                   value-format="YYYY-MM-DD" placeholder="请选择检定(校准)日期" class="normal-date" style="width: 100%;"
+                  :disabled="$route.path.includes('update')"
                 />
               </el-form-item>
             </el-col>
@@ -979,13 +981,14 @@
                 <el-date-picker
                   v-model="ruleForm.certificateValid" type="date" format="YYYY-MM-DD"
                   value-format="YYYY-MM-DD" placeholder="请选择证书有效期" class="normal-date" style="width: 100%;"
+                  :disabled="$route.path.includes('update')"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="计量标识" prop="meterIdentify">
                 <!-- <el-input v-model.trim="ruleForm.meterIdentify" /> -->
-                <el-select v-model="ruleForm.meterIdentify" placeholder="选择计量标识" style="width: 100%;">
+                <el-select v-model="ruleForm.meterIdentify" placeholder="选择计量标识" style="width: 100%;" :disabled="$route.path.includes('update')">
                   <el-option v-for="item in meterIdentifyList" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
diff --git a/src/views/tested/subpackage/certificate/index.vue b/src/views/tested/subpackage/certificate/index.vue
index 915558a..39eff94 100644
--- a/src/views/tested/subpackage/certificate/index.vue
+++ b/src/views/tested/subpackage/certificate/index.vue
@@ -83,7 +83,7 @@
     align: 'center',
   },
   {
-    text: '检定(校准)目期',
+    text: '检定(校准)日期',
     value: 'checkDate',
     align: 'center',
   },