diff --git a/src/components/DetailPage/DetailBlockCom.vue b/src/components/DetailPage/DetailBlockCom.vue
index 13bd2aa..3eee911 100644
--- a/src/components/DetailPage/DetailBlockCom.vue
+++ b/src/components/DetailPage/DetailBlockCom.vue
@@ -40,7 +40,7 @@
 
   .content {
     background-color: #fff;
-    // padding: 0 10px 20px;
+    padding: 0 10px 20px;
     margin-top: 10px;
   }
 }

diff --git a/src/components/DetailPage/DetailBlockCom.vue b/src/components/DetailPage/DetailBlockCom.vue
index 13bd2aa..3eee911 100644
--- a/src/components/DetailPage/DetailBlockCom.vue
+++ b/src/components/DetailPage/DetailBlockCom.vue
@@ -40,7 +40,7 @@
 
   .content {
     background-color: #fff;
-    // padding: 0 10px 20px;
+    padding: 0 10px 20px;
     margin-top: 10px;
   }
 }
diff --git a/src/views/tested/MeasurementPlan/board/index.vue b/src/views/tested/MeasurementPlan/board/index.vue
index a8f61aa..d632088 100644
--- a/src/views/tested/MeasurementPlan/board/index.vue
+++ b/src/views/tested/MeasurementPlan/board/index.vue
@@ -1,5 +1,5 @@
 <!-- 业务看板 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="BoardList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/measurementPlan/task'

diff --git a/src/components/DetailPage/DetailBlockCom.vue b/src/components/DetailPage/DetailBlockCom.vue
index 13bd2aa..3eee911 100644
--- a/src/components/DetailPage/DetailBlockCom.vue
+++ b/src/components/DetailPage/DetailBlockCom.vue
@@ -40,7 +40,7 @@
 
   .content {
     background-color: #fff;
-    // padding: 0 10px 20px;
+    padding: 0 10px 20px;
     margin-top: 10px;
   }
 }
diff --git a/src/views/tested/MeasurementPlan/board/index.vue b/src/views/tested/MeasurementPlan/board/index.vue
index a8f61aa..d632088 100644
--- a/src/views/tested/MeasurementPlan/board/index.vue
+++ b/src/views/tested/MeasurementPlan/board/index.vue
@@ -1,5 +1,5 @@
 <!-- 业务看板 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="BoardList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/measurementPlan/task'
diff --git a/src/views/tested/MeasurementPlan/curator/index.vue b/src/views/tested/MeasurementPlan/curator/index.vue
index 02499ee..6158ffd 100644
--- a/src/views/tested/MeasurementPlan/curator/index.vue
+++ b/src/views/tested/MeasurementPlan/curator/index.vue
@@ -1,5 +1,5 @@
 <!-- 负责人送检通知 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="CuratorNotice">
 import page from '@/views/tested/MeasurementPlan/dept/components/list.vue'
 </script>
 

diff --git a/src/components/DetailPage/DetailBlockCom.vue b/src/components/DetailPage/DetailBlockCom.vue
index 13bd2aa..3eee911 100644
--- a/src/components/DetailPage/DetailBlockCom.vue
+++ b/src/components/DetailPage/DetailBlockCom.vue
@@ -40,7 +40,7 @@
 
   .content {
     background-color: #fff;
-    // padding: 0 10px 20px;
+    padding: 0 10px 20px;
     margin-top: 10px;
   }
 }
diff --git a/src/views/tested/MeasurementPlan/board/index.vue b/src/views/tested/MeasurementPlan/board/index.vue
index a8f61aa..d632088 100644
--- a/src/views/tested/MeasurementPlan/board/index.vue
+++ b/src/views/tested/MeasurementPlan/board/index.vue
@@ -1,5 +1,5 @@
 <!-- 业务看板 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="BoardList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/measurementPlan/task'
diff --git a/src/views/tested/MeasurementPlan/curator/index.vue b/src/views/tested/MeasurementPlan/curator/index.vue
index 02499ee..6158ffd 100644
--- a/src/views/tested/MeasurementPlan/curator/index.vue
+++ b/src/views/tested/MeasurementPlan/curator/index.vue
@@ -1,5 +1,5 @@
 <!-- 负责人送检通知 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="CuratorNotice">
 import page from '@/views/tested/MeasurementPlan/dept/components/list.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/delay/index.vue b/src/views/tested/MeasurementPlan/delay/index.vue
index 1f44650..de91052 100644
--- a/src/views/tested/MeasurementPlan/delay/index.vue
+++ b/src/views/tested/MeasurementPlan/delay/index.vue
@@ -1,5 +1,5 @@
 <!-- 延迟送检申请 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="DelayApplication">
 import page from '@/views/tested/MeasurementPlan/early/components/page.vue'
 </script>
 

diff --git a/src/components/DetailPage/DetailBlockCom.vue b/src/components/DetailPage/DetailBlockCom.vue
index 13bd2aa..3eee911 100644
--- a/src/components/DetailPage/DetailBlockCom.vue
+++ b/src/components/DetailPage/DetailBlockCom.vue
@@ -40,7 +40,7 @@
 
   .content {
     background-color: #fff;
-    // padding: 0 10px 20px;
+    padding: 0 10px 20px;
     margin-top: 10px;
   }
 }
diff --git a/src/views/tested/MeasurementPlan/board/index.vue b/src/views/tested/MeasurementPlan/board/index.vue
index a8f61aa..d632088 100644
--- a/src/views/tested/MeasurementPlan/board/index.vue
+++ b/src/views/tested/MeasurementPlan/board/index.vue
@@ -1,5 +1,5 @@
 <!-- 业务看板 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="BoardList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/measurementPlan/task'
diff --git a/src/views/tested/MeasurementPlan/curator/index.vue b/src/views/tested/MeasurementPlan/curator/index.vue
index 02499ee..6158ffd 100644
--- a/src/views/tested/MeasurementPlan/curator/index.vue
+++ b/src/views/tested/MeasurementPlan/curator/index.vue
@@ -1,5 +1,5 @@
 <!-- 负责人送检通知 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="CuratorNotice">
 import page from '@/views/tested/MeasurementPlan/dept/components/list.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/delay/index.vue b/src/views/tested/MeasurementPlan/delay/index.vue
index 1f44650..de91052 100644
--- a/src/views/tested/MeasurementPlan/delay/index.vue
+++ b/src/views/tested/MeasurementPlan/delay/index.vue
@@ -1,5 +1,5 @@
 <!-- 延迟送检申请 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="DelayApplication">
 import page from '@/views/tested/MeasurementPlan/early/components/page.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/dept/components/edit.vue b/src/views/tested/MeasurementPlan/dept/components/edit.vue
index bafdf9e..e1707f7 100644
--- a/src/views/tested/MeasurementPlan/dept/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/edit.vue
@@ -1,5 +1,5 @@
-<!-- 设备分组信息-编辑 -->
-<script lang="ts" setup name="addNotice">
+<!-- 送检通知 详情 -->
+<script lang="ts" setup name="NoticeEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import tableList from './tableList.vue'
 const $route = useRoute()

diff --git a/src/components/DetailPage/DetailBlockCom.vue b/src/components/DetailPage/DetailBlockCom.vue
index 13bd2aa..3eee911 100644
--- a/src/components/DetailPage/DetailBlockCom.vue
+++ b/src/components/DetailPage/DetailBlockCom.vue
@@ -40,7 +40,7 @@
 
   .content {
     background-color: #fff;
-    // padding: 0 10px 20px;
+    padding: 0 10px 20px;
     margin-top: 10px;
   }
 }
diff --git a/src/views/tested/MeasurementPlan/board/index.vue b/src/views/tested/MeasurementPlan/board/index.vue
index a8f61aa..d632088 100644
--- a/src/views/tested/MeasurementPlan/board/index.vue
+++ b/src/views/tested/MeasurementPlan/board/index.vue
@@ -1,5 +1,5 @@
 <!-- 业务看板 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="BoardList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/measurementPlan/task'
diff --git a/src/views/tested/MeasurementPlan/curator/index.vue b/src/views/tested/MeasurementPlan/curator/index.vue
index 02499ee..6158ffd 100644
--- a/src/views/tested/MeasurementPlan/curator/index.vue
+++ b/src/views/tested/MeasurementPlan/curator/index.vue
@@ -1,5 +1,5 @@
 <!-- 负责人送检通知 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="CuratorNotice">
 import page from '@/views/tested/MeasurementPlan/dept/components/list.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/delay/index.vue b/src/views/tested/MeasurementPlan/delay/index.vue
index 1f44650..de91052 100644
--- a/src/views/tested/MeasurementPlan/delay/index.vue
+++ b/src/views/tested/MeasurementPlan/delay/index.vue
@@ -1,5 +1,5 @@
 <!-- 延迟送检申请 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="DelayApplication">
 import page from '@/views/tested/MeasurementPlan/early/components/page.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/dept/components/edit.vue b/src/views/tested/MeasurementPlan/dept/components/edit.vue
index bafdf9e..e1707f7 100644
--- a/src/views/tested/MeasurementPlan/dept/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/edit.vue
@@ -1,5 +1,5 @@
-<!-- 设备分组信息-编辑 -->
-<script lang="ts" setup name="addNotice">
+<!-- 送检通知 详情 -->
+<script lang="ts" setup name="NoticeEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import tableList from './tableList.vue'
 const $route = useRoute()
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index e1cd2ee..2c8e6e5 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -1,5 +1,5 @@
 <!-- 部门/负责人送检通知表格 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="NotceList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/measurementPlan/dept'

diff --git a/src/components/DetailPage/DetailBlockCom.vue b/src/components/DetailPage/DetailBlockCom.vue
index 13bd2aa..3eee911 100644
--- a/src/components/DetailPage/DetailBlockCom.vue
+++ b/src/components/DetailPage/DetailBlockCom.vue
@@ -40,7 +40,7 @@
 
   .content {
     background-color: #fff;
-    // padding: 0 10px 20px;
+    padding: 0 10px 20px;
     margin-top: 10px;
   }
 }
diff --git a/src/views/tested/MeasurementPlan/board/index.vue b/src/views/tested/MeasurementPlan/board/index.vue
index a8f61aa..d632088 100644
--- a/src/views/tested/MeasurementPlan/board/index.vue
+++ b/src/views/tested/MeasurementPlan/board/index.vue
@@ -1,5 +1,5 @@
 <!-- 业务看板 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="BoardList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/measurementPlan/task'
diff --git a/src/views/tested/MeasurementPlan/curator/index.vue b/src/views/tested/MeasurementPlan/curator/index.vue
index 02499ee..6158ffd 100644
--- a/src/views/tested/MeasurementPlan/curator/index.vue
+++ b/src/views/tested/MeasurementPlan/curator/index.vue
@@ -1,5 +1,5 @@
 <!-- 负责人送检通知 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="CuratorNotice">
 import page from '@/views/tested/MeasurementPlan/dept/components/list.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/delay/index.vue b/src/views/tested/MeasurementPlan/delay/index.vue
index 1f44650..de91052 100644
--- a/src/views/tested/MeasurementPlan/delay/index.vue
+++ b/src/views/tested/MeasurementPlan/delay/index.vue
@@ -1,5 +1,5 @@
 <!-- 延迟送检申请 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="DelayApplication">
 import page from '@/views/tested/MeasurementPlan/early/components/page.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/dept/components/edit.vue b/src/views/tested/MeasurementPlan/dept/components/edit.vue
index bafdf9e..e1707f7 100644
--- a/src/views/tested/MeasurementPlan/dept/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/edit.vue
@@ -1,5 +1,5 @@
-<!-- 设备分组信息-编辑 -->
-<script lang="ts" setup name="addNotice">
+<!-- 送检通知 详情 -->
+<script lang="ts" setup name="NoticeEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import tableList from './tableList.vue'
 const $route = useRoute()
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index e1cd2ee..2c8e6e5 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -1,5 +1,5 @@
 <!-- 部门/负责人送检通知表格 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="NotceList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/measurementPlan/dept'
diff --git a/src/views/tested/MeasurementPlan/dept/components/tableList.vue b/src/views/tested/MeasurementPlan/dept/components/tableList.vue
index 878d6e9..49e3b43 100644
--- a/src/views/tested/MeasurementPlan/dept/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/tableList.vue
@@ -1,5 +1,5 @@
 <!-- 任务单列表 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="TaskTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListExpand, getListTogether } from '@/api/eqpt/measurementPlan/dept'
 const $props = defineProps({
@@ -126,7 +126,7 @@
 </script>
 
 <template>
-  <detail-block-switch title="任务单列表">
+  <detail-block-com>
     <table-container>
       <!-- 展开行表格 -->
       <normal-table
@@ -141,7 +141,7 @@
         :expand-row-keys="expands" :show-header="false" @expand-change="expandChange"
       >
         <el-table-column type="expand">
-          <template #default="props">
+          <template #default="">
             <normal-table
               :data="expandList" :total="0" :columns="columns" :list-loading="expandLoading" :options="{
                 needIndex: false, // 是否需要序号列
@@ -159,7 +159,7 @@
         </el-table-column>
       </el-table>
     </table-container>
-  </detail-block-switch>
+  </detail-block-com>
 </template>
 
 <style lang="scss" scoped>

diff --git a/src/components/DetailPage/DetailBlockCom.vue b/src/components/DetailPage/DetailBlockCom.vue
index 13bd2aa..3eee911 100644
--- a/src/components/DetailPage/DetailBlockCom.vue
+++ b/src/components/DetailPage/DetailBlockCom.vue
@@ -40,7 +40,7 @@
 
   .content {
     background-color: #fff;
-    // padding: 0 10px 20px;
+    padding: 0 10px 20px;
     margin-top: 10px;
   }
 }
diff --git a/src/views/tested/MeasurementPlan/board/index.vue b/src/views/tested/MeasurementPlan/board/index.vue
index a8f61aa..d632088 100644
--- a/src/views/tested/MeasurementPlan/board/index.vue
+++ b/src/views/tested/MeasurementPlan/board/index.vue
@@ -1,5 +1,5 @@
 <!-- 业务看板 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="BoardList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/measurementPlan/task'
diff --git a/src/views/tested/MeasurementPlan/curator/index.vue b/src/views/tested/MeasurementPlan/curator/index.vue
index 02499ee..6158ffd 100644
--- a/src/views/tested/MeasurementPlan/curator/index.vue
+++ b/src/views/tested/MeasurementPlan/curator/index.vue
@@ -1,5 +1,5 @@
 <!-- 负责人送检通知 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="CuratorNotice">
 import page from '@/views/tested/MeasurementPlan/dept/components/list.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/delay/index.vue b/src/views/tested/MeasurementPlan/delay/index.vue
index 1f44650..de91052 100644
--- a/src/views/tested/MeasurementPlan/delay/index.vue
+++ b/src/views/tested/MeasurementPlan/delay/index.vue
@@ -1,5 +1,5 @@
 <!-- 延迟送检申请 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="DelayApplication">
 import page from '@/views/tested/MeasurementPlan/early/components/page.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/dept/components/edit.vue b/src/views/tested/MeasurementPlan/dept/components/edit.vue
index bafdf9e..e1707f7 100644
--- a/src/views/tested/MeasurementPlan/dept/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/edit.vue
@@ -1,5 +1,5 @@
-<!-- 设备分组信息-编辑 -->
-<script lang="ts" setup name="addNotice">
+<!-- 送检通知 详情 -->
+<script lang="ts" setup name="NoticeEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import tableList from './tableList.vue'
 const $route = useRoute()
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index e1cd2ee..2c8e6e5 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -1,5 +1,5 @@
 <!-- 部门/负责人送检通知表格 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="NotceList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/measurementPlan/dept'
diff --git a/src/views/tested/MeasurementPlan/dept/components/tableList.vue b/src/views/tested/MeasurementPlan/dept/components/tableList.vue
index 878d6e9..49e3b43 100644
--- a/src/views/tested/MeasurementPlan/dept/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/tableList.vue
@@ -1,5 +1,5 @@
 <!-- 任务单列表 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="TaskTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListExpand, getListTogether } from '@/api/eqpt/measurementPlan/dept'
 const $props = defineProps({
@@ -126,7 +126,7 @@
 </script>
 
 <template>
-  <detail-block-switch title="任务单列表">
+  <detail-block-com>
     <table-container>
       <!-- 展开行表格 -->
       <normal-table
@@ -141,7 +141,7 @@
         :expand-row-keys="expands" :show-header="false" @expand-change="expandChange"
       >
         <el-table-column type="expand">
-          <template #default="props">
+          <template #default="">
             <normal-table
               :data="expandList" :total="0" :columns="columns" :list-loading="expandLoading" :options="{
                 needIndex: false, // 是否需要序号列
@@ -159,7 +159,7 @@
         </el-table-column>
       </el-table>
     </table-container>
-  </detail-block-switch>
+  </detail-block-com>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/tested/MeasurementPlan/dept/index.vue b/src/views/tested/MeasurementPlan/dept/index.vue
index 0be6e43..aafe5e1 100644
--- a/src/views/tested/MeasurementPlan/dept/index.vue
+++ b/src/views/tested/MeasurementPlan/dept/index.vue
@@ -1,5 +1,5 @@
 <!-- 部门送检通知 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="DeptNotice">
 import page from './components/list.vue'
 </script>
 

diff --git a/src/components/DetailPage/DetailBlockCom.vue b/src/components/DetailPage/DetailBlockCom.vue
index 13bd2aa..3eee911 100644
--- a/src/components/DetailPage/DetailBlockCom.vue
+++ b/src/components/DetailPage/DetailBlockCom.vue
@@ -40,7 +40,7 @@
 
   .content {
     background-color: #fff;
-    // padding: 0 10px 20px;
+    padding: 0 10px 20px;
     margin-top: 10px;
   }
 }
diff --git a/src/views/tested/MeasurementPlan/board/index.vue b/src/views/tested/MeasurementPlan/board/index.vue
index a8f61aa..d632088 100644
--- a/src/views/tested/MeasurementPlan/board/index.vue
+++ b/src/views/tested/MeasurementPlan/board/index.vue
@@ -1,5 +1,5 @@
 <!-- 业务看板 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="BoardList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/measurementPlan/task'
diff --git a/src/views/tested/MeasurementPlan/curator/index.vue b/src/views/tested/MeasurementPlan/curator/index.vue
index 02499ee..6158ffd 100644
--- a/src/views/tested/MeasurementPlan/curator/index.vue
+++ b/src/views/tested/MeasurementPlan/curator/index.vue
@@ -1,5 +1,5 @@
 <!-- 负责人送检通知 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="CuratorNotice">
 import page from '@/views/tested/MeasurementPlan/dept/components/list.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/delay/index.vue b/src/views/tested/MeasurementPlan/delay/index.vue
index 1f44650..de91052 100644
--- a/src/views/tested/MeasurementPlan/delay/index.vue
+++ b/src/views/tested/MeasurementPlan/delay/index.vue
@@ -1,5 +1,5 @@
 <!-- 延迟送检申请 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="DelayApplication">
 import page from '@/views/tested/MeasurementPlan/early/components/page.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/dept/components/edit.vue b/src/views/tested/MeasurementPlan/dept/components/edit.vue
index bafdf9e..e1707f7 100644
--- a/src/views/tested/MeasurementPlan/dept/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/edit.vue
@@ -1,5 +1,5 @@
-<!-- 设备分组信息-编辑 -->
-<script lang="ts" setup name="addNotice">
+<!-- 送检通知 详情 -->
+<script lang="ts" setup name="NoticeEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import tableList from './tableList.vue'
 const $route = useRoute()
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index e1cd2ee..2c8e6e5 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -1,5 +1,5 @@
 <!-- 部门/负责人送检通知表格 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="NotceList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/measurementPlan/dept'
diff --git a/src/views/tested/MeasurementPlan/dept/components/tableList.vue b/src/views/tested/MeasurementPlan/dept/components/tableList.vue
index 878d6e9..49e3b43 100644
--- a/src/views/tested/MeasurementPlan/dept/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/tableList.vue
@@ -1,5 +1,5 @@
 <!-- 任务单列表 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="TaskTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListExpand, getListTogether } from '@/api/eqpt/measurementPlan/dept'
 const $props = defineProps({
@@ -126,7 +126,7 @@
 </script>
 
 <template>
-  <detail-block-switch title="任务单列表">
+  <detail-block-com>
     <table-container>
       <!-- 展开行表格 -->
       <normal-table
@@ -141,7 +141,7 @@
         :expand-row-keys="expands" :show-header="false" @expand-change="expandChange"
       >
         <el-table-column type="expand">
-          <template #default="props">
+          <template #default="">
             <normal-table
               :data="expandList" :total="0" :columns="columns" :list-loading="expandLoading" :options="{
                 needIndex: false, // 是否需要序号列
@@ -159,7 +159,7 @@
         </el-table-column>
       </el-table>
     </table-container>
-  </detail-block-switch>
+  </detail-block-com>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/tested/MeasurementPlan/dept/index.vue b/src/views/tested/MeasurementPlan/dept/index.vue
index 0be6e43..aafe5e1 100644
--- a/src/views/tested/MeasurementPlan/dept/index.vue
+++ b/src/views/tested/MeasurementPlan/dept/index.vue
@@ -1,5 +1,5 @@
 <!-- 部门送检通知 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="DeptNotice">
 import page from './components/list.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/early/components/detail.vue b/src/views/tested/MeasurementPlan/early/components/detail.vue
index 72cfdfc..e4e2a22 100644
--- a/src/views/tested/MeasurementPlan/early/components/detail.vue
+++ b/src/views/tested/MeasurementPlan/early/components/detail.vue
@@ -2,7 +2,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import baseInfo from './edit.vue'
 import ApprovalDialog from './ApprovalDialog.vue'
-import { editBtn } from '@/views/tested/device/info/components/applyBtns'
+import { editBtn } from '@/utils/applyBtns'
 import { cancelApply, delApply } from '@/api/eqpt/measurementPlan/early'
 const $route = useRoute()
 const activeName = ref('基本信息')
@@ -99,9 +99,9 @@
           审批详情
         </el-radio-button>
       </el-radio-group>
-      <base-info v-if="activeName === '基本信息'" class="device-base-info" />
-      <report-table v-if="activeName === '审批详情'" :data="[]" status="detail" />
     </detail-block-com>
+    <base-info v-if="activeName === '基本信息'" class="device-base-info" />
+    <!-- <report-table v-if="activeName === '审批详情'" :data="[]" status="detail" /> -->
   </app-container>
 </template>
 

diff --git a/src/components/DetailPage/DetailBlockCom.vue b/src/components/DetailPage/DetailBlockCom.vue
index 13bd2aa..3eee911 100644
--- a/src/components/DetailPage/DetailBlockCom.vue
+++ b/src/components/DetailPage/DetailBlockCom.vue
@@ -40,7 +40,7 @@
 
   .content {
     background-color: #fff;
-    // padding: 0 10px 20px;
+    padding: 0 10px 20px;
     margin-top: 10px;
   }
 }
diff --git a/src/views/tested/MeasurementPlan/board/index.vue b/src/views/tested/MeasurementPlan/board/index.vue
index a8f61aa..d632088 100644
--- a/src/views/tested/MeasurementPlan/board/index.vue
+++ b/src/views/tested/MeasurementPlan/board/index.vue
@@ -1,5 +1,5 @@
 <!-- 业务看板 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="BoardList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/measurementPlan/task'
diff --git a/src/views/tested/MeasurementPlan/curator/index.vue b/src/views/tested/MeasurementPlan/curator/index.vue
index 02499ee..6158ffd 100644
--- a/src/views/tested/MeasurementPlan/curator/index.vue
+++ b/src/views/tested/MeasurementPlan/curator/index.vue
@@ -1,5 +1,5 @@
 <!-- 负责人送检通知 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="CuratorNotice">
 import page from '@/views/tested/MeasurementPlan/dept/components/list.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/delay/index.vue b/src/views/tested/MeasurementPlan/delay/index.vue
index 1f44650..de91052 100644
--- a/src/views/tested/MeasurementPlan/delay/index.vue
+++ b/src/views/tested/MeasurementPlan/delay/index.vue
@@ -1,5 +1,5 @@
 <!-- 延迟送检申请 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="DelayApplication">
 import page from '@/views/tested/MeasurementPlan/early/components/page.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/dept/components/edit.vue b/src/views/tested/MeasurementPlan/dept/components/edit.vue
index bafdf9e..e1707f7 100644
--- a/src/views/tested/MeasurementPlan/dept/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/edit.vue
@@ -1,5 +1,5 @@
-<!-- 设备分组信息-编辑 -->
-<script lang="ts" setup name="addNotice">
+<!-- 送检通知 详情 -->
+<script lang="ts" setup name="NoticeEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import tableList from './tableList.vue'
 const $route = useRoute()
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index e1cd2ee..2c8e6e5 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -1,5 +1,5 @@
 <!-- 部门/负责人送检通知表格 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="NotceList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/measurementPlan/dept'
diff --git a/src/views/tested/MeasurementPlan/dept/components/tableList.vue b/src/views/tested/MeasurementPlan/dept/components/tableList.vue
index 878d6e9..49e3b43 100644
--- a/src/views/tested/MeasurementPlan/dept/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/tableList.vue
@@ -1,5 +1,5 @@
 <!-- 任务单列表 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="TaskTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListExpand, getListTogether } from '@/api/eqpt/measurementPlan/dept'
 const $props = defineProps({
@@ -126,7 +126,7 @@
 </script>
 
 <template>
-  <detail-block-switch title="任务单列表">
+  <detail-block-com>
     <table-container>
       <!-- 展开行表格 -->
       <normal-table
@@ -141,7 +141,7 @@
         :expand-row-keys="expands" :show-header="false" @expand-change="expandChange"
       >
         <el-table-column type="expand">
-          <template #default="props">
+          <template #default="">
             <normal-table
               :data="expandList" :total="0" :columns="columns" :list-loading="expandLoading" :options="{
                 needIndex: false, // 是否需要序号列
@@ -159,7 +159,7 @@
         </el-table-column>
       </el-table>
     </table-container>
-  </detail-block-switch>
+  </detail-block-com>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/tested/MeasurementPlan/dept/index.vue b/src/views/tested/MeasurementPlan/dept/index.vue
index 0be6e43..aafe5e1 100644
--- a/src/views/tested/MeasurementPlan/dept/index.vue
+++ b/src/views/tested/MeasurementPlan/dept/index.vue
@@ -1,5 +1,5 @@
 <!-- 部门送检通知 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="DeptNotice">
 import page from './components/list.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/early/components/detail.vue b/src/views/tested/MeasurementPlan/early/components/detail.vue
index 72cfdfc..e4e2a22 100644
--- a/src/views/tested/MeasurementPlan/early/components/detail.vue
+++ b/src/views/tested/MeasurementPlan/early/components/detail.vue
@@ -2,7 +2,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import baseInfo from './edit.vue'
 import ApprovalDialog from './ApprovalDialog.vue'
-import { editBtn } from '@/views/tested/device/info/components/applyBtns'
+import { editBtn } from '@/utils/applyBtns'
 import { cancelApply, delApply } from '@/api/eqpt/measurementPlan/early'
 const $route = useRoute()
 const activeName = ref('基本信息')
@@ -99,9 +99,9 @@
           审批详情
         </el-radio-button>
       </el-radio-group>
-      <base-info v-if="activeName === '基本信息'" class="device-base-info" />
-      <report-table v-if="activeName === '审批详情'" :data="[]" status="detail" />
     </detail-block-com>
+    <base-info v-if="activeName === '基本信息'" class="device-base-info" />
+    <!-- <report-table v-if="activeName === '审批详情'" :data="[]" status="detail" /> -->
   </app-container>
 </template>
 
diff --git a/src/views/tested/MeasurementPlan/early/components/edit.vue b/src/views/tested/MeasurementPlan/early/components/edit.vue
index 2cd80b2..2fe4276 100644
--- a/src/views/tested/MeasurementPlan/early/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/early/components/edit.vue
@@ -1,5 +1,5 @@
 <!-- 延迟/提前送检-编辑 -->
-<script lang="ts" setup name="PlanEdit">
+<script lang="ts" setup name="ApplicationEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
@@ -201,7 +201,7 @@
     <detail-block-com>
       <el-form
         ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form"
-        :class="[dialogStatus === 'detail' ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
+        :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">

diff --git a/src/components/DetailPage/DetailBlockCom.vue b/src/components/DetailPage/DetailBlockCom.vue
index 13bd2aa..3eee911 100644
--- a/src/components/DetailPage/DetailBlockCom.vue
+++ b/src/components/DetailPage/DetailBlockCom.vue
@@ -40,7 +40,7 @@
 
   .content {
     background-color: #fff;
-    // padding: 0 10px 20px;
+    padding: 0 10px 20px;
     margin-top: 10px;
   }
 }
diff --git a/src/views/tested/MeasurementPlan/board/index.vue b/src/views/tested/MeasurementPlan/board/index.vue
index a8f61aa..d632088 100644
--- a/src/views/tested/MeasurementPlan/board/index.vue
+++ b/src/views/tested/MeasurementPlan/board/index.vue
@@ -1,5 +1,5 @@
 <!-- 业务看板 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="BoardList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/measurementPlan/task'
diff --git a/src/views/tested/MeasurementPlan/curator/index.vue b/src/views/tested/MeasurementPlan/curator/index.vue
index 02499ee..6158ffd 100644
--- a/src/views/tested/MeasurementPlan/curator/index.vue
+++ b/src/views/tested/MeasurementPlan/curator/index.vue
@@ -1,5 +1,5 @@
 <!-- 负责人送检通知 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="CuratorNotice">
 import page from '@/views/tested/MeasurementPlan/dept/components/list.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/delay/index.vue b/src/views/tested/MeasurementPlan/delay/index.vue
index 1f44650..de91052 100644
--- a/src/views/tested/MeasurementPlan/delay/index.vue
+++ b/src/views/tested/MeasurementPlan/delay/index.vue
@@ -1,5 +1,5 @@
 <!-- 延迟送检申请 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="DelayApplication">
 import page from '@/views/tested/MeasurementPlan/early/components/page.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/dept/components/edit.vue b/src/views/tested/MeasurementPlan/dept/components/edit.vue
index bafdf9e..e1707f7 100644
--- a/src/views/tested/MeasurementPlan/dept/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/edit.vue
@@ -1,5 +1,5 @@
-<!-- 设备分组信息-编辑 -->
-<script lang="ts" setup name="addNotice">
+<!-- 送检通知 详情 -->
+<script lang="ts" setup name="NoticeEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import tableList from './tableList.vue'
 const $route = useRoute()
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index e1cd2ee..2c8e6e5 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -1,5 +1,5 @@
 <!-- 部门/负责人送检通知表格 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="NotceList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/measurementPlan/dept'
diff --git a/src/views/tested/MeasurementPlan/dept/components/tableList.vue b/src/views/tested/MeasurementPlan/dept/components/tableList.vue
index 878d6e9..49e3b43 100644
--- a/src/views/tested/MeasurementPlan/dept/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/tableList.vue
@@ -1,5 +1,5 @@
 <!-- 任务单列表 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="TaskTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListExpand, getListTogether } from '@/api/eqpt/measurementPlan/dept'
 const $props = defineProps({
@@ -126,7 +126,7 @@
 </script>
 
 <template>
-  <detail-block-switch title="任务单列表">
+  <detail-block-com>
     <table-container>
       <!-- 展开行表格 -->
       <normal-table
@@ -141,7 +141,7 @@
         :expand-row-keys="expands" :show-header="false" @expand-change="expandChange"
       >
         <el-table-column type="expand">
-          <template #default="props">
+          <template #default="">
             <normal-table
               :data="expandList" :total="0" :columns="columns" :list-loading="expandLoading" :options="{
                 needIndex: false, // 是否需要序号列
@@ -159,7 +159,7 @@
         </el-table-column>
       </el-table>
     </table-container>
-  </detail-block-switch>
+  </detail-block-com>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/tested/MeasurementPlan/dept/index.vue b/src/views/tested/MeasurementPlan/dept/index.vue
index 0be6e43..aafe5e1 100644
--- a/src/views/tested/MeasurementPlan/dept/index.vue
+++ b/src/views/tested/MeasurementPlan/dept/index.vue
@@ -1,5 +1,5 @@
 <!-- 部门送检通知 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="DeptNotice">
 import page from './components/list.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/early/components/detail.vue b/src/views/tested/MeasurementPlan/early/components/detail.vue
index 72cfdfc..e4e2a22 100644
--- a/src/views/tested/MeasurementPlan/early/components/detail.vue
+++ b/src/views/tested/MeasurementPlan/early/components/detail.vue
@@ -2,7 +2,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import baseInfo from './edit.vue'
 import ApprovalDialog from './ApprovalDialog.vue'
-import { editBtn } from '@/views/tested/device/info/components/applyBtns'
+import { editBtn } from '@/utils/applyBtns'
 import { cancelApply, delApply } from '@/api/eqpt/measurementPlan/early'
 const $route = useRoute()
 const activeName = ref('基本信息')
@@ -99,9 +99,9 @@
           审批详情
         </el-radio-button>
       </el-radio-group>
-      <base-info v-if="activeName === '基本信息'" class="device-base-info" />
-      <report-table v-if="activeName === '审批详情'" :data="[]" status="detail" />
     </detail-block-com>
+    <base-info v-if="activeName === '基本信息'" class="device-base-info" />
+    <!-- <report-table v-if="activeName === '审批详情'" :data="[]" status="detail" /> -->
   </app-container>
 </template>
 
diff --git a/src/views/tested/MeasurementPlan/early/components/edit.vue b/src/views/tested/MeasurementPlan/early/components/edit.vue
index 2cd80b2..2fe4276 100644
--- a/src/views/tested/MeasurementPlan/early/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/early/components/edit.vue
@@ -1,5 +1,5 @@
 <!-- 延迟/提前送检-编辑 -->
-<script lang="ts" setup name="PlanEdit">
+<script lang="ts" setup name="ApplicationEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
@@ -201,7 +201,7 @@
     <detail-block-com>
       <el-form
         ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form"
-        :class="[dialogStatus === 'detail' ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
+        :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
diff --git a/src/views/tested/MeasurementPlan/early/components/page.vue b/src/views/tested/MeasurementPlan/early/components/page.vue
index 19c0855..7e6d9b2 100644
--- a/src/views/tested/MeasurementPlan/early/components/page.vue
+++ b/src/views/tested/MeasurementPlan/early/components/page.vue
@@ -45,13 +45,13 @@
 }
 
 watch(current, (newValue) => {
-  window.sessionStorage.setItem(`plan-${$props.approvalType}`, newValue)
+  window.sessionStorage.setItem(`application-${$props.approvalType}`, newValue)
   com.value = menu.value.filter(item => item.name === newValue)[0].com
 })
 
 onMounted(async () => {
   await getMenuStatus()
-  current.value = window.sessionStorage.getItem(`plan-${$props.approvalType}`) || '全部'
+  current.value = window.sessionStorage.getItem(`application-${$props.approvalType}`) || '全部'
   com.value = menu.value.filter(item => item.name === current.value)[0].com
 })
 </script>

diff --git a/src/components/DetailPage/DetailBlockCom.vue b/src/components/DetailPage/DetailBlockCom.vue
index 13bd2aa..3eee911 100644
--- a/src/components/DetailPage/DetailBlockCom.vue
+++ b/src/components/DetailPage/DetailBlockCom.vue
@@ -40,7 +40,7 @@
 
   .content {
     background-color: #fff;
-    // padding: 0 10px 20px;
+    padding: 0 10px 20px;
     margin-top: 10px;
   }
 }
diff --git a/src/views/tested/MeasurementPlan/board/index.vue b/src/views/tested/MeasurementPlan/board/index.vue
index a8f61aa..d632088 100644
--- a/src/views/tested/MeasurementPlan/board/index.vue
+++ b/src/views/tested/MeasurementPlan/board/index.vue
@@ -1,5 +1,5 @@
 <!-- 业务看板 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="BoardList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/measurementPlan/task'
diff --git a/src/views/tested/MeasurementPlan/curator/index.vue b/src/views/tested/MeasurementPlan/curator/index.vue
index 02499ee..6158ffd 100644
--- a/src/views/tested/MeasurementPlan/curator/index.vue
+++ b/src/views/tested/MeasurementPlan/curator/index.vue
@@ -1,5 +1,5 @@
 <!-- 负责人送检通知 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="CuratorNotice">
 import page from '@/views/tested/MeasurementPlan/dept/components/list.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/delay/index.vue b/src/views/tested/MeasurementPlan/delay/index.vue
index 1f44650..de91052 100644
--- a/src/views/tested/MeasurementPlan/delay/index.vue
+++ b/src/views/tested/MeasurementPlan/delay/index.vue
@@ -1,5 +1,5 @@
 <!-- 延迟送检申请 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="DelayApplication">
 import page from '@/views/tested/MeasurementPlan/early/components/page.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/dept/components/edit.vue b/src/views/tested/MeasurementPlan/dept/components/edit.vue
index bafdf9e..e1707f7 100644
--- a/src/views/tested/MeasurementPlan/dept/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/edit.vue
@@ -1,5 +1,5 @@
-<!-- 设备分组信息-编辑 -->
-<script lang="ts" setup name="addNotice">
+<!-- 送检通知 详情 -->
+<script lang="ts" setup name="NoticeEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import tableList from './tableList.vue'
 const $route = useRoute()
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index e1cd2ee..2c8e6e5 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -1,5 +1,5 @@
 <!-- 部门/负责人送检通知表格 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="NotceList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/measurementPlan/dept'
diff --git a/src/views/tested/MeasurementPlan/dept/components/tableList.vue b/src/views/tested/MeasurementPlan/dept/components/tableList.vue
index 878d6e9..49e3b43 100644
--- a/src/views/tested/MeasurementPlan/dept/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/tableList.vue
@@ -1,5 +1,5 @@
 <!-- 任务单列表 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="TaskTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListExpand, getListTogether } from '@/api/eqpt/measurementPlan/dept'
 const $props = defineProps({
@@ -126,7 +126,7 @@
 </script>
 
 <template>
-  <detail-block-switch title="任务单列表">
+  <detail-block-com>
     <table-container>
       <!-- 展开行表格 -->
       <normal-table
@@ -141,7 +141,7 @@
         :expand-row-keys="expands" :show-header="false" @expand-change="expandChange"
       >
         <el-table-column type="expand">
-          <template #default="props">
+          <template #default="">
             <normal-table
               :data="expandList" :total="0" :columns="columns" :list-loading="expandLoading" :options="{
                 needIndex: false, // 是否需要序号列
@@ -159,7 +159,7 @@
         </el-table-column>
       </el-table>
     </table-container>
-  </detail-block-switch>
+  </detail-block-com>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/tested/MeasurementPlan/dept/index.vue b/src/views/tested/MeasurementPlan/dept/index.vue
index 0be6e43..aafe5e1 100644
--- a/src/views/tested/MeasurementPlan/dept/index.vue
+++ b/src/views/tested/MeasurementPlan/dept/index.vue
@@ -1,5 +1,5 @@
 <!-- 部门送检通知 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="DeptNotice">
 import page from './components/list.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/early/components/detail.vue b/src/views/tested/MeasurementPlan/early/components/detail.vue
index 72cfdfc..e4e2a22 100644
--- a/src/views/tested/MeasurementPlan/early/components/detail.vue
+++ b/src/views/tested/MeasurementPlan/early/components/detail.vue
@@ -2,7 +2,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import baseInfo from './edit.vue'
 import ApprovalDialog from './ApprovalDialog.vue'
-import { editBtn } from '@/views/tested/device/info/components/applyBtns'
+import { editBtn } from '@/utils/applyBtns'
 import { cancelApply, delApply } from '@/api/eqpt/measurementPlan/early'
 const $route = useRoute()
 const activeName = ref('基本信息')
@@ -99,9 +99,9 @@
           审批详情
         </el-radio-button>
       </el-radio-group>
-      <base-info v-if="activeName === '基本信息'" class="device-base-info" />
-      <report-table v-if="activeName === '审批详情'" :data="[]" status="detail" />
     </detail-block-com>
+    <base-info v-if="activeName === '基本信息'" class="device-base-info" />
+    <!-- <report-table v-if="activeName === '审批详情'" :data="[]" status="detail" /> -->
   </app-container>
 </template>
 
diff --git a/src/views/tested/MeasurementPlan/early/components/edit.vue b/src/views/tested/MeasurementPlan/early/components/edit.vue
index 2cd80b2..2fe4276 100644
--- a/src/views/tested/MeasurementPlan/early/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/early/components/edit.vue
@@ -1,5 +1,5 @@
 <!-- 延迟/提前送检-编辑 -->
-<script lang="ts" setup name="PlanEdit">
+<script lang="ts" setup name="ApplicationEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
@@ -201,7 +201,7 @@
     <detail-block-com>
       <el-form
         ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form"
-        :class="[dialogStatus === 'detail' ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
+        :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
diff --git a/src/views/tested/MeasurementPlan/early/components/page.vue b/src/views/tested/MeasurementPlan/early/components/page.vue
index 19c0855..7e6d9b2 100644
--- a/src/views/tested/MeasurementPlan/early/components/page.vue
+++ b/src/views/tested/MeasurementPlan/early/components/page.vue
@@ -45,13 +45,13 @@
 }
 
 watch(current, (newValue) => {
-  window.sessionStorage.setItem(`plan-${$props.approvalType}`, newValue)
+  window.sessionStorage.setItem(`application-${$props.approvalType}`, newValue)
   com.value = menu.value.filter(item => item.name === newValue)[0].com
 })
 
 onMounted(async () => {
   await getMenuStatus()
-  current.value = window.sessionStorage.getItem(`plan-${$props.approvalType}`) || '全部'
+  current.value = window.sessionStorage.getItem(`application-${$props.approvalType}`) || '全部'
   com.value = menu.value.filter(item => item.name === current.value)[0].com
 })
 </script>
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index e4a148d..c3979ce 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -1,5 +1,5 @@
 <!-- 计量计划弹窗 -->
-<script lang="ts" setup name="PlanList">
+<script lang="ts" setup name="PlanListDialog">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import ApprovalDialog from './ApprovalDialog.vue'

diff --git a/src/components/DetailPage/DetailBlockCom.vue b/src/components/DetailPage/DetailBlockCom.vue
index 13bd2aa..3eee911 100644
--- a/src/components/DetailPage/DetailBlockCom.vue
+++ b/src/components/DetailPage/DetailBlockCom.vue
@@ -40,7 +40,7 @@
 
   .content {
     background-color: #fff;
-    // padding: 0 10px 20px;
+    padding: 0 10px 20px;
     margin-top: 10px;
   }
 }
diff --git a/src/views/tested/MeasurementPlan/board/index.vue b/src/views/tested/MeasurementPlan/board/index.vue
index a8f61aa..d632088 100644
--- a/src/views/tested/MeasurementPlan/board/index.vue
+++ b/src/views/tested/MeasurementPlan/board/index.vue
@@ -1,5 +1,5 @@
 <!-- 业务看板 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="BoardList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/measurementPlan/task'
diff --git a/src/views/tested/MeasurementPlan/curator/index.vue b/src/views/tested/MeasurementPlan/curator/index.vue
index 02499ee..6158ffd 100644
--- a/src/views/tested/MeasurementPlan/curator/index.vue
+++ b/src/views/tested/MeasurementPlan/curator/index.vue
@@ -1,5 +1,5 @@
 <!-- 负责人送检通知 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="CuratorNotice">
 import page from '@/views/tested/MeasurementPlan/dept/components/list.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/delay/index.vue b/src/views/tested/MeasurementPlan/delay/index.vue
index 1f44650..de91052 100644
--- a/src/views/tested/MeasurementPlan/delay/index.vue
+++ b/src/views/tested/MeasurementPlan/delay/index.vue
@@ -1,5 +1,5 @@
 <!-- 延迟送检申请 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="DelayApplication">
 import page from '@/views/tested/MeasurementPlan/early/components/page.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/dept/components/edit.vue b/src/views/tested/MeasurementPlan/dept/components/edit.vue
index bafdf9e..e1707f7 100644
--- a/src/views/tested/MeasurementPlan/dept/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/edit.vue
@@ -1,5 +1,5 @@
-<!-- 设备分组信息-编辑 -->
-<script lang="ts" setup name="addNotice">
+<!-- 送检通知 详情 -->
+<script lang="ts" setup name="NoticeEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import tableList from './tableList.vue'
 const $route = useRoute()
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index e1cd2ee..2c8e6e5 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -1,5 +1,5 @@
 <!-- 部门/负责人送检通知表格 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="NotceList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/measurementPlan/dept'
diff --git a/src/views/tested/MeasurementPlan/dept/components/tableList.vue b/src/views/tested/MeasurementPlan/dept/components/tableList.vue
index 878d6e9..49e3b43 100644
--- a/src/views/tested/MeasurementPlan/dept/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/tableList.vue
@@ -1,5 +1,5 @@
 <!-- 任务单列表 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="TaskTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListExpand, getListTogether } from '@/api/eqpt/measurementPlan/dept'
 const $props = defineProps({
@@ -126,7 +126,7 @@
 </script>
 
 <template>
-  <detail-block-switch title="任务单列表">
+  <detail-block-com>
     <table-container>
       <!-- 展开行表格 -->
       <normal-table
@@ -141,7 +141,7 @@
         :expand-row-keys="expands" :show-header="false" @expand-change="expandChange"
       >
         <el-table-column type="expand">
-          <template #default="props">
+          <template #default="">
             <normal-table
               :data="expandList" :total="0" :columns="columns" :list-loading="expandLoading" :options="{
                 needIndex: false, // 是否需要序号列
@@ -159,7 +159,7 @@
         </el-table-column>
       </el-table>
     </table-container>
-  </detail-block-switch>
+  </detail-block-com>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/tested/MeasurementPlan/dept/index.vue b/src/views/tested/MeasurementPlan/dept/index.vue
index 0be6e43..aafe5e1 100644
--- a/src/views/tested/MeasurementPlan/dept/index.vue
+++ b/src/views/tested/MeasurementPlan/dept/index.vue
@@ -1,5 +1,5 @@
 <!-- 部门送检通知 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="DeptNotice">
 import page from './components/list.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/early/components/detail.vue b/src/views/tested/MeasurementPlan/early/components/detail.vue
index 72cfdfc..e4e2a22 100644
--- a/src/views/tested/MeasurementPlan/early/components/detail.vue
+++ b/src/views/tested/MeasurementPlan/early/components/detail.vue
@@ -2,7 +2,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import baseInfo from './edit.vue'
 import ApprovalDialog from './ApprovalDialog.vue'
-import { editBtn } from '@/views/tested/device/info/components/applyBtns'
+import { editBtn } from '@/utils/applyBtns'
 import { cancelApply, delApply } from '@/api/eqpt/measurementPlan/early'
 const $route = useRoute()
 const activeName = ref('基本信息')
@@ -99,9 +99,9 @@
           审批详情
         </el-radio-button>
       </el-radio-group>
-      <base-info v-if="activeName === '基本信息'" class="device-base-info" />
-      <report-table v-if="activeName === '审批详情'" :data="[]" status="detail" />
     </detail-block-com>
+    <base-info v-if="activeName === '基本信息'" class="device-base-info" />
+    <!-- <report-table v-if="activeName === '审批详情'" :data="[]" status="detail" /> -->
   </app-container>
 </template>
 
diff --git a/src/views/tested/MeasurementPlan/early/components/edit.vue b/src/views/tested/MeasurementPlan/early/components/edit.vue
index 2cd80b2..2fe4276 100644
--- a/src/views/tested/MeasurementPlan/early/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/early/components/edit.vue
@@ -1,5 +1,5 @@
 <!-- 延迟/提前送检-编辑 -->
-<script lang="ts" setup name="PlanEdit">
+<script lang="ts" setup name="ApplicationEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
@@ -201,7 +201,7 @@
     <detail-block-com>
       <el-form
         ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form"
-        :class="[dialogStatus === 'detail' ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
+        :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
diff --git a/src/views/tested/MeasurementPlan/early/components/page.vue b/src/views/tested/MeasurementPlan/early/components/page.vue
index 19c0855..7e6d9b2 100644
--- a/src/views/tested/MeasurementPlan/early/components/page.vue
+++ b/src/views/tested/MeasurementPlan/early/components/page.vue
@@ -45,13 +45,13 @@
 }
 
 watch(current, (newValue) => {
-  window.sessionStorage.setItem(`plan-${$props.approvalType}`, newValue)
+  window.sessionStorage.setItem(`application-${$props.approvalType}`, newValue)
   com.value = menu.value.filter(item => item.name === newValue)[0].com
 })
 
 onMounted(async () => {
   await getMenuStatus()
-  current.value = window.sessionStorage.getItem(`plan-${$props.approvalType}`) || '全部'
+  current.value = window.sessionStorage.getItem(`application-${$props.approvalType}`) || '全部'
   com.value = menu.value.filter(item => item.name === current.value)[0].com
 })
 </script>
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index e4a148d..c3979ce 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -1,5 +1,5 @@
 <!-- 计量计划弹窗 -->
-<script lang="ts" setup name="PlanList">
+<script lang="ts" setup name="PlanListDialog">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import ApprovalDialog from './ApprovalDialog.vue'
diff --git a/src/views/tested/MeasurementPlan/early/components/table.vue b/src/views/tested/MeasurementPlan/early/components/table.vue
index ff9ef7e..1e4546b 100644
--- a/src/views/tested/MeasurementPlan/early/components/table.vue
+++ b/src/views/tested/MeasurementPlan/early/components/table.vue
@@ -1,5 +1,5 @@
 <!-- 计量计划-计划列表 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="PlanTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectPlan from './selelectPlan.vue'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
@@ -228,11 +228,11 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.id" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text"
         align="center"
       >
         <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>

diff --git a/src/components/DetailPage/DetailBlockCom.vue b/src/components/DetailPage/DetailBlockCom.vue
index 13bd2aa..3eee911 100644
--- a/src/components/DetailPage/DetailBlockCom.vue
+++ b/src/components/DetailPage/DetailBlockCom.vue
@@ -40,7 +40,7 @@
 
   .content {
     background-color: #fff;
-    // padding: 0 10px 20px;
+    padding: 0 10px 20px;
     margin-top: 10px;
   }
 }
diff --git a/src/views/tested/MeasurementPlan/board/index.vue b/src/views/tested/MeasurementPlan/board/index.vue
index a8f61aa..d632088 100644
--- a/src/views/tested/MeasurementPlan/board/index.vue
+++ b/src/views/tested/MeasurementPlan/board/index.vue
@@ -1,5 +1,5 @@
 <!-- 业务看板 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="BoardList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/measurementPlan/task'
diff --git a/src/views/tested/MeasurementPlan/curator/index.vue b/src/views/tested/MeasurementPlan/curator/index.vue
index 02499ee..6158ffd 100644
--- a/src/views/tested/MeasurementPlan/curator/index.vue
+++ b/src/views/tested/MeasurementPlan/curator/index.vue
@@ -1,5 +1,5 @@
 <!-- 负责人送检通知 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="CuratorNotice">
 import page from '@/views/tested/MeasurementPlan/dept/components/list.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/delay/index.vue b/src/views/tested/MeasurementPlan/delay/index.vue
index 1f44650..de91052 100644
--- a/src/views/tested/MeasurementPlan/delay/index.vue
+++ b/src/views/tested/MeasurementPlan/delay/index.vue
@@ -1,5 +1,5 @@
 <!-- 延迟送检申请 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="DelayApplication">
 import page from '@/views/tested/MeasurementPlan/early/components/page.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/dept/components/edit.vue b/src/views/tested/MeasurementPlan/dept/components/edit.vue
index bafdf9e..e1707f7 100644
--- a/src/views/tested/MeasurementPlan/dept/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/edit.vue
@@ -1,5 +1,5 @@
-<!-- 设备分组信息-编辑 -->
-<script lang="ts" setup name="addNotice">
+<!-- 送检通知 详情 -->
+<script lang="ts" setup name="NoticeEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import tableList from './tableList.vue'
 const $route = useRoute()
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index e1cd2ee..2c8e6e5 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -1,5 +1,5 @@
 <!-- 部门/负责人送检通知表格 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="NotceList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/measurementPlan/dept'
diff --git a/src/views/tested/MeasurementPlan/dept/components/tableList.vue b/src/views/tested/MeasurementPlan/dept/components/tableList.vue
index 878d6e9..49e3b43 100644
--- a/src/views/tested/MeasurementPlan/dept/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/tableList.vue
@@ -1,5 +1,5 @@
 <!-- 任务单列表 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="TaskTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListExpand, getListTogether } from '@/api/eqpt/measurementPlan/dept'
 const $props = defineProps({
@@ -126,7 +126,7 @@
 </script>
 
 <template>
-  <detail-block-switch title="任务单列表">
+  <detail-block-com>
     <table-container>
       <!-- 展开行表格 -->
       <normal-table
@@ -141,7 +141,7 @@
         :expand-row-keys="expands" :show-header="false" @expand-change="expandChange"
       >
         <el-table-column type="expand">
-          <template #default="props">
+          <template #default="">
             <normal-table
               :data="expandList" :total="0" :columns="columns" :list-loading="expandLoading" :options="{
                 needIndex: false, // 是否需要序号列
@@ -159,7 +159,7 @@
         </el-table-column>
       </el-table>
     </table-container>
-  </detail-block-switch>
+  </detail-block-com>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/tested/MeasurementPlan/dept/index.vue b/src/views/tested/MeasurementPlan/dept/index.vue
index 0be6e43..aafe5e1 100644
--- a/src/views/tested/MeasurementPlan/dept/index.vue
+++ b/src/views/tested/MeasurementPlan/dept/index.vue
@@ -1,5 +1,5 @@
 <!-- 部门送检通知 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="DeptNotice">
 import page from './components/list.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/early/components/detail.vue b/src/views/tested/MeasurementPlan/early/components/detail.vue
index 72cfdfc..e4e2a22 100644
--- a/src/views/tested/MeasurementPlan/early/components/detail.vue
+++ b/src/views/tested/MeasurementPlan/early/components/detail.vue
@@ -2,7 +2,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import baseInfo from './edit.vue'
 import ApprovalDialog from './ApprovalDialog.vue'
-import { editBtn } from '@/views/tested/device/info/components/applyBtns'
+import { editBtn } from '@/utils/applyBtns'
 import { cancelApply, delApply } from '@/api/eqpt/measurementPlan/early'
 const $route = useRoute()
 const activeName = ref('基本信息')
@@ -99,9 +99,9 @@
           审批详情
         </el-radio-button>
       </el-radio-group>
-      <base-info v-if="activeName === '基本信息'" class="device-base-info" />
-      <report-table v-if="activeName === '审批详情'" :data="[]" status="detail" />
     </detail-block-com>
+    <base-info v-if="activeName === '基本信息'" class="device-base-info" />
+    <!-- <report-table v-if="activeName === '审批详情'" :data="[]" status="detail" /> -->
   </app-container>
 </template>
 
diff --git a/src/views/tested/MeasurementPlan/early/components/edit.vue b/src/views/tested/MeasurementPlan/early/components/edit.vue
index 2cd80b2..2fe4276 100644
--- a/src/views/tested/MeasurementPlan/early/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/early/components/edit.vue
@@ -1,5 +1,5 @@
 <!-- 延迟/提前送检-编辑 -->
-<script lang="ts" setup name="PlanEdit">
+<script lang="ts" setup name="ApplicationEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
@@ -201,7 +201,7 @@
     <detail-block-com>
       <el-form
         ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form"
-        :class="[dialogStatus === 'detail' ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
+        :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
diff --git a/src/views/tested/MeasurementPlan/early/components/page.vue b/src/views/tested/MeasurementPlan/early/components/page.vue
index 19c0855..7e6d9b2 100644
--- a/src/views/tested/MeasurementPlan/early/components/page.vue
+++ b/src/views/tested/MeasurementPlan/early/components/page.vue
@@ -45,13 +45,13 @@
 }
 
 watch(current, (newValue) => {
-  window.sessionStorage.setItem(`plan-${$props.approvalType}`, newValue)
+  window.sessionStorage.setItem(`application-${$props.approvalType}`, newValue)
   com.value = menu.value.filter(item => item.name === newValue)[0].com
 })
 
 onMounted(async () => {
   await getMenuStatus()
-  current.value = window.sessionStorage.getItem(`plan-${$props.approvalType}`) || '全部'
+  current.value = window.sessionStorage.getItem(`application-${$props.approvalType}`) || '全部'
   com.value = menu.value.filter(item => item.name === current.value)[0].com
 })
 </script>
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index e4a148d..c3979ce 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -1,5 +1,5 @@
 <!-- 计量计划弹窗 -->
-<script lang="ts" setup name="PlanList">
+<script lang="ts" setup name="PlanListDialog">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import ApprovalDialog from './ApprovalDialog.vue'
diff --git a/src/views/tested/MeasurementPlan/early/components/table.vue b/src/views/tested/MeasurementPlan/early/components/table.vue
index ff9ef7e..1e4546b 100644
--- a/src/views/tested/MeasurementPlan/early/components/table.vue
+++ b/src/views/tested/MeasurementPlan/early/components/table.vue
@@ -1,5 +1,5 @@
 <!-- 计量计划-计划列表 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="PlanTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectPlan from './selelectPlan.vue'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
@@ -228,11 +228,11 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.id" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text"
         align="center"
       >
         <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
diff --git a/src/views/tested/MeasurementPlan/early/index.vue b/src/views/tested/MeasurementPlan/early/index.vue
index 723bb90..f389baa 100644
--- a/src/views/tested/MeasurementPlan/early/index.vue
+++ b/src/views/tested/MeasurementPlan/early/index.vue
@@ -1,5 +1,5 @@
 <!-- 提前送检申请 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="EarlyApplication">
 import page from './components/page.vue'
 </script>
 

diff --git a/src/components/DetailPage/DetailBlockCom.vue b/src/components/DetailPage/DetailBlockCom.vue
index 13bd2aa..3eee911 100644
--- a/src/components/DetailPage/DetailBlockCom.vue
+++ b/src/components/DetailPage/DetailBlockCom.vue
@@ -40,7 +40,7 @@
 
   .content {
     background-color: #fff;
-    // padding: 0 10px 20px;
+    padding: 0 10px 20px;
     margin-top: 10px;
   }
 }
diff --git a/src/views/tested/MeasurementPlan/board/index.vue b/src/views/tested/MeasurementPlan/board/index.vue
index a8f61aa..d632088 100644
--- a/src/views/tested/MeasurementPlan/board/index.vue
+++ b/src/views/tested/MeasurementPlan/board/index.vue
@@ -1,5 +1,5 @@
 <!-- 业务看板 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="BoardList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/measurementPlan/task'
diff --git a/src/views/tested/MeasurementPlan/curator/index.vue b/src/views/tested/MeasurementPlan/curator/index.vue
index 02499ee..6158ffd 100644
--- a/src/views/tested/MeasurementPlan/curator/index.vue
+++ b/src/views/tested/MeasurementPlan/curator/index.vue
@@ -1,5 +1,5 @@
 <!-- 负责人送检通知 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="CuratorNotice">
 import page from '@/views/tested/MeasurementPlan/dept/components/list.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/delay/index.vue b/src/views/tested/MeasurementPlan/delay/index.vue
index 1f44650..de91052 100644
--- a/src/views/tested/MeasurementPlan/delay/index.vue
+++ b/src/views/tested/MeasurementPlan/delay/index.vue
@@ -1,5 +1,5 @@
 <!-- 延迟送检申请 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="DelayApplication">
 import page from '@/views/tested/MeasurementPlan/early/components/page.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/dept/components/edit.vue b/src/views/tested/MeasurementPlan/dept/components/edit.vue
index bafdf9e..e1707f7 100644
--- a/src/views/tested/MeasurementPlan/dept/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/edit.vue
@@ -1,5 +1,5 @@
-<!-- 设备分组信息-编辑 -->
-<script lang="ts" setup name="addNotice">
+<!-- 送检通知 详情 -->
+<script lang="ts" setup name="NoticeEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import tableList from './tableList.vue'
 const $route = useRoute()
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index e1cd2ee..2c8e6e5 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -1,5 +1,5 @@
 <!-- 部门/负责人送检通知表格 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="NotceList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/measurementPlan/dept'
diff --git a/src/views/tested/MeasurementPlan/dept/components/tableList.vue b/src/views/tested/MeasurementPlan/dept/components/tableList.vue
index 878d6e9..49e3b43 100644
--- a/src/views/tested/MeasurementPlan/dept/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/tableList.vue
@@ -1,5 +1,5 @@
 <!-- 任务单列表 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="TaskTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListExpand, getListTogether } from '@/api/eqpt/measurementPlan/dept'
 const $props = defineProps({
@@ -126,7 +126,7 @@
 </script>
 
 <template>
-  <detail-block-switch title="任务单列表">
+  <detail-block-com>
     <table-container>
       <!-- 展开行表格 -->
       <normal-table
@@ -141,7 +141,7 @@
         :expand-row-keys="expands" :show-header="false" @expand-change="expandChange"
       >
         <el-table-column type="expand">
-          <template #default="props">
+          <template #default="">
             <normal-table
               :data="expandList" :total="0" :columns="columns" :list-loading="expandLoading" :options="{
                 needIndex: false, // 是否需要序号列
@@ -159,7 +159,7 @@
         </el-table-column>
       </el-table>
     </table-container>
-  </detail-block-switch>
+  </detail-block-com>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/tested/MeasurementPlan/dept/index.vue b/src/views/tested/MeasurementPlan/dept/index.vue
index 0be6e43..aafe5e1 100644
--- a/src/views/tested/MeasurementPlan/dept/index.vue
+++ b/src/views/tested/MeasurementPlan/dept/index.vue
@@ -1,5 +1,5 @@
 <!-- 部门送检通知 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="DeptNotice">
 import page from './components/list.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/early/components/detail.vue b/src/views/tested/MeasurementPlan/early/components/detail.vue
index 72cfdfc..e4e2a22 100644
--- a/src/views/tested/MeasurementPlan/early/components/detail.vue
+++ b/src/views/tested/MeasurementPlan/early/components/detail.vue
@@ -2,7 +2,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import baseInfo from './edit.vue'
 import ApprovalDialog from './ApprovalDialog.vue'
-import { editBtn } from '@/views/tested/device/info/components/applyBtns'
+import { editBtn } from '@/utils/applyBtns'
 import { cancelApply, delApply } from '@/api/eqpt/measurementPlan/early'
 const $route = useRoute()
 const activeName = ref('基本信息')
@@ -99,9 +99,9 @@
           审批详情
         </el-radio-button>
       </el-radio-group>
-      <base-info v-if="activeName === '基本信息'" class="device-base-info" />
-      <report-table v-if="activeName === '审批详情'" :data="[]" status="detail" />
     </detail-block-com>
+    <base-info v-if="activeName === '基本信息'" class="device-base-info" />
+    <!-- <report-table v-if="activeName === '审批详情'" :data="[]" status="detail" /> -->
   </app-container>
 </template>
 
diff --git a/src/views/tested/MeasurementPlan/early/components/edit.vue b/src/views/tested/MeasurementPlan/early/components/edit.vue
index 2cd80b2..2fe4276 100644
--- a/src/views/tested/MeasurementPlan/early/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/early/components/edit.vue
@@ -1,5 +1,5 @@
 <!-- 延迟/提前送检-编辑 -->
-<script lang="ts" setup name="PlanEdit">
+<script lang="ts" setup name="ApplicationEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
@@ -201,7 +201,7 @@
     <detail-block-com>
       <el-form
         ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form"
-        :class="[dialogStatus === 'detail' ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
+        :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
diff --git a/src/views/tested/MeasurementPlan/early/components/page.vue b/src/views/tested/MeasurementPlan/early/components/page.vue
index 19c0855..7e6d9b2 100644
--- a/src/views/tested/MeasurementPlan/early/components/page.vue
+++ b/src/views/tested/MeasurementPlan/early/components/page.vue
@@ -45,13 +45,13 @@
 }
 
 watch(current, (newValue) => {
-  window.sessionStorage.setItem(`plan-${$props.approvalType}`, newValue)
+  window.sessionStorage.setItem(`application-${$props.approvalType}`, newValue)
   com.value = menu.value.filter(item => item.name === newValue)[0].com
 })
 
 onMounted(async () => {
   await getMenuStatus()
-  current.value = window.sessionStorage.getItem(`plan-${$props.approvalType}`) || '全部'
+  current.value = window.sessionStorage.getItem(`application-${$props.approvalType}`) || '全部'
   com.value = menu.value.filter(item => item.name === current.value)[0].com
 })
 </script>
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index e4a148d..c3979ce 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -1,5 +1,5 @@
 <!-- 计量计划弹窗 -->
-<script lang="ts" setup name="PlanList">
+<script lang="ts" setup name="PlanListDialog">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import ApprovalDialog from './ApprovalDialog.vue'
diff --git a/src/views/tested/MeasurementPlan/early/components/table.vue b/src/views/tested/MeasurementPlan/early/components/table.vue
index ff9ef7e..1e4546b 100644
--- a/src/views/tested/MeasurementPlan/early/components/table.vue
+++ b/src/views/tested/MeasurementPlan/early/components/table.vue
@@ -1,5 +1,5 @@
 <!-- 计量计划-计划列表 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="PlanTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectPlan from './selelectPlan.vue'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
@@ -228,11 +228,11 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.id" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text"
         align="center"
       >
         <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
diff --git a/src/views/tested/MeasurementPlan/early/index.vue b/src/views/tested/MeasurementPlan/early/index.vue
index 723bb90..f389baa 100644
--- a/src/views/tested/MeasurementPlan/early/index.vue
+++ b/src/views/tested/MeasurementPlan/early/index.vue
@@ -1,5 +1,5 @@
 <!-- 提前送检申请 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="EarlyApplication">
 import page from './components/page.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/plan/components/dataList.vue b/src/views/tested/MeasurementPlan/plan/components/dataList.vue
index 521ed63..a7db75e 100644
--- a/src/views/tested/MeasurementPlan/plan/components/dataList.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/dataList.vue
@@ -127,7 +127,7 @@
       :row-key=" getRowKeys " :expand-row-keys=" expands " :show-header=" false " @expand-change=" expandChange "
     >
       <el-table-column type="expand">
-        <template #default="props">
+        <template #default="">
           <normal-table
             :data=" expandList " :total=" 0 " :columns=" columns " :list-loading=" expandLoading " :options="
               {

diff --git a/src/components/DetailPage/DetailBlockCom.vue b/src/components/DetailPage/DetailBlockCom.vue
index 13bd2aa..3eee911 100644
--- a/src/components/DetailPage/DetailBlockCom.vue
+++ b/src/components/DetailPage/DetailBlockCom.vue
@@ -40,7 +40,7 @@
 
   .content {
     background-color: #fff;
-    // padding: 0 10px 20px;
+    padding: 0 10px 20px;
     margin-top: 10px;
   }
 }
diff --git a/src/views/tested/MeasurementPlan/board/index.vue b/src/views/tested/MeasurementPlan/board/index.vue
index a8f61aa..d632088 100644
--- a/src/views/tested/MeasurementPlan/board/index.vue
+++ b/src/views/tested/MeasurementPlan/board/index.vue
@@ -1,5 +1,5 @@
 <!-- 业务看板 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="BoardList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/measurementPlan/task'
diff --git a/src/views/tested/MeasurementPlan/curator/index.vue b/src/views/tested/MeasurementPlan/curator/index.vue
index 02499ee..6158ffd 100644
--- a/src/views/tested/MeasurementPlan/curator/index.vue
+++ b/src/views/tested/MeasurementPlan/curator/index.vue
@@ -1,5 +1,5 @@
 <!-- 负责人送检通知 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="CuratorNotice">
 import page from '@/views/tested/MeasurementPlan/dept/components/list.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/delay/index.vue b/src/views/tested/MeasurementPlan/delay/index.vue
index 1f44650..de91052 100644
--- a/src/views/tested/MeasurementPlan/delay/index.vue
+++ b/src/views/tested/MeasurementPlan/delay/index.vue
@@ -1,5 +1,5 @@
 <!-- 延迟送检申请 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="DelayApplication">
 import page from '@/views/tested/MeasurementPlan/early/components/page.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/dept/components/edit.vue b/src/views/tested/MeasurementPlan/dept/components/edit.vue
index bafdf9e..e1707f7 100644
--- a/src/views/tested/MeasurementPlan/dept/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/edit.vue
@@ -1,5 +1,5 @@
-<!-- 设备分组信息-编辑 -->
-<script lang="ts" setup name="addNotice">
+<!-- 送检通知 详情 -->
+<script lang="ts" setup name="NoticeEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import tableList from './tableList.vue'
 const $route = useRoute()
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index e1cd2ee..2c8e6e5 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -1,5 +1,5 @@
 <!-- 部门/负责人送检通知表格 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="NotceList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/measurementPlan/dept'
diff --git a/src/views/tested/MeasurementPlan/dept/components/tableList.vue b/src/views/tested/MeasurementPlan/dept/components/tableList.vue
index 878d6e9..49e3b43 100644
--- a/src/views/tested/MeasurementPlan/dept/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/tableList.vue
@@ -1,5 +1,5 @@
 <!-- 任务单列表 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="TaskTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListExpand, getListTogether } from '@/api/eqpt/measurementPlan/dept'
 const $props = defineProps({
@@ -126,7 +126,7 @@
 </script>
 
 <template>
-  <detail-block-switch title="任务单列表">
+  <detail-block-com>
     <table-container>
       <!-- 展开行表格 -->
       <normal-table
@@ -141,7 +141,7 @@
         :expand-row-keys="expands" :show-header="false" @expand-change="expandChange"
       >
         <el-table-column type="expand">
-          <template #default="props">
+          <template #default="">
             <normal-table
               :data="expandList" :total="0" :columns="columns" :list-loading="expandLoading" :options="{
                 needIndex: false, // 是否需要序号列
@@ -159,7 +159,7 @@
         </el-table-column>
       </el-table>
     </table-container>
-  </detail-block-switch>
+  </detail-block-com>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/tested/MeasurementPlan/dept/index.vue b/src/views/tested/MeasurementPlan/dept/index.vue
index 0be6e43..aafe5e1 100644
--- a/src/views/tested/MeasurementPlan/dept/index.vue
+++ b/src/views/tested/MeasurementPlan/dept/index.vue
@@ -1,5 +1,5 @@
 <!-- 部门送检通知 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="DeptNotice">
 import page from './components/list.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/early/components/detail.vue b/src/views/tested/MeasurementPlan/early/components/detail.vue
index 72cfdfc..e4e2a22 100644
--- a/src/views/tested/MeasurementPlan/early/components/detail.vue
+++ b/src/views/tested/MeasurementPlan/early/components/detail.vue
@@ -2,7 +2,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import baseInfo from './edit.vue'
 import ApprovalDialog from './ApprovalDialog.vue'
-import { editBtn } from '@/views/tested/device/info/components/applyBtns'
+import { editBtn } from '@/utils/applyBtns'
 import { cancelApply, delApply } from '@/api/eqpt/measurementPlan/early'
 const $route = useRoute()
 const activeName = ref('基本信息')
@@ -99,9 +99,9 @@
           审批详情
         </el-radio-button>
       </el-radio-group>
-      <base-info v-if="activeName === '基本信息'" class="device-base-info" />
-      <report-table v-if="activeName === '审批详情'" :data="[]" status="detail" />
     </detail-block-com>
+    <base-info v-if="activeName === '基本信息'" class="device-base-info" />
+    <!-- <report-table v-if="activeName === '审批详情'" :data="[]" status="detail" /> -->
   </app-container>
 </template>
 
diff --git a/src/views/tested/MeasurementPlan/early/components/edit.vue b/src/views/tested/MeasurementPlan/early/components/edit.vue
index 2cd80b2..2fe4276 100644
--- a/src/views/tested/MeasurementPlan/early/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/early/components/edit.vue
@@ -1,5 +1,5 @@
 <!-- 延迟/提前送检-编辑 -->
-<script lang="ts" setup name="PlanEdit">
+<script lang="ts" setup name="ApplicationEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
@@ -201,7 +201,7 @@
     <detail-block-com>
       <el-form
         ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form"
-        :class="[dialogStatus === 'detail' ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
+        :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
diff --git a/src/views/tested/MeasurementPlan/early/components/page.vue b/src/views/tested/MeasurementPlan/early/components/page.vue
index 19c0855..7e6d9b2 100644
--- a/src/views/tested/MeasurementPlan/early/components/page.vue
+++ b/src/views/tested/MeasurementPlan/early/components/page.vue
@@ -45,13 +45,13 @@
 }
 
 watch(current, (newValue) => {
-  window.sessionStorage.setItem(`plan-${$props.approvalType}`, newValue)
+  window.sessionStorage.setItem(`application-${$props.approvalType}`, newValue)
   com.value = menu.value.filter(item => item.name === newValue)[0].com
 })
 
 onMounted(async () => {
   await getMenuStatus()
-  current.value = window.sessionStorage.getItem(`plan-${$props.approvalType}`) || '全部'
+  current.value = window.sessionStorage.getItem(`application-${$props.approvalType}`) || '全部'
   com.value = menu.value.filter(item => item.name === current.value)[0].com
 })
 </script>
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index e4a148d..c3979ce 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -1,5 +1,5 @@
 <!-- 计量计划弹窗 -->
-<script lang="ts" setup name="PlanList">
+<script lang="ts" setup name="PlanListDialog">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import ApprovalDialog from './ApprovalDialog.vue'
diff --git a/src/views/tested/MeasurementPlan/early/components/table.vue b/src/views/tested/MeasurementPlan/early/components/table.vue
index ff9ef7e..1e4546b 100644
--- a/src/views/tested/MeasurementPlan/early/components/table.vue
+++ b/src/views/tested/MeasurementPlan/early/components/table.vue
@@ -1,5 +1,5 @@
 <!-- 计量计划-计划列表 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="PlanTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectPlan from './selelectPlan.vue'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
@@ -228,11 +228,11 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.id" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text"
         align="center"
       >
         <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
diff --git a/src/views/tested/MeasurementPlan/early/index.vue b/src/views/tested/MeasurementPlan/early/index.vue
index 723bb90..f389baa 100644
--- a/src/views/tested/MeasurementPlan/early/index.vue
+++ b/src/views/tested/MeasurementPlan/early/index.vue
@@ -1,5 +1,5 @@
 <!-- 提前送检申请 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="EarlyApplication">
 import page from './components/page.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/plan/components/dataList.vue b/src/views/tested/MeasurementPlan/plan/components/dataList.vue
index 521ed63..a7db75e 100644
--- a/src/views/tested/MeasurementPlan/plan/components/dataList.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/dataList.vue
@@ -127,7 +127,7 @@
       :row-key=" getRowKeys " :expand-row-keys=" expands " :show-header=" false " @expand-change=" expandChange "
     >
       <el-table-column type="expand">
-        <template #default="props">
+        <template #default="">
           <normal-table
             :data=" expandList " :total=" 0 " :columns=" columns " :list-loading=" expandLoading " :options="
               {
diff --git a/src/views/tested/MeasurementPlan/plan/components/detail.vue b/src/views/tested/MeasurementPlan/plan/components/detail.vue
index c830647..835df8b 100644
--- a/src/views/tested/MeasurementPlan/plan/components/detail.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/detail.vue
@@ -1,8 +1,9 @@
-<script lang="ts" setup name="addNotice">
+<!-- 计量计划 详情页面 -->
+<script lang="ts" setup name="PlanDetail">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import baseInfo from './infoDetail.vue'
 import ApprovalDialog from './ApprovalDialog.vue'
-import { editBtn, submitBtn } from '@/views/tested/device/info/components/applyBtns'
+import { editBtn, submitBtn } from '@/utils/applyBtns'
 import { cancelPlan, delPlan, editPlan, sendNotify, submitPlan } from '@/api/eqpt/measurementPlan/paln'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const $route = useRoute()
@@ -28,7 +29,7 @@
 // 删除
 const delForm = () => {
   ElMessageBox.confirm(
-    '确认删除设备信息吗?',
+    '确认删除吗?',
     '确认',
     {
       confirmButtonText: '确认',
@@ -94,12 +95,6 @@
         <el-button v-if="editBtn(statusName, 'detail')" type="primary" @click="editForm()">
           编辑
         </el-button>
-        <!-- <el-button v-if="submitBtn(statusName, 'detail')" type="primary" @click="submitForm()">
-          提交
-        </el-button> -->
-        <!-- <el-button v-if="submitBtn(statusName, 'detail')" type="primary" @click="saveForm(ruleFormRef, ruleFormRef1)">
-          保存
-        </el-button> -->
         <el-button v-if="statusName === '已通过' || statusName === '全部'" type="primary">
           打印
         </el-button>
@@ -123,18 +118,9 @@
           审批详情
         </el-radio-button>
       </el-radio-group>
-      <base-info v-if="activeName === '基本信息'" class="device-base-info" />
-      <report-table v-if="activeName === '审批详情'" :data="[]" status="detail" />
-      <!-- <el-tabs v-model="activeName" type="card" class="demo-tabs">
-        <el-tab-pane label="基本信息" name="基本信息">
-          <base-info />
-        </el-tab-pane>
-        <el-tab-pane label="审批详情" name="审批详情">
-          审批详情
-          <report-table :data="[]" status="detail" />
-        </el-tab-pane>
-      </el-tabs> -->
     </detail-block-com>
+    <base-info v-if="activeName === '基本信息'" class="device-base-info" />
+    <report-table v-if="activeName === '审批详情'" :data="[]" status="detail" />
   </app-container>
 </template>
 

diff --git a/src/components/DetailPage/DetailBlockCom.vue b/src/components/DetailPage/DetailBlockCom.vue
index 13bd2aa..3eee911 100644
--- a/src/components/DetailPage/DetailBlockCom.vue
+++ b/src/components/DetailPage/DetailBlockCom.vue
@@ -40,7 +40,7 @@
 
   .content {
     background-color: #fff;
-    // padding: 0 10px 20px;
+    padding: 0 10px 20px;
     margin-top: 10px;
   }
 }
diff --git a/src/views/tested/MeasurementPlan/board/index.vue b/src/views/tested/MeasurementPlan/board/index.vue
index a8f61aa..d632088 100644
--- a/src/views/tested/MeasurementPlan/board/index.vue
+++ b/src/views/tested/MeasurementPlan/board/index.vue
@@ -1,5 +1,5 @@
 <!-- 业务看板 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="BoardList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/measurementPlan/task'
diff --git a/src/views/tested/MeasurementPlan/curator/index.vue b/src/views/tested/MeasurementPlan/curator/index.vue
index 02499ee..6158ffd 100644
--- a/src/views/tested/MeasurementPlan/curator/index.vue
+++ b/src/views/tested/MeasurementPlan/curator/index.vue
@@ -1,5 +1,5 @@
 <!-- 负责人送检通知 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="CuratorNotice">
 import page from '@/views/tested/MeasurementPlan/dept/components/list.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/delay/index.vue b/src/views/tested/MeasurementPlan/delay/index.vue
index 1f44650..de91052 100644
--- a/src/views/tested/MeasurementPlan/delay/index.vue
+++ b/src/views/tested/MeasurementPlan/delay/index.vue
@@ -1,5 +1,5 @@
 <!-- 延迟送检申请 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="DelayApplication">
 import page from '@/views/tested/MeasurementPlan/early/components/page.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/dept/components/edit.vue b/src/views/tested/MeasurementPlan/dept/components/edit.vue
index bafdf9e..e1707f7 100644
--- a/src/views/tested/MeasurementPlan/dept/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/edit.vue
@@ -1,5 +1,5 @@
-<!-- 设备分组信息-编辑 -->
-<script lang="ts" setup name="addNotice">
+<!-- 送检通知 详情 -->
+<script lang="ts" setup name="NoticeEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import tableList from './tableList.vue'
 const $route = useRoute()
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index e1cd2ee..2c8e6e5 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -1,5 +1,5 @@
 <!-- 部门/负责人送检通知表格 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="NotceList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/measurementPlan/dept'
diff --git a/src/views/tested/MeasurementPlan/dept/components/tableList.vue b/src/views/tested/MeasurementPlan/dept/components/tableList.vue
index 878d6e9..49e3b43 100644
--- a/src/views/tested/MeasurementPlan/dept/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/tableList.vue
@@ -1,5 +1,5 @@
 <!-- 任务单列表 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="TaskTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListExpand, getListTogether } from '@/api/eqpt/measurementPlan/dept'
 const $props = defineProps({
@@ -126,7 +126,7 @@
 </script>
 
 <template>
-  <detail-block-switch title="任务单列表">
+  <detail-block-com>
     <table-container>
       <!-- 展开行表格 -->
       <normal-table
@@ -141,7 +141,7 @@
         :expand-row-keys="expands" :show-header="false" @expand-change="expandChange"
       >
         <el-table-column type="expand">
-          <template #default="props">
+          <template #default="">
             <normal-table
               :data="expandList" :total="0" :columns="columns" :list-loading="expandLoading" :options="{
                 needIndex: false, // 是否需要序号列
@@ -159,7 +159,7 @@
         </el-table-column>
       </el-table>
     </table-container>
-  </detail-block-switch>
+  </detail-block-com>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/tested/MeasurementPlan/dept/index.vue b/src/views/tested/MeasurementPlan/dept/index.vue
index 0be6e43..aafe5e1 100644
--- a/src/views/tested/MeasurementPlan/dept/index.vue
+++ b/src/views/tested/MeasurementPlan/dept/index.vue
@@ -1,5 +1,5 @@
 <!-- 部门送检通知 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="DeptNotice">
 import page from './components/list.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/early/components/detail.vue b/src/views/tested/MeasurementPlan/early/components/detail.vue
index 72cfdfc..e4e2a22 100644
--- a/src/views/tested/MeasurementPlan/early/components/detail.vue
+++ b/src/views/tested/MeasurementPlan/early/components/detail.vue
@@ -2,7 +2,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import baseInfo from './edit.vue'
 import ApprovalDialog from './ApprovalDialog.vue'
-import { editBtn } from '@/views/tested/device/info/components/applyBtns'
+import { editBtn } from '@/utils/applyBtns'
 import { cancelApply, delApply } from '@/api/eqpt/measurementPlan/early'
 const $route = useRoute()
 const activeName = ref('基本信息')
@@ -99,9 +99,9 @@
           审批详情
         </el-radio-button>
       </el-radio-group>
-      <base-info v-if="activeName === '基本信息'" class="device-base-info" />
-      <report-table v-if="activeName === '审批详情'" :data="[]" status="detail" />
     </detail-block-com>
+    <base-info v-if="activeName === '基本信息'" class="device-base-info" />
+    <!-- <report-table v-if="activeName === '审批详情'" :data="[]" status="detail" /> -->
   </app-container>
 </template>
 
diff --git a/src/views/tested/MeasurementPlan/early/components/edit.vue b/src/views/tested/MeasurementPlan/early/components/edit.vue
index 2cd80b2..2fe4276 100644
--- a/src/views/tested/MeasurementPlan/early/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/early/components/edit.vue
@@ -1,5 +1,5 @@
 <!-- 延迟/提前送检-编辑 -->
-<script lang="ts" setup name="PlanEdit">
+<script lang="ts" setup name="ApplicationEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
@@ -201,7 +201,7 @@
     <detail-block-com>
       <el-form
         ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form"
-        :class="[dialogStatus === 'detail' ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
+        :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
diff --git a/src/views/tested/MeasurementPlan/early/components/page.vue b/src/views/tested/MeasurementPlan/early/components/page.vue
index 19c0855..7e6d9b2 100644
--- a/src/views/tested/MeasurementPlan/early/components/page.vue
+++ b/src/views/tested/MeasurementPlan/early/components/page.vue
@@ -45,13 +45,13 @@
 }
 
 watch(current, (newValue) => {
-  window.sessionStorage.setItem(`plan-${$props.approvalType}`, newValue)
+  window.sessionStorage.setItem(`application-${$props.approvalType}`, newValue)
   com.value = menu.value.filter(item => item.name === newValue)[0].com
 })
 
 onMounted(async () => {
   await getMenuStatus()
-  current.value = window.sessionStorage.getItem(`plan-${$props.approvalType}`) || '全部'
+  current.value = window.sessionStorage.getItem(`application-${$props.approvalType}`) || '全部'
   com.value = menu.value.filter(item => item.name === current.value)[0].com
 })
 </script>
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index e4a148d..c3979ce 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -1,5 +1,5 @@
 <!-- 计量计划弹窗 -->
-<script lang="ts" setup name="PlanList">
+<script lang="ts" setup name="PlanListDialog">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import ApprovalDialog from './ApprovalDialog.vue'
diff --git a/src/views/tested/MeasurementPlan/early/components/table.vue b/src/views/tested/MeasurementPlan/early/components/table.vue
index ff9ef7e..1e4546b 100644
--- a/src/views/tested/MeasurementPlan/early/components/table.vue
+++ b/src/views/tested/MeasurementPlan/early/components/table.vue
@@ -1,5 +1,5 @@
 <!-- 计量计划-计划列表 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="PlanTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectPlan from './selelectPlan.vue'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
@@ -228,11 +228,11 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.id" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text"
         align="center"
       >
         <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
diff --git a/src/views/tested/MeasurementPlan/early/index.vue b/src/views/tested/MeasurementPlan/early/index.vue
index 723bb90..f389baa 100644
--- a/src/views/tested/MeasurementPlan/early/index.vue
+++ b/src/views/tested/MeasurementPlan/early/index.vue
@@ -1,5 +1,5 @@
 <!-- 提前送检申请 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="EarlyApplication">
 import page from './components/page.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/plan/components/dataList.vue b/src/views/tested/MeasurementPlan/plan/components/dataList.vue
index 521ed63..a7db75e 100644
--- a/src/views/tested/MeasurementPlan/plan/components/dataList.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/dataList.vue
@@ -127,7 +127,7 @@
       :row-key=" getRowKeys " :expand-row-keys=" expands " :show-header=" false " @expand-change=" expandChange "
     >
       <el-table-column type="expand">
-        <template #default="props">
+        <template #default="">
           <normal-table
             :data=" expandList " :total=" 0 " :columns=" columns " :list-loading=" expandLoading " :options="
               {
diff --git a/src/views/tested/MeasurementPlan/plan/components/detail.vue b/src/views/tested/MeasurementPlan/plan/components/detail.vue
index c830647..835df8b 100644
--- a/src/views/tested/MeasurementPlan/plan/components/detail.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/detail.vue
@@ -1,8 +1,9 @@
-<script lang="ts" setup name="addNotice">
+<!-- 计量计划 详情页面 -->
+<script lang="ts" setup name="PlanDetail">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import baseInfo from './infoDetail.vue'
 import ApprovalDialog from './ApprovalDialog.vue'
-import { editBtn, submitBtn } from '@/views/tested/device/info/components/applyBtns'
+import { editBtn, submitBtn } from '@/utils/applyBtns'
 import { cancelPlan, delPlan, editPlan, sendNotify, submitPlan } from '@/api/eqpt/measurementPlan/paln'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const $route = useRoute()
@@ -28,7 +29,7 @@
 // 删除
 const delForm = () => {
   ElMessageBox.confirm(
-    '确认删除设备信息吗?',
+    '确认删除吗?',
     '确认',
     {
       confirmButtonText: '确认',
@@ -94,12 +95,6 @@
         <el-button v-if="editBtn(statusName, 'detail')" type="primary" @click="editForm()">
           编辑
         </el-button>
-        <!-- <el-button v-if="submitBtn(statusName, 'detail')" type="primary" @click="submitForm()">
-          提交
-        </el-button> -->
-        <!-- <el-button v-if="submitBtn(statusName, 'detail')" type="primary" @click="saveForm(ruleFormRef, ruleFormRef1)">
-          保存
-        </el-button> -->
         <el-button v-if="statusName === '已通过' || statusName === '全部'" type="primary">
           打印
         </el-button>
@@ -123,18 +118,9 @@
           审批详情
         </el-radio-button>
       </el-radio-group>
-      <base-info v-if="activeName === '基本信息'" class="device-base-info" />
-      <report-table v-if="activeName === '审批详情'" :data="[]" status="detail" />
-      <!-- <el-tabs v-model="activeName" type="card" class="demo-tabs">
-        <el-tab-pane label="基本信息" name="基本信息">
-          <base-info />
-        </el-tab-pane>
-        <el-tab-pane label="审批详情" name="审批详情">
-          审批详情
-          <report-table :data="[]" status="detail" />
-        </el-tab-pane>
-      </el-tabs> -->
     </detail-block-com>
+    <base-info v-if="activeName === '基本信息'" class="device-base-info" />
+    <report-table v-if="activeName === '审批详情'" :data="[]" status="detail" />
   </app-container>
 </template>
 
diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue
index b8d1ab0..df1d62b 100644
--- a/src/views/tested/MeasurementPlan/plan/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue
@@ -289,7 +289,7 @@
     <detail-block-com>
       <el-form
         ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form"
-        :class="[dialogStatus === 'detail' ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
+        :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">

diff --git a/src/components/DetailPage/DetailBlockCom.vue b/src/components/DetailPage/DetailBlockCom.vue
index 13bd2aa..3eee911 100644
--- a/src/components/DetailPage/DetailBlockCom.vue
+++ b/src/components/DetailPage/DetailBlockCom.vue
@@ -40,7 +40,7 @@
 
   .content {
     background-color: #fff;
-    // padding: 0 10px 20px;
+    padding: 0 10px 20px;
     margin-top: 10px;
   }
 }
diff --git a/src/views/tested/MeasurementPlan/board/index.vue b/src/views/tested/MeasurementPlan/board/index.vue
index a8f61aa..d632088 100644
--- a/src/views/tested/MeasurementPlan/board/index.vue
+++ b/src/views/tested/MeasurementPlan/board/index.vue
@@ -1,5 +1,5 @@
 <!-- 业务看板 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="BoardList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/measurementPlan/task'
diff --git a/src/views/tested/MeasurementPlan/curator/index.vue b/src/views/tested/MeasurementPlan/curator/index.vue
index 02499ee..6158ffd 100644
--- a/src/views/tested/MeasurementPlan/curator/index.vue
+++ b/src/views/tested/MeasurementPlan/curator/index.vue
@@ -1,5 +1,5 @@
 <!-- 负责人送检通知 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="CuratorNotice">
 import page from '@/views/tested/MeasurementPlan/dept/components/list.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/delay/index.vue b/src/views/tested/MeasurementPlan/delay/index.vue
index 1f44650..de91052 100644
--- a/src/views/tested/MeasurementPlan/delay/index.vue
+++ b/src/views/tested/MeasurementPlan/delay/index.vue
@@ -1,5 +1,5 @@
 <!-- 延迟送检申请 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="DelayApplication">
 import page from '@/views/tested/MeasurementPlan/early/components/page.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/dept/components/edit.vue b/src/views/tested/MeasurementPlan/dept/components/edit.vue
index bafdf9e..e1707f7 100644
--- a/src/views/tested/MeasurementPlan/dept/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/edit.vue
@@ -1,5 +1,5 @@
-<!-- 设备分组信息-编辑 -->
-<script lang="ts" setup name="addNotice">
+<!-- 送检通知 详情 -->
+<script lang="ts" setup name="NoticeEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import tableList from './tableList.vue'
 const $route = useRoute()
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index e1cd2ee..2c8e6e5 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -1,5 +1,5 @@
 <!-- 部门/负责人送检通知表格 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="NotceList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/measurementPlan/dept'
diff --git a/src/views/tested/MeasurementPlan/dept/components/tableList.vue b/src/views/tested/MeasurementPlan/dept/components/tableList.vue
index 878d6e9..49e3b43 100644
--- a/src/views/tested/MeasurementPlan/dept/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/tableList.vue
@@ -1,5 +1,5 @@
 <!-- 任务单列表 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="TaskTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListExpand, getListTogether } from '@/api/eqpt/measurementPlan/dept'
 const $props = defineProps({
@@ -126,7 +126,7 @@
 </script>
 
 <template>
-  <detail-block-switch title="任务单列表">
+  <detail-block-com>
     <table-container>
       <!-- 展开行表格 -->
       <normal-table
@@ -141,7 +141,7 @@
         :expand-row-keys="expands" :show-header="false" @expand-change="expandChange"
       >
         <el-table-column type="expand">
-          <template #default="props">
+          <template #default="">
             <normal-table
               :data="expandList" :total="0" :columns="columns" :list-loading="expandLoading" :options="{
                 needIndex: false, // 是否需要序号列
@@ -159,7 +159,7 @@
         </el-table-column>
       </el-table>
     </table-container>
-  </detail-block-switch>
+  </detail-block-com>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/tested/MeasurementPlan/dept/index.vue b/src/views/tested/MeasurementPlan/dept/index.vue
index 0be6e43..aafe5e1 100644
--- a/src/views/tested/MeasurementPlan/dept/index.vue
+++ b/src/views/tested/MeasurementPlan/dept/index.vue
@@ -1,5 +1,5 @@
 <!-- 部门送检通知 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="DeptNotice">
 import page from './components/list.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/early/components/detail.vue b/src/views/tested/MeasurementPlan/early/components/detail.vue
index 72cfdfc..e4e2a22 100644
--- a/src/views/tested/MeasurementPlan/early/components/detail.vue
+++ b/src/views/tested/MeasurementPlan/early/components/detail.vue
@@ -2,7 +2,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import baseInfo from './edit.vue'
 import ApprovalDialog from './ApprovalDialog.vue'
-import { editBtn } from '@/views/tested/device/info/components/applyBtns'
+import { editBtn } from '@/utils/applyBtns'
 import { cancelApply, delApply } from '@/api/eqpt/measurementPlan/early'
 const $route = useRoute()
 const activeName = ref('基本信息')
@@ -99,9 +99,9 @@
           审批详情
         </el-radio-button>
       </el-radio-group>
-      <base-info v-if="activeName === '基本信息'" class="device-base-info" />
-      <report-table v-if="activeName === '审批详情'" :data="[]" status="detail" />
     </detail-block-com>
+    <base-info v-if="activeName === '基本信息'" class="device-base-info" />
+    <!-- <report-table v-if="activeName === '审批详情'" :data="[]" status="detail" /> -->
   </app-container>
 </template>
 
diff --git a/src/views/tested/MeasurementPlan/early/components/edit.vue b/src/views/tested/MeasurementPlan/early/components/edit.vue
index 2cd80b2..2fe4276 100644
--- a/src/views/tested/MeasurementPlan/early/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/early/components/edit.vue
@@ -1,5 +1,5 @@
 <!-- 延迟/提前送检-编辑 -->
-<script lang="ts" setup name="PlanEdit">
+<script lang="ts" setup name="ApplicationEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
@@ -201,7 +201,7 @@
     <detail-block-com>
       <el-form
         ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form"
-        :class="[dialogStatus === 'detail' ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
+        :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
diff --git a/src/views/tested/MeasurementPlan/early/components/page.vue b/src/views/tested/MeasurementPlan/early/components/page.vue
index 19c0855..7e6d9b2 100644
--- a/src/views/tested/MeasurementPlan/early/components/page.vue
+++ b/src/views/tested/MeasurementPlan/early/components/page.vue
@@ -45,13 +45,13 @@
 }
 
 watch(current, (newValue) => {
-  window.sessionStorage.setItem(`plan-${$props.approvalType}`, newValue)
+  window.sessionStorage.setItem(`application-${$props.approvalType}`, newValue)
   com.value = menu.value.filter(item => item.name === newValue)[0].com
 })
 
 onMounted(async () => {
   await getMenuStatus()
-  current.value = window.sessionStorage.getItem(`plan-${$props.approvalType}`) || '全部'
+  current.value = window.sessionStorage.getItem(`application-${$props.approvalType}`) || '全部'
   com.value = menu.value.filter(item => item.name === current.value)[0].com
 })
 </script>
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index e4a148d..c3979ce 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -1,5 +1,5 @@
 <!-- 计量计划弹窗 -->
-<script lang="ts" setup name="PlanList">
+<script lang="ts" setup name="PlanListDialog">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import ApprovalDialog from './ApprovalDialog.vue'
diff --git a/src/views/tested/MeasurementPlan/early/components/table.vue b/src/views/tested/MeasurementPlan/early/components/table.vue
index ff9ef7e..1e4546b 100644
--- a/src/views/tested/MeasurementPlan/early/components/table.vue
+++ b/src/views/tested/MeasurementPlan/early/components/table.vue
@@ -1,5 +1,5 @@
 <!-- 计量计划-计划列表 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="PlanTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectPlan from './selelectPlan.vue'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
@@ -228,11 +228,11 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.id" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text"
         align="center"
       >
         <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
diff --git a/src/views/tested/MeasurementPlan/early/index.vue b/src/views/tested/MeasurementPlan/early/index.vue
index 723bb90..f389baa 100644
--- a/src/views/tested/MeasurementPlan/early/index.vue
+++ b/src/views/tested/MeasurementPlan/early/index.vue
@@ -1,5 +1,5 @@
 <!-- 提前送检申请 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="EarlyApplication">
 import page from './components/page.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/plan/components/dataList.vue b/src/views/tested/MeasurementPlan/plan/components/dataList.vue
index 521ed63..a7db75e 100644
--- a/src/views/tested/MeasurementPlan/plan/components/dataList.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/dataList.vue
@@ -127,7 +127,7 @@
       :row-key=" getRowKeys " :expand-row-keys=" expands " :show-header=" false " @expand-change=" expandChange "
     >
       <el-table-column type="expand">
-        <template #default="props">
+        <template #default="">
           <normal-table
             :data=" expandList " :total=" 0 " :columns=" columns " :list-loading=" expandLoading " :options="
               {
diff --git a/src/views/tested/MeasurementPlan/plan/components/detail.vue b/src/views/tested/MeasurementPlan/plan/components/detail.vue
index c830647..835df8b 100644
--- a/src/views/tested/MeasurementPlan/plan/components/detail.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/detail.vue
@@ -1,8 +1,9 @@
-<script lang="ts" setup name="addNotice">
+<!-- 计量计划 详情页面 -->
+<script lang="ts" setup name="PlanDetail">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import baseInfo from './infoDetail.vue'
 import ApprovalDialog from './ApprovalDialog.vue'
-import { editBtn, submitBtn } from '@/views/tested/device/info/components/applyBtns'
+import { editBtn, submitBtn } from '@/utils/applyBtns'
 import { cancelPlan, delPlan, editPlan, sendNotify, submitPlan } from '@/api/eqpt/measurementPlan/paln'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const $route = useRoute()
@@ -28,7 +29,7 @@
 // 删除
 const delForm = () => {
   ElMessageBox.confirm(
-    '确认删除设备信息吗?',
+    '确认删除吗?',
     '确认',
     {
       confirmButtonText: '确认',
@@ -94,12 +95,6 @@
         <el-button v-if="editBtn(statusName, 'detail')" type="primary" @click="editForm()">
           编辑
         </el-button>
-        <!-- <el-button v-if="submitBtn(statusName, 'detail')" type="primary" @click="submitForm()">
-          提交
-        </el-button> -->
-        <!-- <el-button v-if="submitBtn(statusName, 'detail')" type="primary" @click="saveForm(ruleFormRef, ruleFormRef1)">
-          保存
-        </el-button> -->
         <el-button v-if="statusName === '已通过' || statusName === '全部'" type="primary">
           打印
         </el-button>
@@ -123,18 +118,9 @@
           审批详情
         </el-radio-button>
       </el-radio-group>
-      <base-info v-if="activeName === '基本信息'" class="device-base-info" />
-      <report-table v-if="activeName === '审批详情'" :data="[]" status="detail" />
-      <!-- <el-tabs v-model="activeName" type="card" class="demo-tabs">
-        <el-tab-pane label="基本信息" name="基本信息">
-          <base-info />
-        </el-tab-pane>
-        <el-tab-pane label="审批详情" name="审批详情">
-          审批详情
-          <report-table :data="[]" status="detail" />
-        </el-tab-pane>
-      </el-tabs> -->
     </detail-block-com>
+    <base-info v-if="activeName === '基本信息'" class="device-base-info" />
+    <report-table v-if="activeName === '审批详情'" :data="[]" status="detail" />
   </app-container>
 </template>
 
diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue
index b8d1ab0..df1d62b 100644
--- a/src/views/tested/MeasurementPlan/plan/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue
@@ -289,7 +289,7 @@
     <detail-block-com>
       <el-form
         ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form"
-        :class="[dialogStatus === 'detail' ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
+        :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
diff --git a/src/views/tested/MeasurementPlan/plan/components/infoDetail.vue b/src/views/tested/MeasurementPlan/plan/components/infoDetail.vue
index c585682..0e5d0af 100644
--- a/src/views/tested/MeasurementPlan/plan/components/infoDetail.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/infoDetail.vue
@@ -52,7 +52,7 @@
   <detail-block-com>
     <el-form
       ref="ruleFormRef" :model="ruleForm" label-position="right" label-width="110px" class="form"
-      :class="[dialogStatus === 'detail' ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
+      :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
     >
       <el-row :gutter="24" class="marg">
         <el-col :span="6">

diff --git a/src/components/DetailPage/DetailBlockCom.vue b/src/components/DetailPage/DetailBlockCom.vue
index 13bd2aa..3eee911 100644
--- a/src/components/DetailPage/DetailBlockCom.vue
+++ b/src/components/DetailPage/DetailBlockCom.vue
@@ -40,7 +40,7 @@
 
   .content {
     background-color: #fff;
-    // padding: 0 10px 20px;
+    padding: 0 10px 20px;
     margin-top: 10px;
   }
 }
diff --git a/src/views/tested/MeasurementPlan/board/index.vue b/src/views/tested/MeasurementPlan/board/index.vue
index a8f61aa..d632088 100644
--- a/src/views/tested/MeasurementPlan/board/index.vue
+++ b/src/views/tested/MeasurementPlan/board/index.vue
@@ -1,5 +1,5 @@
 <!-- 业务看板 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="BoardList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/measurementPlan/task'
diff --git a/src/views/tested/MeasurementPlan/curator/index.vue b/src/views/tested/MeasurementPlan/curator/index.vue
index 02499ee..6158ffd 100644
--- a/src/views/tested/MeasurementPlan/curator/index.vue
+++ b/src/views/tested/MeasurementPlan/curator/index.vue
@@ -1,5 +1,5 @@
 <!-- 负责人送检通知 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="CuratorNotice">
 import page from '@/views/tested/MeasurementPlan/dept/components/list.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/delay/index.vue b/src/views/tested/MeasurementPlan/delay/index.vue
index 1f44650..de91052 100644
--- a/src/views/tested/MeasurementPlan/delay/index.vue
+++ b/src/views/tested/MeasurementPlan/delay/index.vue
@@ -1,5 +1,5 @@
 <!-- 延迟送检申请 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="DelayApplication">
 import page from '@/views/tested/MeasurementPlan/early/components/page.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/dept/components/edit.vue b/src/views/tested/MeasurementPlan/dept/components/edit.vue
index bafdf9e..e1707f7 100644
--- a/src/views/tested/MeasurementPlan/dept/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/edit.vue
@@ -1,5 +1,5 @@
-<!-- 设备分组信息-编辑 -->
-<script lang="ts" setup name="addNotice">
+<!-- 送检通知 详情 -->
+<script lang="ts" setup name="NoticeEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import tableList from './tableList.vue'
 const $route = useRoute()
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index e1cd2ee..2c8e6e5 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -1,5 +1,5 @@
 <!-- 部门/负责人送检通知表格 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="NotceList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/measurementPlan/dept'
diff --git a/src/views/tested/MeasurementPlan/dept/components/tableList.vue b/src/views/tested/MeasurementPlan/dept/components/tableList.vue
index 878d6e9..49e3b43 100644
--- a/src/views/tested/MeasurementPlan/dept/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/tableList.vue
@@ -1,5 +1,5 @@
 <!-- 任务单列表 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="TaskTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListExpand, getListTogether } from '@/api/eqpt/measurementPlan/dept'
 const $props = defineProps({
@@ -126,7 +126,7 @@
 </script>
 
 <template>
-  <detail-block-switch title="任务单列表">
+  <detail-block-com>
     <table-container>
       <!-- 展开行表格 -->
       <normal-table
@@ -141,7 +141,7 @@
         :expand-row-keys="expands" :show-header="false" @expand-change="expandChange"
       >
         <el-table-column type="expand">
-          <template #default="props">
+          <template #default="">
             <normal-table
               :data="expandList" :total="0" :columns="columns" :list-loading="expandLoading" :options="{
                 needIndex: false, // 是否需要序号列
@@ -159,7 +159,7 @@
         </el-table-column>
       </el-table>
     </table-container>
-  </detail-block-switch>
+  </detail-block-com>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/tested/MeasurementPlan/dept/index.vue b/src/views/tested/MeasurementPlan/dept/index.vue
index 0be6e43..aafe5e1 100644
--- a/src/views/tested/MeasurementPlan/dept/index.vue
+++ b/src/views/tested/MeasurementPlan/dept/index.vue
@@ -1,5 +1,5 @@
 <!-- 部门送检通知 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="DeptNotice">
 import page from './components/list.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/early/components/detail.vue b/src/views/tested/MeasurementPlan/early/components/detail.vue
index 72cfdfc..e4e2a22 100644
--- a/src/views/tested/MeasurementPlan/early/components/detail.vue
+++ b/src/views/tested/MeasurementPlan/early/components/detail.vue
@@ -2,7 +2,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import baseInfo from './edit.vue'
 import ApprovalDialog from './ApprovalDialog.vue'
-import { editBtn } from '@/views/tested/device/info/components/applyBtns'
+import { editBtn } from '@/utils/applyBtns'
 import { cancelApply, delApply } from '@/api/eqpt/measurementPlan/early'
 const $route = useRoute()
 const activeName = ref('基本信息')
@@ -99,9 +99,9 @@
           审批详情
         </el-radio-button>
       </el-radio-group>
-      <base-info v-if="activeName === '基本信息'" class="device-base-info" />
-      <report-table v-if="activeName === '审批详情'" :data="[]" status="detail" />
     </detail-block-com>
+    <base-info v-if="activeName === '基本信息'" class="device-base-info" />
+    <!-- <report-table v-if="activeName === '审批详情'" :data="[]" status="detail" /> -->
   </app-container>
 </template>
 
diff --git a/src/views/tested/MeasurementPlan/early/components/edit.vue b/src/views/tested/MeasurementPlan/early/components/edit.vue
index 2cd80b2..2fe4276 100644
--- a/src/views/tested/MeasurementPlan/early/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/early/components/edit.vue
@@ -1,5 +1,5 @@
 <!-- 延迟/提前送检-编辑 -->
-<script lang="ts" setup name="PlanEdit">
+<script lang="ts" setup name="ApplicationEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
@@ -201,7 +201,7 @@
     <detail-block-com>
       <el-form
         ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form"
-        :class="[dialogStatus === 'detail' ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
+        :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
diff --git a/src/views/tested/MeasurementPlan/early/components/page.vue b/src/views/tested/MeasurementPlan/early/components/page.vue
index 19c0855..7e6d9b2 100644
--- a/src/views/tested/MeasurementPlan/early/components/page.vue
+++ b/src/views/tested/MeasurementPlan/early/components/page.vue
@@ -45,13 +45,13 @@
 }
 
 watch(current, (newValue) => {
-  window.sessionStorage.setItem(`plan-${$props.approvalType}`, newValue)
+  window.sessionStorage.setItem(`application-${$props.approvalType}`, newValue)
   com.value = menu.value.filter(item => item.name === newValue)[0].com
 })
 
 onMounted(async () => {
   await getMenuStatus()
-  current.value = window.sessionStorage.getItem(`plan-${$props.approvalType}`) || '全部'
+  current.value = window.sessionStorage.getItem(`application-${$props.approvalType}`) || '全部'
   com.value = menu.value.filter(item => item.name === current.value)[0].com
 })
 </script>
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index e4a148d..c3979ce 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -1,5 +1,5 @@
 <!-- 计量计划弹窗 -->
-<script lang="ts" setup name="PlanList">
+<script lang="ts" setup name="PlanListDialog">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import ApprovalDialog from './ApprovalDialog.vue'
diff --git a/src/views/tested/MeasurementPlan/early/components/table.vue b/src/views/tested/MeasurementPlan/early/components/table.vue
index ff9ef7e..1e4546b 100644
--- a/src/views/tested/MeasurementPlan/early/components/table.vue
+++ b/src/views/tested/MeasurementPlan/early/components/table.vue
@@ -1,5 +1,5 @@
 <!-- 计量计划-计划列表 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="PlanTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectPlan from './selelectPlan.vue'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
@@ -228,11 +228,11 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.id" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text"
         align="center"
       >
         <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
diff --git a/src/views/tested/MeasurementPlan/early/index.vue b/src/views/tested/MeasurementPlan/early/index.vue
index 723bb90..f389baa 100644
--- a/src/views/tested/MeasurementPlan/early/index.vue
+++ b/src/views/tested/MeasurementPlan/early/index.vue
@@ -1,5 +1,5 @@
 <!-- 提前送检申请 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="EarlyApplication">
 import page from './components/page.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/plan/components/dataList.vue b/src/views/tested/MeasurementPlan/plan/components/dataList.vue
index 521ed63..a7db75e 100644
--- a/src/views/tested/MeasurementPlan/plan/components/dataList.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/dataList.vue
@@ -127,7 +127,7 @@
       :row-key=" getRowKeys " :expand-row-keys=" expands " :show-header=" false " @expand-change=" expandChange "
     >
       <el-table-column type="expand">
-        <template #default="props">
+        <template #default="">
           <normal-table
             :data=" expandList " :total=" 0 " :columns=" columns " :list-loading=" expandLoading " :options="
               {
diff --git a/src/views/tested/MeasurementPlan/plan/components/detail.vue b/src/views/tested/MeasurementPlan/plan/components/detail.vue
index c830647..835df8b 100644
--- a/src/views/tested/MeasurementPlan/plan/components/detail.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/detail.vue
@@ -1,8 +1,9 @@
-<script lang="ts" setup name="addNotice">
+<!-- 计量计划 详情页面 -->
+<script lang="ts" setup name="PlanDetail">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import baseInfo from './infoDetail.vue'
 import ApprovalDialog from './ApprovalDialog.vue'
-import { editBtn, submitBtn } from '@/views/tested/device/info/components/applyBtns'
+import { editBtn, submitBtn } from '@/utils/applyBtns'
 import { cancelPlan, delPlan, editPlan, sendNotify, submitPlan } from '@/api/eqpt/measurementPlan/paln'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const $route = useRoute()
@@ -28,7 +29,7 @@
 // 删除
 const delForm = () => {
   ElMessageBox.confirm(
-    '确认删除设备信息吗?',
+    '确认删除吗?',
     '确认',
     {
       confirmButtonText: '确认',
@@ -94,12 +95,6 @@
         <el-button v-if="editBtn(statusName, 'detail')" type="primary" @click="editForm()">
           编辑
         </el-button>
-        <!-- <el-button v-if="submitBtn(statusName, 'detail')" type="primary" @click="submitForm()">
-          提交
-        </el-button> -->
-        <!-- <el-button v-if="submitBtn(statusName, 'detail')" type="primary" @click="saveForm(ruleFormRef, ruleFormRef1)">
-          保存
-        </el-button> -->
         <el-button v-if="statusName === '已通过' || statusName === '全部'" type="primary">
           打印
         </el-button>
@@ -123,18 +118,9 @@
           审批详情
         </el-radio-button>
       </el-radio-group>
-      <base-info v-if="activeName === '基本信息'" class="device-base-info" />
-      <report-table v-if="activeName === '审批详情'" :data="[]" status="detail" />
-      <!-- <el-tabs v-model="activeName" type="card" class="demo-tabs">
-        <el-tab-pane label="基本信息" name="基本信息">
-          <base-info />
-        </el-tab-pane>
-        <el-tab-pane label="审批详情" name="审批详情">
-          审批详情
-          <report-table :data="[]" status="detail" />
-        </el-tab-pane>
-      </el-tabs> -->
     </detail-block-com>
+    <base-info v-if="activeName === '基本信息'" class="device-base-info" />
+    <report-table v-if="activeName === '审批详情'" :data="[]" status="detail" />
   </app-container>
 </template>
 
diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue
index b8d1ab0..df1d62b 100644
--- a/src/views/tested/MeasurementPlan/plan/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue
@@ -289,7 +289,7 @@
     <detail-block-com>
       <el-form
         ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form"
-        :class="[dialogStatus === 'detail' ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
+        :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
diff --git a/src/views/tested/MeasurementPlan/plan/components/infoDetail.vue b/src/views/tested/MeasurementPlan/plan/components/infoDetail.vue
index c585682..0e5d0af 100644
--- a/src/views/tested/MeasurementPlan/plan/components/infoDetail.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/infoDetail.vue
@@ -52,7 +52,7 @@
   <detail-block-com>
     <el-form
       ref="ruleFormRef" :model="ruleForm" label-position="right" label-width="110px" class="form"
-      :class="[dialogStatus === 'detail' ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
+      :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
     >
       <el-row :gutter="24" class="marg">
         <el-col :span="6">
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 953432c..da9ecad 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -1,5 +1,5 @@
-<!-- 设备列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
+<!-- 设备列表弹窗-多选 -->
+<script lang="ts" setup name="SelectDeviceMultiple">
 import { ElMessage } from 'element-plus'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
@@ -131,7 +131,6 @@
     // 单选
     if (selectList.value.length) {
       emits('add', selectList.value[0])
-      // emits('add', device)
       dialogFormVisible.value = false
       reset()
     }
@@ -197,14 +196,9 @@
       <normal-table
         v-if="dialogFormVisible"
         :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
-        :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage" @multiSelect="multiSelect"
+        :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
       >
         <template #preColumns>
-          <!-- <el-table-column v-if="!multi" label="" width="55" align="center">
-            <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" :disabled="scope.row.isRadioDisabled" class="radio" />
-            </template>
-          </el-table-column> -->
           <el-table-column label="#" width="55" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}

diff --git a/src/components/DetailPage/DetailBlockCom.vue b/src/components/DetailPage/DetailBlockCom.vue
index 13bd2aa..3eee911 100644
--- a/src/components/DetailPage/DetailBlockCom.vue
+++ b/src/components/DetailPage/DetailBlockCom.vue
@@ -40,7 +40,7 @@
 
   .content {
     background-color: #fff;
-    // padding: 0 10px 20px;
+    padding: 0 10px 20px;
     margin-top: 10px;
   }
 }
diff --git a/src/views/tested/MeasurementPlan/board/index.vue b/src/views/tested/MeasurementPlan/board/index.vue
index a8f61aa..d632088 100644
--- a/src/views/tested/MeasurementPlan/board/index.vue
+++ b/src/views/tested/MeasurementPlan/board/index.vue
@@ -1,5 +1,5 @@
 <!-- 业务看板 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="BoardList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/measurementPlan/task'
diff --git a/src/views/tested/MeasurementPlan/curator/index.vue b/src/views/tested/MeasurementPlan/curator/index.vue
index 02499ee..6158ffd 100644
--- a/src/views/tested/MeasurementPlan/curator/index.vue
+++ b/src/views/tested/MeasurementPlan/curator/index.vue
@@ -1,5 +1,5 @@
 <!-- 负责人送检通知 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="CuratorNotice">
 import page from '@/views/tested/MeasurementPlan/dept/components/list.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/delay/index.vue b/src/views/tested/MeasurementPlan/delay/index.vue
index 1f44650..de91052 100644
--- a/src/views/tested/MeasurementPlan/delay/index.vue
+++ b/src/views/tested/MeasurementPlan/delay/index.vue
@@ -1,5 +1,5 @@
 <!-- 延迟送检申请 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="DelayApplication">
 import page from '@/views/tested/MeasurementPlan/early/components/page.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/dept/components/edit.vue b/src/views/tested/MeasurementPlan/dept/components/edit.vue
index bafdf9e..e1707f7 100644
--- a/src/views/tested/MeasurementPlan/dept/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/edit.vue
@@ -1,5 +1,5 @@
-<!-- 设备分组信息-编辑 -->
-<script lang="ts" setup name="addNotice">
+<!-- 送检通知 详情 -->
+<script lang="ts" setup name="NoticeEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import tableList from './tableList.vue'
 const $route = useRoute()
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index e1cd2ee..2c8e6e5 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -1,5 +1,5 @@
 <!-- 部门/负责人送检通知表格 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="NotceList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/measurementPlan/dept'
diff --git a/src/views/tested/MeasurementPlan/dept/components/tableList.vue b/src/views/tested/MeasurementPlan/dept/components/tableList.vue
index 878d6e9..49e3b43 100644
--- a/src/views/tested/MeasurementPlan/dept/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/tableList.vue
@@ -1,5 +1,5 @@
 <!-- 任务单列表 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="TaskTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListExpand, getListTogether } from '@/api/eqpt/measurementPlan/dept'
 const $props = defineProps({
@@ -126,7 +126,7 @@
 </script>
 
 <template>
-  <detail-block-switch title="任务单列表">
+  <detail-block-com>
     <table-container>
       <!-- 展开行表格 -->
       <normal-table
@@ -141,7 +141,7 @@
         :expand-row-keys="expands" :show-header="false" @expand-change="expandChange"
       >
         <el-table-column type="expand">
-          <template #default="props">
+          <template #default="">
             <normal-table
               :data="expandList" :total="0" :columns="columns" :list-loading="expandLoading" :options="{
                 needIndex: false, // 是否需要序号列
@@ -159,7 +159,7 @@
         </el-table-column>
       </el-table>
     </table-container>
-  </detail-block-switch>
+  </detail-block-com>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/tested/MeasurementPlan/dept/index.vue b/src/views/tested/MeasurementPlan/dept/index.vue
index 0be6e43..aafe5e1 100644
--- a/src/views/tested/MeasurementPlan/dept/index.vue
+++ b/src/views/tested/MeasurementPlan/dept/index.vue
@@ -1,5 +1,5 @@
 <!-- 部门送检通知 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="DeptNotice">
 import page from './components/list.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/early/components/detail.vue b/src/views/tested/MeasurementPlan/early/components/detail.vue
index 72cfdfc..e4e2a22 100644
--- a/src/views/tested/MeasurementPlan/early/components/detail.vue
+++ b/src/views/tested/MeasurementPlan/early/components/detail.vue
@@ -2,7 +2,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import baseInfo from './edit.vue'
 import ApprovalDialog from './ApprovalDialog.vue'
-import { editBtn } from '@/views/tested/device/info/components/applyBtns'
+import { editBtn } from '@/utils/applyBtns'
 import { cancelApply, delApply } from '@/api/eqpt/measurementPlan/early'
 const $route = useRoute()
 const activeName = ref('基本信息')
@@ -99,9 +99,9 @@
           审批详情
         </el-radio-button>
       </el-radio-group>
-      <base-info v-if="activeName === '基本信息'" class="device-base-info" />
-      <report-table v-if="activeName === '审批详情'" :data="[]" status="detail" />
     </detail-block-com>
+    <base-info v-if="activeName === '基本信息'" class="device-base-info" />
+    <!-- <report-table v-if="activeName === '审批详情'" :data="[]" status="detail" /> -->
   </app-container>
 </template>
 
diff --git a/src/views/tested/MeasurementPlan/early/components/edit.vue b/src/views/tested/MeasurementPlan/early/components/edit.vue
index 2cd80b2..2fe4276 100644
--- a/src/views/tested/MeasurementPlan/early/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/early/components/edit.vue
@@ -1,5 +1,5 @@
 <!-- 延迟/提前送检-编辑 -->
-<script lang="ts" setup name="PlanEdit">
+<script lang="ts" setup name="ApplicationEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
@@ -201,7 +201,7 @@
     <detail-block-com>
       <el-form
         ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form"
-        :class="[dialogStatus === 'detail' ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
+        :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
diff --git a/src/views/tested/MeasurementPlan/early/components/page.vue b/src/views/tested/MeasurementPlan/early/components/page.vue
index 19c0855..7e6d9b2 100644
--- a/src/views/tested/MeasurementPlan/early/components/page.vue
+++ b/src/views/tested/MeasurementPlan/early/components/page.vue
@@ -45,13 +45,13 @@
 }
 
 watch(current, (newValue) => {
-  window.sessionStorage.setItem(`plan-${$props.approvalType}`, newValue)
+  window.sessionStorage.setItem(`application-${$props.approvalType}`, newValue)
   com.value = menu.value.filter(item => item.name === newValue)[0].com
 })
 
 onMounted(async () => {
   await getMenuStatus()
-  current.value = window.sessionStorage.getItem(`plan-${$props.approvalType}`) || '全部'
+  current.value = window.sessionStorage.getItem(`application-${$props.approvalType}`) || '全部'
   com.value = menu.value.filter(item => item.name === current.value)[0].com
 })
 </script>
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index e4a148d..c3979ce 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -1,5 +1,5 @@
 <!-- 计量计划弹窗 -->
-<script lang="ts" setup name="PlanList">
+<script lang="ts" setup name="PlanListDialog">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import ApprovalDialog from './ApprovalDialog.vue'
diff --git a/src/views/tested/MeasurementPlan/early/components/table.vue b/src/views/tested/MeasurementPlan/early/components/table.vue
index ff9ef7e..1e4546b 100644
--- a/src/views/tested/MeasurementPlan/early/components/table.vue
+++ b/src/views/tested/MeasurementPlan/early/components/table.vue
@@ -1,5 +1,5 @@
 <!-- 计量计划-计划列表 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="PlanTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectPlan from './selelectPlan.vue'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
@@ -228,11 +228,11 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.id" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text"
         align="center"
       >
         <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
diff --git a/src/views/tested/MeasurementPlan/early/index.vue b/src/views/tested/MeasurementPlan/early/index.vue
index 723bb90..f389baa 100644
--- a/src/views/tested/MeasurementPlan/early/index.vue
+++ b/src/views/tested/MeasurementPlan/early/index.vue
@@ -1,5 +1,5 @@
 <!-- 提前送检申请 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="EarlyApplication">
 import page from './components/page.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/plan/components/dataList.vue b/src/views/tested/MeasurementPlan/plan/components/dataList.vue
index 521ed63..a7db75e 100644
--- a/src/views/tested/MeasurementPlan/plan/components/dataList.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/dataList.vue
@@ -127,7 +127,7 @@
       :row-key=" getRowKeys " :expand-row-keys=" expands " :show-header=" false " @expand-change=" expandChange "
     >
       <el-table-column type="expand">
-        <template #default="props">
+        <template #default="">
           <normal-table
             :data=" expandList " :total=" 0 " :columns=" columns " :list-loading=" expandLoading " :options="
               {
diff --git a/src/views/tested/MeasurementPlan/plan/components/detail.vue b/src/views/tested/MeasurementPlan/plan/components/detail.vue
index c830647..835df8b 100644
--- a/src/views/tested/MeasurementPlan/plan/components/detail.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/detail.vue
@@ -1,8 +1,9 @@
-<script lang="ts" setup name="addNotice">
+<!-- 计量计划 详情页面 -->
+<script lang="ts" setup name="PlanDetail">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import baseInfo from './infoDetail.vue'
 import ApprovalDialog from './ApprovalDialog.vue'
-import { editBtn, submitBtn } from '@/views/tested/device/info/components/applyBtns'
+import { editBtn, submitBtn } from '@/utils/applyBtns'
 import { cancelPlan, delPlan, editPlan, sendNotify, submitPlan } from '@/api/eqpt/measurementPlan/paln'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const $route = useRoute()
@@ -28,7 +29,7 @@
 // 删除
 const delForm = () => {
   ElMessageBox.confirm(
-    '确认删除设备信息吗?',
+    '确认删除吗?',
     '确认',
     {
       confirmButtonText: '确认',
@@ -94,12 +95,6 @@
         <el-button v-if="editBtn(statusName, 'detail')" type="primary" @click="editForm()">
           编辑
         </el-button>
-        <!-- <el-button v-if="submitBtn(statusName, 'detail')" type="primary" @click="submitForm()">
-          提交
-        </el-button> -->
-        <!-- <el-button v-if="submitBtn(statusName, 'detail')" type="primary" @click="saveForm(ruleFormRef, ruleFormRef1)">
-          保存
-        </el-button> -->
         <el-button v-if="statusName === '已通过' || statusName === '全部'" type="primary">
           打印
         </el-button>
@@ -123,18 +118,9 @@
           审批详情
         </el-radio-button>
       </el-radio-group>
-      <base-info v-if="activeName === '基本信息'" class="device-base-info" />
-      <report-table v-if="activeName === '审批详情'" :data="[]" status="detail" />
-      <!-- <el-tabs v-model="activeName" type="card" class="demo-tabs">
-        <el-tab-pane label="基本信息" name="基本信息">
-          <base-info />
-        </el-tab-pane>
-        <el-tab-pane label="审批详情" name="审批详情">
-          审批详情
-          <report-table :data="[]" status="detail" />
-        </el-tab-pane>
-      </el-tabs> -->
     </detail-block-com>
+    <base-info v-if="activeName === '基本信息'" class="device-base-info" />
+    <report-table v-if="activeName === '审批详情'" :data="[]" status="detail" />
   </app-container>
 </template>
 
diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue
index b8d1ab0..df1d62b 100644
--- a/src/views/tested/MeasurementPlan/plan/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue
@@ -289,7 +289,7 @@
     <detail-block-com>
       <el-form
         ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form"
-        :class="[dialogStatus === 'detail' ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
+        :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
diff --git a/src/views/tested/MeasurementPlan/plan/components/infoDetail.vue b/src/views/tested/MeasurementPlan/plan/components/infoDetail.vue
index c585682..0e5d0af 100644
--- a/src/views/tested/MeasurementPlan/plan/components/infoDetail.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/infoDetail.vue
@@ -52,7 +52,7 @@
   <detail-block-com>
     <el-form
       ref="ruleFormRef" :model="ruleForm" label-position="right" label-width="110px" class="form"
-      :class="[dialogStatus === 'detail' ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
+      :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
     >
       <el-row :gutter="24" class="marg">
         <el-col :span="6">
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 953432c..da9ecad 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -1,5 +1,5 @@
-<!-- 设备列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
+<!-- 设备列表弹窗-多选 -->
+<script lang="ts" setup name="SelectDeviceMultiple">
 import { ElMessage } from 'element-plus'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
@@ -131,7 +131,6 @@
     // 单选
     if (selectList.value.length) {
       emits('add', selectList.value[0])
-      // emits('add', device)
       dialogFormVisible.value = false
       reset()
     }
@@ -197,14 +196,9 @@
       <normal-table
         v-if="dialogFormVisible"
         :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
-        :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage" @multiSelect="multiSelect"
+        :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
       >
         <template #preColumns>
-          <!-- <el-table-column v-if="!multi" label="" width="55" align="center">
-            <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" :disabled="scope.row.isRadioDisabled" class="radio" />
-            </template>
-          </el-table-column> -->
           <el-table-column label="#" width="55" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index 1d48e55..67710f3 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -1,5 +1,5 @@
 <!-- 计量计划-计划列表 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="PlatListTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectDevice from './selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
@@ -9,13 +9,8 @@
     type: Array,
     default: () => ([]),
   },
-  status: {
-    type: String,
-    required: true,
-  },
 })
 const $route = useRoute()
-const dialogStatus = ref('update') // 对话框类型：create,update
 // 表头显示标题
 const columns = ref([
   {
@@ -64,7 +59,7 @@
 const list = ref<IlistObjType[]>([])
 // 检查数据列表
 function checkCertificateList() {
-  return useCheckList(list.value as any, columns.value as any, '设备信息')
+  return useCheckList(list.value as any, columns.value as any, '计划列表')
 }
 // 将列表置为不可编辑状态
 function setAllRowReadable() {
@@ -87,7 +82,6 @@
 }
 // 添加行
 const addRow = () => {
-  // certificateRef.value.initDialog({ title: '添加' })
   if (checkCertificateList()) {
     setAllRowReadable()
     list.value.push({
@@ -147,7 +141,6 @@
 }
 const initDialog = () => {
   list.value = $props.data as IlistObjType[]
-  dialogStatus.value = $props.status
 }
 // 批量增加
 const batch = () => {
@@ -193,7 +186,7 @@
         align="center"
       >
         <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>

diff --git a/src/components/DetailPage/DetailBlockCom.vue b/src/components/DetailPage/DetailBlockCom.vue
index 13bd2aa..3eee911 100644
--- a/src/components/DetailPage/DetailBlockCom.vue
+++ b/src/components/DetailPage/DetailBlockCom.vue
@@ -40,7 +40,7 @@
 
   .content {
     background-color: #fff;
-    // padding: 0 10px 20px;
+    padding: 0 10px 20px;
     margin-top: 10px;
   }
 }
diff --git a/src/views/tested/MeasurementPlan/board/index.vue b/src/views/tested/MeasurementPlan/board/index.vue
index a8f61aa..d632088 100644
--- a/src/views/tested/MeasurementPlan/board/index.vue
+++ b/src/views/tested/MeasurementPlan/board/index.vue
@@ -1,5 +1,5 @@
 <!-- 业务看板 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="BoardList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/measurementPlan/task'
diff --git a/src/views/tested/MeasurementPlan/curator/index.vue b/src/views/tested/MeasurementPlan/curator/index.vue
index 02499ee..6158ffd 100644
--- a/src/views/tested/MeasurementPlan/curator/index.vue
+++ b/src/views/tested/MeasurementPlan/curator/index.vue
@@ -1,5 +1,5 @@
 <!-- 负责人送检通知 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="CuratorNotice">
 import page from '@/views/tested/MeasurementPlan/dept/components/list.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/delay/index.vue b/src/views/tested/MeasurementPlan/delay/index.vue
index 1f44650..de91052 100644
--- a/src/views/tested/MeasurementPlan/delay/index.vue
+++ b/src/views/tested/MeasurementPlan/delay/index.vue
@@ -1,5 +1,5 @@
 <!-- 延迟送检申请 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="DelayApplication">
 import page from '@/views/tested/MeasurementPlan/early/components/page.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/dept/components/edit.vue b/src/views/tested/MeasurementPlan/dept/components/edit.vue
index bafdf9e..e1707f7 100644
--- a/src/views/tested/MeasurementPlan/dept/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/edit.vue
@@ -1,5 +1,5 @@
-<!-- 设备分组信息-编辑 -->
-<script lang="ts" setup name="addNotice">
+<!-- 送检通知 详情 -->
+<script lang="ts" setup name="NoticeEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import tableList from './tableList.vue'
 const $route = useRoute()
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index e1cd2ee..2c8e6e5 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -1,5 +1,5 @@
 <!-- 部门/负责人送检通知表格 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="NotceList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/measurementPlan/dept'
diff --git a/src/views/tested/MeasurementPlan/dept/components/tableList.vue b/src/views/tested/MeasurementPlan/dept/components/tableList.vue
index 878d6e9..49e3b43 100644
--- a/src/views/tested/MeasurementPlan/dept/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/tableList.vue
@@ -1,5 +1,5 @@
 <!-- 任务单列表 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="TaskTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListExpand, getListTogether } from '@/api/eqpt/measurementPlan/dept'
 const $props = defineProps({
@@ -126,7 +126,7 @@
 </script>
 
 <template>
-  <detail-block-switch title="任务单列表">
+  <detail-block-com>
     <table-container>
       <!-- 展开行表格 -->
       <normal-table
@@ -141,7 +141,7 @@
         :expand-row-keys="expands" :show-header="false" @expand-change="expandChange"
       >
         <el-table-column type="expand">
-          <template #default="props">
+          <template #default="">
             <normal-table
               :data="expandList" :total="0" :columns="columns" :list-loading="expandLoading" :options="{
                 needIndex: false, // 是否需要序号列
@@ -159,7 +159,7 @@
         </el-table-column>
       </el-table>
     </table-container>
-  </detail-block-switch>
+  </detail-block-com>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/tested/MeasurementPlan/dept/index.vue b/src/views/tested/MeasurementPlan/dept/index.vue
index 0be6e43..aafe5e1 100644
--- a/src/views/tested/MeasurementPlan/dept/index.vue
+++ b/src/views/tested/MeasurementPlan/dept/index.vue
@@ -1,5 +1,5 @@
 <!-- 部门送检通知 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="DeptNotice">
 import page from './components/list.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/early/components/detail.vue b/src/views/tested/MeasurementPlan/early/components/detail.vue
index 72cfdfc..e4e2a22 100644
--- a/src/views/tested/MeasurementPlan/early/components/detail.vue
+++ b/src/views/tested/MeasurementPlan/early/components/detail.vue
@@ -2,7 +2,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import baseInfo from './edit.vue'
 import ApprovalDialog from './ApprovalDialog.vue'
-import { editBtn } from '@/views/tested/device/info/components/applyBtns'
+import { editBtn } from '@/utils/applyBtns'
 import { cancelApply, delApply } from '@/api/eqpt/measurementPlan/early'
 const $route = useRoute()
 const activeName = ref('基本信息')
@@ -99,9 +99,9 @@
           审批详情
         </el-radio-button>
       </el-radio-group>
-      <base-info v-if="activeName === '基本信息'" class="device-base-info" />
-      <report-table v-if="activeName === '审批详情'" :data="[]" status="detail" />
     </detail-block-com>
+    <base-info v-if="activeName === '基本信息'" class="device-base-info" />
+    <!-- <report-table v-if="activeName === '审批详情'" :data="[]" status="detail" /> -->
   </app-container>
 </template>
 
diff --git a/src/views/tested/MeasurementPlan/early/components/edit.vue b/src/views/tested/MeasurementPlan/early/components/edit.vue
index 2cd80b2..2fe4276 100644
--- a/src/views/tested/MeasurementPlan/early/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/early/components/edit.vue
@@ -1,5 +1,5 @@
 <!-- 延迟/提前送检-编辑 -->
-<script lang="ts" setup name="PlanEdit">
+<script lang="ts" setup name="ApplicationEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
@@ -201,7 +201,7 @@
     <detail-block-com>
       <el-form
         ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form"
-        :class="[dialogStatus === 'detail' ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
+        :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
diff --git a/src/views/tested/MeasurementPlan/early/components/page.vue b/src/views/tested/MeasurementPlan/early/components/page.vue
index 19c0855..7e6d9b2 100644
--- a/src/views/tested/MeasurementPlan/early/components/page.vue
+++ b/src/views/tested/MeasurementPlan/early/components/page.vue
@@ -45,13 +45,13 @@
 }
 
 watch(current, (newValue) => {
-  window.sessionStorage.setItem(`plan-${$props.approvalType}`, newValue)
+  window.sessionStorage.setItem(`application-${$props.approvalType}`, newValue)
   com.value = menu.value.filter(item => item.name === newValue)[0].com
 })
 
 onMounted(async () => {
   await getMenuStatus()
-  current.value = window.sessionStorage.getItem(`plan-${$props.approvalType}`) || '全部'
+  current.value = window.sessionStorage.getItem(`application-${$props.approvalType}`) || '全部'
   com.value = menu.value.filter(item => item.name === current.value)[0].com
 })
 </script>
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index e4a148d..c3979ce 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -1,5 +1,5 @@
 <!-- 计量计划弹窗 -->
-<script lang="ts" setup name="PlanList">
+<script lang="ts" setup name="PlanListDialog">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import ApprovalDialog from './ApprovalDialog.vue'
diff --git a/src/views/tested/MeasurementPlan/early/components/table.vue b/src/views/tested/MeasurementPlan/early/components/table.vue
index ff9ef7e..1e4546b 100644
--- a/src/views/tested/MeasurementPlan/early/components/table.vue
+++ b/src/views/tested/MeasurementPlan/early/components/table.vue
@@ -1,5 +1,5 @@
 <!-- 计量计划-计划列表 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="PlanTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectPlan from './selelectPlan.vue'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
@@ -228,11 +228,11 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.id" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text"
         align="center"
       >
         <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
diff --git a/src/views/tested/MeasurementPlan/early/index.vue b/src/views/tested/MeasurementPlan/early/index.vue
index 723bb90..f389baa 100644
--- a/src/views/tested/MeasurementPlan/early/index.vue
+++ b/src/views/tested/MeasurementPlan/early/index.vue
@@ -1,5 +1,5 @@
 <!-- 提前送检申请 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="EarlyApplication">
 import page from './components/page.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/plan/components/dataList.vue b/src/views/tested/MeasurementPlan/plan/components/dataList.vue
index 521ed63..a7db75e 100644
--- a/src/views/tested/MeasurementPlan/plan/components/dataList.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/dataList.vue
@@ -127,7 +127,7 @@
       :row-key=" getRowKeys " :expand-row-keys=" expands " :show-header=" false " @expand-change=" expandChange "
     >
       <el-table-column type="expand">
-        <template #default="props">
+        <template #default="">
           <normal-table
             :data=" expandList " :total=" 0 " :columns=" columns " :list-loading=" expandLoading " :options="
               {
diff --git a/src/views/tested/MeasurementPlan/plan/components/detail.vue b/src/views/tested/MeasurementPlan/plan/components/detail.vue
index c830647..835df8b 100644
--- a/src/views/tested/MeasurementPlan/plan/components/detail.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/detail.vue
@@ -1,8 +1,9 @@
-<script lang="ts" setup name="addNotice">
+<!-- 计量计划 详情页面 -->
+<script lang="ts" setup name="PlanDetail">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import baseInfo from './infoDetail.vue'
 import ApprovalDialog from './ApprovalDialog.vue'
-import { editBtn, submitBtn } from '@/views/tested/device/info/components/applyBtns'
+import { editBtn, submitBtn } from '@/utils/applyBtns'
 import { cancelPlan, delPlan, editPlan, sendNotify, submitPlan } from '@/api/eqpt/measurementPlan/paln'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const $route = useRoute()
@@ -28,7 +29,7 @@
 // 删除
 const delForm = () => {
   ElMessageBox.confirm(
-    '确认删除设备信息吗?',
+    '确认删除吗?',
     '确认',
     {
       confirmButtonText: '确认',
@@ -94,12 +95,6 @@
         <el-button v-if="editBtn(statusName, 'detail')" type="primary" @click="editForm()">
           编辑
         </el-button>
-        <!-- <el-button v-if="submitBtn(statusName, 'detail')" type="primary" @click="submitForm()">
-          提交
-        </el-button> -->
-        <!-- <el-button v-if="submitBtn(statusName, 'detail')" type="primary" @click="saveForm(ruleFormRef, ruleFormRef1)">
-          保存
-        </el-button> -->
         <el-button v-if="statusName === '已通过' || statusName === '全部'" type="primary">
           打印
         </el-button>
@@ -123,18 +118,9 @@
           审批详情
         </el-radio-button>
       </el-radio-group>
-      <base-info v-if="activeName === '基本信息'" class="device-base-info" />
-      <report-table v-if="activeName === '审批详情'" :data="[]" status="detail" />
-      <!-- <el-tabs v-model="activeName" type="card" class="demo-tabs">
-        <el-tab-pane label="基本信息" name="基本信息">
-          <base-info />
-        </el-tab-pane>
-        <el-tab-pane label="审批详情" name="审批详情">
-          审批详情
-          <report-table :data="[]" status="detail" />
-        </el-tab-pane>
-      </el-tabs> -->
     </detail-block-com>
+    <base-info v-if="activeName === '基本信息'" class="device-base-info" />
+    <report-table v-if="activeName === '审批详情'" :data="[]" status="detail" />
   </app-container>
 </template>
 
diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue
index b8d1ab0..df1d62b 100644
--- a/src/views/tested/MeasurementPlan/plan/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue
@@ -289,7 +289,7 @@
     <detail-block-com>
       <el-form
         ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form"
-        :class="[dialogStatus === 'detail' ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
+        :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
diff --git a/src/views/tested/MeasurementPlan/plan/components/infoDetail.vue b/src/views/tested/MeasurementPlan/plan/components/infoDetail.vue
index c585682..0e5d0af 100644
--- a/src/views/tested/MeasurementPlan/plan/components/infoDetail.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/infoDetail.vue
@@ -52,7 +52,7 @@
   <detail-block-com>
     <el-form
       ref="ruleFormRef" :model="ruleForm" label-position="right" label-width="110px" class="form"
-      :class="[dialogStatus === 'detail' ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
+      :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
     >
       <el-row :gutter="24" class="marg">
         <el-col :span="6">
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 953432c..da9ecad 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -1,5 +1,5 @@
-<!-- 设备列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
+<!-- 设备列表弹窗-多选 -->
+<script lang="ts" setup name="SelectDeviceMultiple">
 import { ElMessage } from 'element-plus'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
@@ -131,7 +131,6 @@
     // 单选
     if (selectList.value.length) {
       emits('add', selectList.value[0])
-      // emits('add', device)
       dialogFormVisible.value = false
       reset()
     }
@@ -197,14 +196,9 @@
       <normal-table
         v-if="dialogFormVisible"
         :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
-        :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage" @multiSelect="multiSelect"
+        :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
       >
         <template #preColumns>
-          <!-- <el-table-column v-if="!multi" label="" width="55" align="center">
-            <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" :disabled="scope.row.isRadioDisabled" class="radio" />
-            </template>
-          </el-table-column> -->
           <el-table-column label="#" width="55" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index 1d48e55..67710f3 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -1,5 +1,5 @@
 <!-- 计量计划-计划列表 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="PlatListTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectDevice from './selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
@@ -9,13 +9,8 @@
     type: Array,
     default: () => ([]),
   },
-  status: {
-    type: String,
-    required: true,
-  },
 })
 const $route = useRoute()
-const dialogStatus = ref('update') // 对话框类型：create,update
 // 表头显示标题
 const columns = ref([
   {
@@ -64,7 +59,7 @@
 const list = ref<IlistObjType[]>([])
 // 检查数据列表
 function checkCertificateList() {
-  return useCheckList(list.value as any, columns.value as any, '设备信息')
+  return useCheckList(list.value as any, columns.value as any, '计划列表')
 }
 // 将列表置为不可编辑状态
 function setAllRowReadable() {
@@ -87,7 +82,6 @@
 }
 // 添加行
 const addRow = () => {
-  // certificateRef.value.initDialog({ title: '添加' })
   if (checkCertificateList()) {
     setAllRowReadable()
     list.value.push({
@@ -147,7 +141,6 @@
 }
 const initDialog = () => {
   list.value = $props.data as IlistObjType[]
-  dialogStatus.value = $props.status
 }
 // 批量增加
 const batch = () => {
@@ -193,7 +186,7 @@
         align="center"
       >
         <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
diff --git a/src/views/tested/MeasurementPlan/plan/index.vue b/src/views/tested/MeasurementPlan/plan/index.vue
index 90c24d0..f9d978a 100644
--- a/src/views/tested/MeasurementPlan/plan/index.vue
+++ b/src/views/tested/MeasurementPlan/plan/index.vue
@@ -1,5 +1,5 @@
 <!-- 计量计划 -->
-<script lang="ts" setup name="qualityFile">
+<script lang="ts" setup name="PlanIndex">
 import infoList from './components/list.vue'
 import { getDictByCode } from '@/api/system/dict'
 export interface menuType {

diff --git a/src/components/DetailPage/DetailBlockCom.vue b/src/components/DetailPage/DetailBlockCom.vue
index 13bd2aa..3eee911 100644
--- a/src/components/DetailPage/DetailBlockCom.vue
+++ b/src/components/DetailPage/DetailBlockCom.vue
@@ -40,7 +40,7 @@
 
   .content {
     background-color: #fff;
-    // padding: 0 10px 20px;
+    padding: 0 10px 20px;
     margin-top: 10px;
   }
 }
diff --git a/src/views/tested/MeasurementPlan/board/index.vue b/src/views/tested/MeasurementPlan/board/index.vue
index a8f61aa..d632088 100644
--- a/src/views/tested/MeasurementPlan/board/index.vue
+++ b/src/views/tested/MeasurementPlan/board/index.vue
@@ -1,5 +1,5 @@
 <!-- 业务看板 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="BoardList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/measurementPlan/task'
diff --git a/src/views/tested/MeasurementPlan/curator/index.vue b/src/views/tested/MeasurementPlan/curator/index.vue
index 02499ee..6158ffd 100644
--- a/src/views/tested/MeasurementPlan/curator/index.vue
+++ b/src/views/tested/MeasurementPlan/curator/index.vue
@@ -1,5 +1,5 @@
 <!-- 负责人送检通知 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="CuratorNotice">
 import page from '@/views/tested/MeasurementPlan/dept/components/list.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/delay/index.vue b/src/views/tested/MeasurementPlan/delay/index.vue
index 1f44650..de91052 100644
--- a/src/views/tested/MeasurementPlan/delay/index.vue
+++ b/src/views/tested/MeasurementPlan/delay/index.vue
@@ -1,5 +1,5 @@
 <!-- 延迟送检申请 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="DelayApplication">
 import page from '@/views/tested/MeasurementPlan/early/components/page.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/dept/components/edit.vue b/src/views/tested/MeasurementPlan/dept/components/edit.vue
index bafdf9e..e1707f7 100644
--- a/src/views/tested/MeasurementPlan/dept/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/edit.vue
@@ -1,5 +1,5 @@
-<!-- 设备分组信息-编辑 -->
-<script lang="ts" setup name="addNotice">
+<!-- 送检通知 详情 -->
+<script lang="ts" setup name="NoticeEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import tableList from './tableList.vue'
 const $route = useRoute()
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index e1cd2ee..2c8e6e5 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -1,5 +1,5 @@
 <!-- 部门/负责人送检通知表格 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="NotceList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/measurementPlan/dept'
diff --git a/src/views/tested/MeasurementPlan/dept/components/tableList.vue b/src/views/tested/MeasurementPlan/dept/components/tableList.vue
index 878d6e9..49e3b43 100644
--- a/src/views/tested/MeasurementPlan/dept/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/tableList.vue
@@ -1,5 +1,5 @@
 <!-- 任务单列表 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="TaskTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListExpand, getListTogether } from '@/api/eqpt/measurementPlan/dept'
 const $props = defineProps({
@@ -126,7 +126,7 @@
 </script>
 
 <template>
-  <detail-block-switch title="任务单列表">
+  <detail-block-com>
     <table-container>
       <!-- 展开行表格 -->
       <normal-table
@@ -141,7 +141,7 @@
         :expand-row-keys="expands" :show-header="false" @expand-change="expandChange"
       >
         <el-table-column type="expand">
-          <template #default="props">
+          <template #default="">
             <normal-table
               :data="expandList" :total="0" :columns="columns" :list-loading="expandLoading" :options="{
                 needIndex: false, // 是否需要序号列
@@ -159,7 +159,7 @@
         </el-table-column>
       </el-table>
     </table-container>
-  </detail-block-switch>
+  </detail-block-com>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/tested/MeasurementPlan/dept/index.vue b/src/views/tested/MeasurementPlan/dept/index.vue
index 0be6e43..aafe5e1 100644
--- a/src/views/tested/MeasurementPlan/dept/index.vue
+++ b/src/views/tested/MeasurementPlan/dept/index.vue
@@ -1,5 +1,5 @@
 <!-- 部门送检通知 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="DeptNotice">
 import page from './components/list.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/early/components/detail.vue b/src/views/tested/MeasurementPlan/early/components/detail.vue
index 72cfdfc..e4e2a22 100644
--- a/src/views/tested/MeasurementPlan/early/components/detail.vue
+++ b/src/views/tested/MeasurementPlan/early/components/detail.vue
@@ -2,7 +2,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import baseInfo from './edit.vue'
 import ApprovalDialog from './ApprovalDialog.vue'
-import { editBtn } from '@/views/tested/device/info/components/applyBtns'
+import { editBtn } from '@/utils/applyBtns'
 import { cancelApply, delApply } from '@/api/eqpt/measurementPlan/early'
 const $route = useRoute()
 const activeName = ref('基本信息')
@@ -99,9 +99,9 @@
           审批详情
         </el-radio-button>
       </el-radio-group>
-      <base-info v-if="activeName === '基本信息'" class="device-base-info" />
-      <report-table v-if="activeName === '审批详情'" :data="[]" status="detail" />
     </detail-block-com>
+    <base-info v-if="activeName === '基本信息'" class="device-base-info" />
+    <!-- <report-table v-if="activeName === '审批详情'" :data="[]" status="detail" /> -->
   </app-container>
 </template>
 
diff --git a/src/views/tested/MeasurementPlan/early/components/edit.vue b/src/views/tested/MeasurementPlan/early/components/edit.vue
index 2cd80b2..2fe4276 100644
--- a/src/views/tested/MeasurementPlan/early/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/early/components/edit.vue
@@ -1,5 +1,5 @@
 <!-- 延迟/提前送检-编辑 -->
-<script lang="ts" setup name="PlanEdit">
+<script lang="ts" setup name="ApplicationEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
@@ -201,7 +201,7 @@
     <detail-block-com>
       <el-form
         ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form"
-        :class="[dialogStatus === 'detail' ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
+        :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
diff --git a/src/views/tested/MeasurementPlan/early/components/page.vue b/src/views/tested/MeasurementPlan/early/components/page.vue
index 19c0855..7e6d9b2 100644
--- a/src/views/tested/MeasurementPlan/early/components/page.vue
+++ b/src/views/tested/MeasurementPlan/early/components/page.vue
@@ -45,13 +45,13 @@
 }
 
 watch(current, (newValue) => {
-  window.sessionStorage.setItem(`plan-${$props.approvalType}`, newValue)
+  window.sessionStorage.setItem(`application-${$props.approvalType}`, newValue)
   com.value = menu.value.filter(item => item.name === newValue)[0].com
 })
 
 onMounted(async () => {
   await getMenuStatus()
-  current.value = window.sessionStorage.getItem(`plan-${$props.approvalType}`) || '全部'
+  current.value = window.sessionStorage.getItem(`application-${$props.approvalType}`) || '全部'
   com.value = menu.value.filter(item => item.name === current.value)[0].com
 })
 </script>
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index e4a148d..c3979ce 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -1,5 +1,5 @@
 <!-- 计量计划弹窗 -->
-<script lang="ts" setup name="PlanList">
+<script lang="ts" setup name="PlanListDialog">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import ApprovalDialog from './ApprovalDialog.vue'
diff --git a/src/views/tested/MeasurementPlan/early/components/table.vue b/src/views/tested/MeasurementPlan/early/components/table.vue
index ff9ef7e..1e4546b 100644
--- a/src/views/tested/MeasurementPlan/early/components/table.vue
+++ b/src/views/tested/MeasurementPlan/early/components/table.vue
@@ -1,5 +1,5 @@
 <!-- 计量计划-计划列表 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="PlanTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectPlan from './selelectPlan.vue'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
@@ -228,11 +228,11 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.id" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text"
         align="center"
       >
         <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
diff --git a/src/views/tested/MeasurementPlan/early/index.vue b/src/views/tested/MeasurementPlan/early/index.vue
index 723bb90..f389baa 100644
--- a/src/views/tested/MeasurementPlan/early/index.vue
+++ b/src/views/tested/MeasurementPlan/early/index.vue
@@ -1,5 +1,5 @@
 <!-- 提前送检申请 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="EarlyApplication">
 import page from './components/page.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/plan/components/dataList.vue b/src/views/tested/MeasurementPlan/plan/components/dataList.vue
index 521ed63..a7db75e 100644
--- a/src/views/tested/MeasurementPlan/plan/components/dataList.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/dataList.vue
@@ -127,7 +127,7 @@
       :row-key=" getRowKeys " :expand-row-keys=" expands " :show-header=" false " @expand-change=" expandChange "
     >
       <el-table-column type="expand">
-        <template #default="props">
+        <template #default="">
           <normal-table
             :data=" expandList " :total=" 0 " :columns=" columns " :list-loading=" expandLoading " :options="
               {
diff --git a/src/views/tested/MeasurementPlan/plan/components/detail.vue b/src/views/tested/MeasurementPlan/plan/components/detail.vue
index c830647..835df8b 100644
--- a/src/views/tested/MeasurementPlan/plan/components/detail.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/detail.vue
@@ -1,8 +1,9 @@
-<script lang="ts" setup name="addNotice">
+<!-- 计量计划 详情页面 -->
+<script lang="ts" setup name="PlanDetail">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import baseInfo from './infoDetail.vue'
 import ApprovalDialog from './ApprovalDialog.vue'
-import { editBtn, submitBtn } from '@/views/tested/device/info/components/applyBtns'
+import { editBtn, submitBtn } from '@/utils/applyBtns'
 import { cancelPlan, delPlan, editPlan, sendNotify, submitPlan } from '@/api/eqpt/measurementPlan/paln'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const $route = useRoute()
@@ -28,7 +29,7 @@
 // 删除
 const delForm = () => {
   ElMessageBox.confirm(
-    '确认删除设备信息吗?',
+    '确认删除吗?',
     '确认',
     {
       confirmButtonText: '确认',
@@ -94,12 +95,6 @@
         <el-button v-if="editBtn(statusName, 'detail')" type="primary" @click="editForm()">
           编辑
         </el-button>
-        <!-- <el-button v-if="submitBtn(statusName, 'detail')" type="primary" @click="submitForm()">
-          提交
-        </el-button> -->
-        <!-- <el-button v-if="submitBtn(statusName, 'detail')" type="primary" @click="saveForm(ruleFormRef, ruleFormRef1)">
-          保存
-        </el-button> -->
         <el-button v-if="statusName === '已通过' || statusName === '全部'" type="primary">
           打印
         </el-button>
@@ -123,18 +118,9 @@
           审批详情
         </el-radio-button>
       </el-radio-group>
-      <base-info v-if="activeName === '基本信息'" class="device-base-info" />
-      <report-table v-if="activeName === '审批详情'" :data="[]" status="detail" />
-      <!-- <el-tabs v-model="activeName" type="card" class="demo-tabs">
-        <el-tab-pane label="基本信息" name="基本信息">
-          <base-info />
-        </el-tab-pane>
-        <el-tab-pane label="审批详情" name="审批详情">
-          审批详情
-          <report-table :data="[]" status="detail" />
-        </el-tab-pane>
-      </el-tabs> -->
     </detail-block-com>
+    <base-info v-if="activeName === '基本信息'" class="device-base-info" />
+    <report-table v-if="activeName === '审批详情'" :data="[]" status="detail" />
   </app-container>
 </template>
 
diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue
index b8d1ab0..df1d62b 100644
--- a/src/views/tested/MeasurementPlan/plan/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue
@@ -289,7 +289,7 @@
     <detail-block-com>
       <el-form
         ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form"
-        :class="[dialogStatus === 'detail' ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
+        :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
diff --git a/src/views/tested/MeasurementPlan/plan/components/infoDetail.vue b/src/views/tested/MeasurementPlan/plan/components/infoDetail.vue
index c585682..0e5d0af 100644
--- a/src/views/tested/MeasurementPlan/plan/components/infoDetail.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/infoDetail.vue
@@ -52,7 +52,7 @@
   <detail-block-com>
     <el-form
       ref="ruleFormRef" :model="ruleForm" label-position="right" label-width="110px" class="form"
-      :class="[dialogStatus === 'detail' ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
+      :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
     >
       <el-row :gutter="24" class="marg">
         <el-col :span="6">
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 953432c..da9ecad 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -1,5 +1,5 @@
-<!-- 设备列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
+<!-- 设备列表弹窗-多选 -->
+<script lang="ts" setup name="SelectDeviceMultiple">
 import { ElMessage } from 'element-plus'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
@@ -131,7 +131,6 @@
     // 单选
     if (selectList.value.length) {
       emits('add', selectList.value[0])
-      // emits('add', device)
       dialogFormVisible.value = false
       reset()
     }
@@ -197,14 +196,9 @@
       <normal-table
         v-if="dialogFormVisible"
         :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
-        :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage" @multiSelect="multiSelect"
+        :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
       >
         <template #preColumns>
-          <!-- <el-table-column v-if="!multi" label="" width="55" align="center">
-            <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" :disabled="scope.row.isRadioDisabled" class="radio" />
-            </template>
-          </el-table-column> -->
           <el-table-column label="#" width="55" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index 1d48e55..67710f3 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -1,5 +1,5 @@
 <!-- 计量计划-计划列表 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="PlatListTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectDevice from './selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
@@ -9,13 +9,8 @@
     type: Array,
     default: () => ([]),
   },
-  status: {
-    type: String,
-    required: true,
-  },
 })
 const $route = useRoute()
-const dialogStatus = ref('update') // 对话框类型：create,update
 // 表头显示标题
 const columns = ref([
   {
@@ -64,7 +59,7 @@
 const list = ref<IlistObjType[]>([])
 // 检查数据列表
 function checkCertificateList() {
-  return useCheckList(list.value as any, columns.value as any, '设备信息')
+  return useCheckList(list.value as any, columns.value as any, '计划列表')
 }
 // 将列表置为不可编辑状态
 function setAllRowReadable() {
@@ -87,7 +82,6 @@
 }
 // 添加行
 const addRow = () => {
-  // certificateRef.value.initDialog({ title: '添加' })
   if (checkCertificateList()) {
     setAllRowReadable()
     list.value.push({
@@ -147,7 +141,6 @@
 }
 const initDialog = () => {
   list.value = $props.data as IlistObjType[]
-  dialogStatus.value = $props.status
 }
 // 批量增加
 const batch = () => {
@@ -193,7 +186,7 @@
         align="center"
       >
         <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
diff --git a/src/views/tested/MeasurementPlan/plan/index.vue b/src/views/tested/MeasurementPlan/plan/index.vue
index 90c24d0..f9d978a 100644
--- a/src/views/tested/MeasurementPlan/plan/index.vue
+++ b/src/views/tested/MeasurementPlan/plan/index.vue
@@ -1,5 +1,5 @@
 <!-- 计量计划 -->
-<script lang="ts" setup name="qualityFile">
+<script lang="ts" setup name="PlanIndex">
 import infoList from './components/list.vue'
 import { getDictByCode } from '@/api/system/dict'
 export interface menuType {
diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue
index bc1ca2c..6078532 100644
--- a/src/views/tested/MeasurementPlan/task/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/task/components/edit.vue
@@ -1,5 +1,5 @@
 <!-- 设备分组信息-编辑 -->
-<script lang="ts" setup name="addNotice">
+<script lang="ts" setup name="TaskEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
@@ -175,7 +175,7 @@
       </template>
     </detail-page>
     <detail-block-com>
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" :class="$route.path.includes('detail') ? 'isDetail' : ''" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="任务单编号">
@@ -261,11 +261,11 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="承接时间" prop="undertakeTime">
-              <el-input v-model.trim="ruleForm.undertakeTime" />
-              <!-- <el-date-picker
+              <!-- <el-input v-model.trim="ruleForm.undertakeTime" /> -->
+              <el-date-picker
                 v-model="ruleForm.undertakeTime" type="date" format="YYYY-MM-DD"
                 value-format="YYYY-MM-DD" placeholder="承接时间" class="normal-date" style="width: 100%;"
-              /> -->
+              />
             </el-form-item>
           </el-col>
         </el-row>

diff --git a/src/components/DetailPage/DetailBlockCom.vue b/src/components/DetailPage/DetailBlockCom.vue
index 13bd2aa..3eee911 100644
--- a/src/components/DetailPage/DetailBlockCom.vue
+++ b/src/components/DetailPage/DetailBlockCom.vue
@@ -40,7 +40,7 @@
 
   .content {
     background-color: #fff;
-    // padding: 0 10px 20px;
+    padding: 0 10px 20px;
     margin-top: 10px;
   }
 }
diff --git a/src/views/tested/MeasurementPlan/board/index.vue b/src/views/tested/MeasurementPlan/board/index.vue
index a8f61aa..d632088 100644
--- a/src/views/tested/MeasurementPlan/board/index.vue
+++ b/src/views/tested/MeasurementPlan/board/index.vue
@@ -1,5 +1,5 @@
 <!-- 业务看板 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="BoardList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/measurementPlan/task'
diff --git a/src/views/tested/MeasurementPlan/curator/index.vue b/src/views/tested/MeasurementPlan/curator/index.vue
index 02499ee..6158ffd 100644
--- a/src/views/tested/MeasurementPlan/curator/index.vue
+++ b/src/views/tested/MeasurementPlan/curator/index.vue
@@ -1,5 +1,5 @@
 <!-- 负责人送检通知 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="CuratorNotice">
 import page from '@/views/tested/MeasurementPlan/dept/components/list.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/delay/index.vue b/src/views/tested/MeasurementPlan/delay/index.vue
index 1f44650..de91052 100644
--- a/src/views/tested/MeasurementPlan/delay/index.vue
+++ b/src/views/tested/MeasurementPlan/delay/index.vue
@@ -1,5 +1,5 @@
 <!-- 延迟送检申请 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="DelayApplication">
 import page from '@/views/tested/MeasurementPlan/early/components/page.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/dept/components/edit.vue b/src/views/tested/MeasurementPlan/dept/components/edit.vue
index bafdf9e..e1707f7 100644
--- a/src/views/tested/MeasurementPlan/dept/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/edit.vue
@@ -1,5 +1,5 @@
-<!-- 设备分组信息-编辑 -->
-<script lang="ts" setup name="addNotice">
+<!-- 送检通知 详情 -->
+<script lang="ts" setup name="NoticeEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import tableList from './tableList.vue'
 const $route = useRoute()
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index e1cd2ee..2c8e6e5 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -1,5 +1,5 @@
 <!-- 部门/负责人送检通知表格 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="NotceList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/measurementPlan/dept'
diff --git a/src/views/tested/MeasurementPlan/dept/components/tableList.vue b/src/views/tested/MeasurementPlan/dept/components/tableList.vue
index 878d6e9..49e3b43 100644
--- a/src/views/tested/MeasurementPlan/dept/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/tableList.vue
@@ -1,5 +1,5 @@
 <!-- 任务单列表 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="TaskTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListExpand, getListTogether } from '@/api/eqpt/measurementPlan/dept'
 const $props = defineProps({
@@ -126,7 +126,7 @@
 </script>
 
 <template>
-  <detail-block-switch title="任务单列表">
+  <detail-block-com>
     <table-container>
       <!-- 展开行表格 -->
       <normal-table
@@ -141,7 +141,7 @@
         :expand-row-keys="expands" :show-header="false" @expand-change="expandChange"
       >
         <el-table-column type="expand">
-          <template #default="props">
+          <template #default="">
             <normal-table
               :data="expandList" :total="0" :columns="columns" :list-loading="expandLoading" :options="{
                 needIndex: false, // 是否需要序号列
@@ -159,7 +159,7 @@
         </el-table-column>
       </el-table>
     </table-container>
-  </detail-block-switch>
+  </detail-block-com>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/tested/MeasurementPlan/dept/index.vue b/src/views/tested/MeasurementPlan/dept/index.vue
index 0be6e43..aafe5e1 100644
--- a/src/views/tested/MeasurementPlan/dept/index.vue
+++ b/src/views/tested/MeasurementPlan/dept/index.vue
@@ -1,5 +1,5 @@
 <!-- 部门送检通知 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="DeptNotice">
 import page from './components/list.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/early/components/detail.vue b/src/views/tested/MeasurementPlan/early/components/detail.vue
index 72cfdfc..e4e2a22 100644
--- a/src/views/tested/MeasurementPlan/early/components/detail.vue
+++ b/src/views/tested/MeasurementPlan/early/components/detail.vue
@@ -2,7 +2,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import baseInfo from './edit.vue'
 import ApprovalDialog from './ApprovalDialog.vue'
-import { editBtn } from '@/views/tested/device/info/components/applyBtns'
+import { editBtn } from '@/utils/applyBtns'
 import { cancelApply, delApply } from '@/api/eqpt/measurementPlan/early'
 const $route = useRoute()
 const activeName = ref('基本信息')
@@ -99,9 +99,9 @@
           审批详情
         </el-radio-button>
       </el-radio-group>
-      <base-info v-if="activeName === '基本信息'" class="device-base-info" />
-      <report-table v-if="activeName === '审批详情'" :data="[]" status="detail" />
     </detail-block-com>
+    <base-info v-if="activeName === '基本信息'" class="device-base-info" />
+    <!-- <report-table v-if="activeName === '审批详情'" :data="[]" status="detail" /> -->
   </app-container>
 </template>
 
diff --git a/src/views/tested/MeasurementPlan/early/components/edit.vue b/src/views/tested/MeasurementPlan/early/components/edit.vue
index 2cd80b2..2fe4276 100644
--- a/src/views/tested/MeasurementPlan/early/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/early/components/edit.vue
@@ -1,5 +1,5 @@
 <!-- 延迟/提前送检-编辑 -->
-<script lang="ts" setup name="PlanEdit">
+<script lang="ts" setup name="ApplicationEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
@@ -201,7 +201,7 @@
     <detail-block-com>
       <el-form
         ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form"
-        :class="[dialogStatus === 'detail' ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
+        :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
diff --git a/src/views/tested/MeasurementPlan/early/components/page.vue b/src/views/tested/MeasurementPlan/early/components/page.vue
index 19c0855..7e6d9b2 100644
--- a/src/views/tested/MeasurementPlan/early/components/page.vue
+++ b/src/views/tested/MeasurementPlan/early/components/page.vue
@@ -45,13 +45,13 @@
 }
 
 watch(current, (newValue) => {
-  window.sessionStorage.setItem(`plan-${$props.approvalType}`, newValue)
+  window.sessionStorage.setItem(`application-${$props.approvalType}`, newValue)
   com.value = menu.value.filter(item => item.name === newValue)[0].com
 })
 
 onMounted(async () => {
   await getMenuStatus()
-  current.value = window.sessionStorage.getItem(`plan-${$props.approvalType}`) || '全部'
+  current.value = window.sessionStorage.getItem(`application-${$props.approvalType}`) || '全部'
   com.value = menu.value.filter(item => item.name === current.value)[0].com
 })
 </script>
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index e4a148d..c3979ce 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -1,5 +1,5 @@
 <!-- 计量计划弹窗 -->
-<script lang="ts" setup name="PlanList">
+<script lang="ts" setup name="PlanListDialog">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import ApprovalDialog from './ApprovalDialog.vue'
diff --git a/src/views/tested/MeasurementPlan/early/components/table.vue b/src/views/tested/MeasurementPlan/early/components/table.vue
index ff9ef7e..1e4546b 100644
--- a/src/views/tested/MeasurementPlan/early/components/table.vue
+++ b/src/views/tested/MeasurementPlan/early/components/table.vue
@@ -1,5 +1,5 @@
 <!-- 计量计划-计划列表 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="PlanTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectPlan from './selelectPlan.vue'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
@@ -228,11 +228,11 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.id" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text"
         align="center"
       >
         <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
diff --git a/src/views/tested/MeasurementPlan/early/index.vue b/src/views/tested/MeasurementPlan/early/index.vue
index 723bb90..f389baa 100644
--- a/src/views/tested/MeasurementPlan/early/index.vue
+++ b/src/views/tested/MeasurementPlan/early/index.vue
@@ -1,5 +1,5 @@
 <!-- 提前送检申请 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="EarlyApplication">
 import page from './components/page.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/plan/components/dataList.vue b/src/views/tested/MeasurementPlan/plan/components/dataList.vue
index 521ed63..a7db75e 100644
--- a/src/views/tested/MeasurementPlan/plan/components/dataList.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/dataList.vue
@@ -127,7 +127,7 @@
       :row-key=" getRowKeys " :expand-row-keys=" expands " :show-header=" false " @expand-change=" expandChange "
     >
       <el-table-column type="expand">
-        <template #default="props">
+        <template #default="">
           <normal-table
             :data=" expandList " :total=" 0 " :columns=" columns " :list-loading=" expandLoading " :options="
               {
diff --git a/src/views/tested/MeasurementPlan/plan/components/detail.vue b/src/views/tested/MeasurementPlan/plan/components/detail.vue
index c830647..835df8b 100644
--- a/src/views/tested/MeasurementPlan/plan/components/detail.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/detail.vue
@@ -1,8 +1,9 @@
-<script lang="ts" setup name="addNotice">
+<!-- 计量计划 详情页面 -->
+<script lang="ts" setup name="PlanDetail">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import baseInfo from './infoDetail.vue'
 import ApprovalDialog from './ApprovalDialog.vue'
-import { editBtn, submitBtn } from '@/views/tested/device/info/components/applyBtns'
+import { editBtn, submitBtn } from '@/utils/applyBtns'
 import { cancelPlan, delPlan, editPlan, sendNotify, submitPlan } from '@/api/eqpt/measurementPlan/paln'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const $route = useRoute()
@@ -28,7 +29,7 @@
 // 删除
 const delForm = () => {
   ElMessageBox.confirm(
-    '确认删除设备信息吗?',
+    '确认删除吗?',
     '确认',
     {
       confirmButtonText: '确认',
@@ -94,12 +95,6 @@
         <el-button v-if="editBtn(statusName, 'detail')" type="primary" @click="editForm()">
           编辑
         </el-button>
-        <!-- <el-button v-if="submitBtn(statusName, 'detail')" type="primary" @click="submitForm()">
-          提交
-        </el-button> -->
-        <!-- <el-button v-if="submitBtn(statusName, 'detail')" type="primary" @click="saveForm(ruleFormRef, ruleFormRef1)">
-          保存
-        </el-button> -->
         <el-button v-if="statusName === '已通过' || statusName === '全部'" type="primary">
           打印
         </el-button>
@@ -123,18 +118,9 @@
           审批详情
         </el-radio-button>
       </el-radio-group>
-      <base-info v-if="activeName === '基本信息'" class="device-base-info" />
-      <report-table v-if="activeName === '审批详情'" :data="[]" status="detail" />
-      <!-- <el-tabs v-model="activeName" type="card" class="demo-tabs">
-        <el-tab-pane label="基本信息" name="基本信息">
-          <base-info />
-        </el-tab-pane>
-        <el-tab-pane label="审批详情" name="审批详情">
-          审批详情
-          <report-table :data="[]" status="detail" />
-        </el-tab-pane>
-      </el-tabs> -->
     </detail-block-com>
+    <base-info v-if="activeName === '基本信息'" class="device-base-info" />
+    <report-table v-if="activeName === '审批详情'" :data="[]" status="detail" />
   </app-container>
 </template>
 
diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue
index b8d1ab0..df1d62b 100644
--- a/src/views/tested/MeasurementPlan/plan/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue
@@ -289,7 +289,7 @@
     <detail-block-com>
       <el-form
         ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form"
-        :class="[dialogStatus === 'detail' ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
+        :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
diff --git a/src/views/tested/MeasurementPlan/plan/components/infoDetail.vue b/src/views/tested/MeasurementPlan/plan/components/infoDetail.vue
index c585682..0e5d0af 100644
--- a/src/views/tested/MeasurementPlan/plan/components/infoDetail.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/infoDetail.vue
@@ -52,7 +52,7 @@
   <detail-block-com>
     <el-form
       ref="ruleFormRef" :model="ruleForm" label-position="right" label-width="110px" class="form"
-      :class="[dialogStatus === 'detail' ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
+      :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
     >
       <el-row :gutter="24" class="marg">
         <el-col :span="6">
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 953432c..da9ecad 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -1,5 +1,5 @@
-<!-- 设备列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
+<!-- 设备列表弹窗-多选 -->
+<script lang="ts" setup name="SelectDeviceMultiple">
 import { ElMessage } from 'element-plus'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
@@ -131,7 +131,6 @@
     // 单选
     if (selectList.value.length) {
       emits('add', selectList.value[0])
-      // emits('add', device)
       dialogFormVisible.value = false
       reset()
     }
@@ -197,14 +196,9 @@
       <normal-table
         v-if="dialogFormVisible"
         :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
-        :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage" @multiSelect="multiSelect"
+        :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
       >
         <template #preColumns>
-          <!-- <el-table-column v-if="!multi" label="" width="55" align="center">
-            <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" :disabled="scope.row.isRadioDisabled" class="radio" />
-            </template>
-          </el-table-column> -->
           <el-table-column label="#" width="55" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index 1d48e55..67710f3 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -1,5 +1,5 @@
 <!-- 计量计划-计划列表 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="PlatListTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectDevice from './selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
@@ -9,13 +9,8 @@
     type: Array,
     default: () => ([]),
   },
-  status: {
-    type: String,
-    required: true,
-  },
 })
 const $route = useRoute()
-const dialogStatus = ref('update') // 对话框类型：create,update
 // 表头显示标题
 const columns = ref([
   {
@@ -64,7 +59,7 @@
 const list = ref<IlistObjType[]>([])
 // 检查数据列表
 function checkCertificateList() {
-  return useCheckList(list.value as any, columns.value as any, '设备信息')
+  return useCheckList(list.value as any, columns.value as any, '计划列表')
 }
 // 将列表置为不可编辑状态
 function setAllRowReadable() {
@@ -87,7 +82,6 @@
 }
 // 添加行
 const addRow = () => {
-  // certificateRef.value.initDialog({ title: '添加' })
   if (checkCertificateList()) {
     setAllRowReadable()
     list.value.push({
@@ -147,7 +141,6 @@
 }
 const initDialog = () => {
   list.value = $props.data as IlistObjType[]
-  dialogStatus.value = $props.status
 }
 // 批量增加
 const batch = () => {
@@ -193,7 +186,7 @@
         align="center"
       >
         <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
diff --git a/src/views/tested/MeasurementPlan/plan/index.vue b/src/views/tested/MeasurementPlan/plan/index.vue
index 90c24d0..f9d978a 100644
--- a/src/views/tested/MeasurementPlan/plan/index.vue
+++ b/src/views/tested/MeasurementPlan/plan/index.vue
@@ -1,5 +1,5 @@
 <!-- 计量计划 -->
-<script lang="ts" setup name="qualityFile">
+<script lang="ts" setup name="PlanIndex">
 import infoList from './components/list.vue'
 import { getDictByCode } from '@/api/system/dict'
 export interface menuType {
diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue
index bc1ca2c..6078532 100644
--- a/src/views/tested/MeasurementPlan/task/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/task/components/edit.vue
@@ -1,5 +1,5 @@
 <!-- 设备分组信息-编辑 -->
-<script lang="ts" setup name="addNotice">
+<script lang="ts" setup name="TaskEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
@@ -175,7 +175,7 @@
       </template>
     </detail-page>
     <detail-block-com>
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" :class="$route.path.includes('detail') ? 'isDetail' : ''" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="任务单编号">
@@ -261,11 +261,11 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="承接时间" prop="undertakeTime">
-              <el-input v-model.trim="ruleForm.undertakeTime" />
-              <!-- <el-date-picker
+              <!-- <el-input v-model.trim="ruleForm.undertakeTime" /> -->
+              <el-date-picker
                 v-model="ruleForm.undertakeTime" type="date" format="YYYY-MM-DD"
                 value-format="YYYY-MM-DD" placeholder="承接时间" class="normal-date" style="width: 100%;"
-              /> -->
+              />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index b9cc89e..22a466f 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -1,21 +1,17 @@
 <!-- 任务单列表 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="Task">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
 import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
 import { uploadApi } from '@/api/system/notice'
+import { useCheckList } from '@/utils/useCheckList'
 const $props = defineProps({
   data: {
     type: Array,
     default: () => ([]),
   },
-  status: {
-    type: String,
-    required: true,
-  },
 })
 const $route = useRoute()
-const dialogStatus = ref('update') // 对话框类型：create,update
 // 表头显示标题
 const columns = ref([
   {
@@ -72,17 +68,7 @@
 const list = ref<any[]>([])
 // 检查数据列表
 function checkCertificateList() {
-  for (let index = 0; index < list.value.length; index++) {
-    const item = list.value[index]
-    for (const prop of columns.value) {
-      // 检查必填
-      if (prop.required && !item[prop.value]) {
-        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
-        return false
-      }
-    }
-  }
-  return true
+  return useCheckList(list.value, columns.value, '任务单列表')
 }
 // 将列表置为不可编辑状态
 function setAllRowReadable() {
@@ -105,7 +91,6 @@
 }
 // 添加行
 const addRow = () => {
-  // certificateRef.value.initDialog({ title: '添加' })
   if (checkCertificateList()) {
     setAllRowReadable()
     list.value.push({
@@ -129,7 +114,6 @@
 }
 const initDialog = () => {
   list.value = $props.data
-  dialogStatus.value = $props.status
 }
 watch(() => $props.data, (newVal) => {
   if (newVal) {
@@ -255,11 +239,11 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.id" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in columns" :key="item.value" :width="item.width" :prop="item.value" :label="item.text"
         align="center"
       >
         <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>

diff --git a/src/components/DetailPage/DetailBlockCom.vue b/src/components/DetailPage/DetailBlockCom.vue
index 13bd2aa..3eee911 100644
--- a/src/components/DetailPage/DetailBlockCom.vue
+++ b/src/components/DetailPage/DetailBlockCom.vue
@@ -40,7 +40,7 @@
 
   .content {
     background-color: #fff;
-    // padding: 0 10px 20px;
+    padding: 0 10px 20px;
     margin-top: 10px;
   }
 }
diff --git a/src/views/tested/MeasurementPlan/board/index.vue b/src/views/tested/MeasurementPlan/board/index.vue
index a8f61aa..d632088 100644
--- a/src/views/tested/MeasurementPlan/board/index.vue
+++ b/src/views/tested/MeasurementPlan/board/index.vue
@@ -1,5 +1,5 @@
 <!-- 业务看板 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="BoardList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/measurementPlan/task'
diff --git a/src/views/tested/MeasurementPlan/curator/index.vue b/src/views/tested/MeasurementPlan/curator/index.vue
index 02499ee..6158ffd 100644
--- a/src/views/tested/MeasurementPlan/curator/index.vue
+++ b/src/views/tested/MeasurementPlan/curator/index.vue
@@ -1,5 +1,5 @@
 <!-- 负责人送检通知 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="CuratorNotice">
 import page from '@/views/tested/MeasurementPlan/dept/components/list.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/delay/index.vue b/src/views/tested/MeasurementPlan/delay/index.vue
index 1f44650..de91052 100644
--- a/src/views/tested/MeasurementPlan/delay/index.vue
+++ b/src/views/tested/MeasurementPlan/delay/index.vue
@@ -1,5 +1,5 @@
 <!-- 延迟送检申请 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="DelayApplication">
 import page from '@/views/tested/MeasurementPlan/early/components/page.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/dept/components/edit.vue b/src/views/tested/MeasurementPlan/dept/components/edit.vue
index bafdf9e..e1707f7 100644
--- a/src/views/tested/MeasurementPlan/dept/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/edit.vue
@@ -1,5 +1,5 @@
-<!-- 设备分组信息-编辑 -->
-<script lang="ts" setup name="addNotice">
+<!-- 送检通知 详情 -->
+<script lang="ts" setup name="NoticeEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import tableList from './tableList.vue'
 const $route = useRoute()
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index e1cd2ee..2c8e6e5 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -1,5 +1,5 @@
 <!-- 部门/负责人送检通知表格 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="NotceList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/measurementPlan/dept'
diff --git a/src/views/tested/MeasurementPlan/dept/components/tableList.vue b/src/views/tested/MeasurementPlan/dept/components/tableList.vue
index 878d6e9..49e3b43 100644
--- a/src/views/tested/MeasurementPlan/dept/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/tableList.vue
@@ -1,5 +1,5 @@
 <!-- 任务单列表 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="TaskTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListExpand, getListTogether } from '@/api/eqpt/measurementPlan/dept'
 const $props = defineProps({
@@ -126,7 +126,7 @@
 </script>
 
 <template>
-  <detail-block-switch title="任务单列表">
+  <detail-block-com>
     <table-container>
       <!-- 展开行表格 -->
       <normal-table
@@ -141,7 +141,7 @@
         :expand-row-keys="expands" :show-header="false" @expand-change="expandChange"
       >
         <el-table-column type="expand">
-          <template #default="props">
+          <template #default="">
             <normal-table
               :data="expandList" :total="0" :columns="columns" :list-loading="expandLoading" :options="{
                 needIndex: false, // 是否需要序号列
@@ -159,7 +159,7 @@
         </el-table-column>
       </el-table>
     </table-container>
-  </detail-block-switch>
+  </detail-block-com>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/tested/MeasurementPlan/dept/index.vue b/src/views/tested/MeasurementPlan/dept/index.vue
index 0be6e43..aafe5e1 100644
--- a/src/views/tested/MeasurementPlan/dept/index.vue
+++ b/src/views/tested/MeasurementPlan/dept/index.vue
@@ -1,5 +1,5 @@
 <!-- 部门送检通知 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="DeptNotice">
 import page from './components/list.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/early/components/detail.vue b/src/views/tested/MeasurementPlan/early/components/detail.vue
index 72cfdfc..e4e2a22 100644
--- a/src/views/tested/MeasurementPlan/early/components/detail.vue
+++ b/src/views/tested/MeasurementPlan/early/components/detail.vue
@@ -2,7 +2,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import baseInfo from './edit.vue'
 import ApprovalDialog from './ApprovalDialog.vue'
-import { editBtn } from '@/views/tested/device/info/components/applyBtns'
+import { editBtn } from '@/utils/applyBtns'
 import { cancelApply, delApply } from '@/api/eqpt/measurementPlan/early'
 const $route = useRoute()
 const activeName = ref('基本信息')
@@ -99,9 +99,9 @@
           审批详情
         </el-radio-button>
       </el-radio-group>
-      <base-info v-if="activeName === '基本信息'" class="device-base-info" />
-      <report-table v-if="activeName === '审批详情'" :data="[]" status="detail" />
     </detail-block-com>
+    <base-info v-if="activeName === '基本信息'" class="device-base-info" />
+    <!-- <report-table v-if="activeName === '审批详情'" :data="[]" status="detail" /> -->
   </app-container>
 </template>
 
diff --git a/src/views/tested/MeasurementPlan/early/components/edit.vue b/src/views/tested/MeasurementPlan/early/components/edit.vue
index 2cd80b2..2fe4276 100644
--- a/src/views/tested/MeasurementPlan/early/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/early/components/edit.vue
@@ -1,5 +1,5 @@
 <!-- 延迟/提前送检-编辑 -->
-<script lang="ts" setup name="PlanEdit">
+<script lang="ts" setup name="ApplicationEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
@@ -201,7 +201,7 @@
     <detail-block-com>
       <el-form
         ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form"
-        :class="[dialogStatus === 'detail' ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
+        :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
diff --git a/src/views/tested/MeasurementPlan/early/components/page.vue b/src/views/tested/MeasurementPlan/early/components/page.vue
index 19c0855..7e6d9b2 100644
--- a/src/views/tested/MeasurementPlan/early/components/page.vue
+++ b/src/views/tested/MeasurementPlan/early/components/page.vue
@@ -45,13 +45,13 @@
 }
 
 watch(current, (newValue) => {
-  window.sessionStorage.setItem(`plan-${$props.approvalType}`, newValue)
+  window.sessionStorage.setItem(`application-${$props.approvalType}`, newValue)
   com.value = menu.value.filter(item => item.name === newValue)[0].com
 })
 
 onMounted(async () => {
   await getMenuStatus()
-  current.value = window.sessionStorage.getItem(`plan-${$props.approvalType}`) || '全部'
+  current.value = window.sessionStorage.getItem(`application-${$props.approvalType}`) || '全部'
   com.value = menu.value.filter(item => item.name === current.value)[0].com
 })
 </script>
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index e4a148d..c3979ce 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -1,5 +1,5 @@
 <!-- 计量计划弹窗 -->
-<script lang="ts" setup name="PlanList">
+<script lang="ts" setup name="PlanListDialog">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import ApprovalDialog from './ApprovalDialog.vue'
diff --git a/src/views/tested/MeasurementPlan/early/components/table.vue b/src/views/tested/MeasurementPlan/early/components/table.vue
index ff9ef7e..1e4546b 100644
--- a/src/views/tested/MeasurementPlan/early/components/table.vue
+++ b/src/views/tested/MeasurementPlan/early/components/table.vue
@@ -1,5 +1,5 @@
 <!-- 计量计划-计划列表 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="PlanTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectPlan from './selelectPlan.vue'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
@@ -228,11 +228,11 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.id" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text"
         align="center"
       >
         <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
diff --git a/src/views/tested/MeasurementPlan/early/index.vue b/src/views/tested/MeasurementPlan/early/index.vue
index 723bb90..f389baa 100644
--- a/src/views/tested/MeasurementPlan/early/index.vue
+++ b/src/views/tested/MeasurementPlan/early/index.vue
@@ -1,5 +1,5 @@
 <!-- 提前送检申请 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="EarlyApplication">
 import page from './components/page.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/plan/components/dataList.vue b/src/views/tested/MeasurementPlan/plan/components/dataList.vue
index 521ed63..a7db75e 100644
--- a/src/views/tested/MeasurementPlan/plan/components/dataList.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/dataList.vue
@@ -127,7 +127,7 @@
       :row-key=" getRowKeys " :expand-row-keys=" expands " :show-header=" false " @expand-change=" expandChange "
     >
       <el-table-column type="expand">
-        <template #default="props">
+        <template #default="">
           <normal-table
             :data=" expandList " :total=" 0 " :columns=" columns " :list-loading=" expandLoading " :options="
               {
diff --git a/src/views/tested/MeasurementPlan/plan/components/detail.vue b/src/views/tested/MeasurementPlan/plan/components/detail.vue
index c830647..835df8b 100644
--- a/src/views/tested/MeasurementPlan/plan/components/detail.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/detail.vue
@@ -1,8 +1,9 @@
-<script lang="ts" setup name="addNotice">
+<!-- 计量计划 详情页面 -->
+<script lang="ts" setup name="PlanDetail">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import baseInfo from './infoDetail.vue'
 import ApprovalDialog from './ApprovalDialog.vue'
-import { editBtn, submitBtn } from '@/views/tested/device/info/components/applyBtns'
+import { editBtn, submitBtn } from '@/utils/applyBtns'
 import { cancelPlan, delPlan, editPlan, sendNotify, submitPlan } from '@/api/eqpt/measurementPlan/paln'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const $route = useRoute()
@@ -28,7 +29,7 @@
 // 删除
 const delForm = () => {
   ElMessageBox.confirm(
-    '确认删除设备信息吗?',
+    '确认删除吗?',
     '确认',
     {
       confirmButtonText: '确认',
@@ -94,12 +95,6 @@
         <el-button v-if="editBtn(statusName, 'detail')" type="primary" @click="editForm()">
           编辑
         </el-button>
-        <!-- <el-button v-if="submitBtn(statusName, 'detail')" type="primary" @click="submitForm()">
-          提交
-        </el-button> -->
-        <!-- <el-button v-if="submitBtn(statusName, 'detail')" type="primary" @click="saveForm(ruleFormRef, ruleFormRef1)">
-          保存
-        </el-button> -->
         <el-button v-if="statusName === '已通过' || statusName === '全部'" type="primary">
           打印
         </el-button>
@@ -123,18 +118,9 @@
           审批详情
         </el-radio-button>
       </el-radio-group>
-      <base-info v-if="activeName === '基本信息'" class="device-base-info" />
-      <report-table v-if="activeName === '审批详情'" :data="[]" status="detail" />
-      <!-- <el-tabs v-model="activeName" type="card" class="demo-tabs">
-        <el-tab-pane label="基本信息" name="基本信息">
-          <base-info />
-        </el-tab-pane>
-        <el-tab-pane label="审批详情" name="审批详情">
-          审批详情
-          <report-table :data="[]" status="detail" />
-        </el-tab-pane>
-      </el-tabs> -->
     </detail-block-com>
+    <base-info v-if="activeName === '基本信息'" class="device-base-info" />
+    <report-table v-if="activeName === '审批详情'" :data="[]" status="detail" />
   </app-container>
 </template>
 
diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue
index b8d1ab0..df1d62b 100644
--- a/src/views/tested/MeasurementPlan/plan/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue
@@ -289,7 +289,7 @@
     <detail-block-com>
       <el-form
         ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form"
-        :class="[dialogStatus === 'detail' ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
+        :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
diff --git a/src/views/tested/MeasurementPlan/plan/components/infoDetail.vue b/src/views/tested/MeasurementPlan/plan/components/infoDetail.vue
index c585682..0e5d0af 100644
--- a/src/views/tested/MeasurementPlan/plan/components/infoDetail.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/infoDetail.vue
@@ -52,7 +52,7 @@
   <detail-block-com>
     <el-form
       ref="ruleFormRef" :model="ruleForm" label-position="right" label-width="110px" class="form"
-      :class="[dialogStatus === 'detail' ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
+      :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
     >
       <el-row :gutter="24" class="marg">
         <el-col :span="6">
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 953432c..da9ecad 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -1,5 +1,5 @@
-<!-- 设备列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
+<!-- 设备列表弹窗-多选 -->
+<script lang="ts" setup name="SelectDeviceMultiple">
 import { ElMessage } from 'element-plus'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
@@ -131,7 +131,6 @@
     // 单选
     if (selectList.value.length) {
       emits('add', selectList.value[0])
-      // emits('add', device)
       dialogFormVisible.value = false
       reset()
     }
@@ -197,14 +196,9 @@
       <normal-table
         v-if="dialogFormVisible"
         :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
-        :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage" @multiSelect="multiSelect"
+        :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
       >
         <template #preColumns>
-          <!-- <el-table-column v-if="!multi" label="" width="55" align="center">
-            <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" :disabled="scope.row.isRadioDisabled" class="radio" />
-            </template>
-          </el-table-column> -->
           <el-table-column label="#" width="55" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index 1d48e55..67710f3 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -1,5 +1,5 @@
 <!-- 计量计划-计划列表 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="PlatListTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectDevice from './selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
@@ -9,13 +9,8 @@
     type: Array,
     default: () => ([]),
   },
-  status: {
-    type: String,
-    required: true,
-  },
 })
 const $route = useRoute()
-const dialogStatus = ref('update') // 对话框类型：create,update
 // 表头显示标题
 const columns = ref([
   {
@@ -64,7 +59,7 @@
 const list = ref<IlistObjType[]>([])
 // 检查数据列表
 function checkCertificateList() {
-  return useCheckList(list.value as any, columns.value as any, '设备信息')
+  return useCheckList(list.value as any, columns.value as any, '计划列表')
 }
 // 将列表置为不可编辑状态
 function setAllRowReadable() {
@@ -87,7 +82,6 @@
 }
 // 添加行
 const addRow = () => {
-  // certificateRef.value.initDialog({ title: '添加' })
   if (checkCertificateList()) {
     setAllRowReadable()
     list.value.push({
@@ -147,7 +141,6 @@
 }
 const initDialog = () => {
   list.value = $props.data as IlistObjType[]
-  dialogStatus.value = $props.status
 }
 // 批量增加
 const batch = () => {
@@ -193,7 +186,7 @@
         align="center"
       >
         <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
diff --git a/src/views/tested/MeasurementPlan/plan/index.vue b/src/views/tested/MeasurementPlan/plan/index.vue
index 90c24d0..f9d978a 100644
--- a/src/views/tested/MeasurementPlan/plan/index.vue
+++ b/src/views/tested/MeasurementPlan/plan/index.vue
@@ -1,5 +1,5 @@
 <!-- 计量计划 -->
-<script lang="ts" setup name="qualityFile">
+<script lang="ts" setup name="PlanIndex">
 import infoList from './components/list.vue'
 import { getDictByCode } from '@/api/system/dict'
 export interface menuType {
diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue
index bc1ca2c..6078532 100644
--- a/src/views/tested/MeasurementPlan/task/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/task/components/edit.vue
@@ -1,5 +1,5 @@
 <!-- 设备分组信息-编辑 -->
-<script lang="ts" setup name="addNotice">
+<script lang="ts" setup name="TaskEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
@@ -175,7 +175,7 @@
       </template>
     </detail-page>
     <detail-block-com>
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" :class="$route.path.includes('detail') ? 'isDetail' : ''" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="任务单编号">
@@ -261,11 +261,11 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="承接时间" prop="undertakeTime">
-              <el-input v-model.trim="ruleForm.undertakeTime" />
-              <!-- <el-date-picker
+              <!-- <el-input v-model.trim="ruleForm.undertakeTime" /> -->
+              <el-date-picker
                 v-model="ruleForm.undertakeTime" type="date" format="YYYY-MM-DD"
                 value-format="YYYY-MM-DD" placeholder="承接时间" class="normal-date" style="width: 100%;"
-              /> -->
+              />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index b9cc89e..22a466f 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -1,21 +1,17 @@
 <!-- 任务单列表 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="Task">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
 import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
 import { uploadApi } from '@/api/system/notice'
+import { useCheckList } from '@/utils/useCheckList'
 const $props = defineProps({
   data: {
     type: Array,
     default: () => ([]),
   },
-  status: {
-    type: String,
-    required: true,
-  },
 })
 const $route = useRoute()
-const dialogStatus = ref('update') // 对话框类型：create,update
 // 表头显示标题
 const columns = ref([
   {
@@ -72,17 +68,7 @@
 const list = ref<any[]>([])
 // 检查数据列表
 function checkCertificateList() {
-  for (let index = 0; index < list.value.length; index++) {
-    const item = list.value[index]
-    for (const prop of columns.value) {
-      // 检查必填
-      if (prop.required && !item[prop.value]) {
-        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
-        return false
-      }
-    }
-  }
-  return true
+  return useCheckList(list.value, columns.value, '任务单列表')
 }
 // 将列表置为不可编辑状态
 function setAllRowReadable() {
@@ -105,7 +91,6 @@
 }
 // 添加行
 const addRow = () => {
-  // certificateRef.value.initDialog({ title: '添加' })
   if (checkCertificateList()) {
     setAllRowReadable()
     list.value.push({
@@ -129,7 +114,6 @@
 }
 const initDialog = () => {
   list.value = $props.data
-  dialogStatus.value = $props.status
 }
 watch(() => $props.data, (newVal) => {
   if (newVal) {
@@ -255,11 +239,11 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.id" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in columns" :key="item.value" :width="item.width" :prop="item.value" :label="item.text"
         align="center"
       >
         <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
diff --git a/src/views/tested/MeasurementPlan/task/index.vue b/src/views/tested/MeasurementPlan/task/index.vue
index e01ab06..5dc4ad6 100644
--- a/src/views/tested/MeasurementPlan/task/index.vue
+++ b/src/views/tested/MeasurementPlan/task/index.vue
@@ -1,5 +1,5 @@
 <!-- 任务单管理表格 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="TaskList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { cancelTask, getListPage } from '@/api/eqpt/measurementPlan/task'

diff --git a/src/components/DetailPage/DetailBlockCom.vue b/src/components/DetailPage/DetailBlockCom.vue
index 13bd2aa..3eee911 100644
--- a/src/components/DetailPage/DetailBlockCom.vue
+++ b/src/components/DetailPage/DetailBlockCom.vue
@@ -40,7 +40,7 @@
 
   .content {
     background-color: #fff;
-    // padding: 0 10px 20px;
+    padding: 0 10px 20px;
     margin-top: 10px;
   }
 }
diff --git a/src/views/tested/MeasurementPlan/board/index.vue b/src/views/tested/MeasurementPlan/board/index.vue
index a8f61aa..d632088 100644
--- a/src/views/tested/MeasurementPlan/board/index.vue
+++ b/src/views/tested/MeasurementPlan/board/index.vue
@@ -1,5 +1,5 @@
 <!-- 业务看板 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="BoardList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/measurementPlan/task'
diff --git a/src/views/tested/MeasurementPlan/curator/index.vue b/src/views/tested/MeasurementPlan/curator/index.vue
index 02499ee..6158ffd 100644
--- a/src/views/tested/MeasurementPlan/curator/index.vue
+++ b/src/views/tested/MeasurementPlan/curator/index.vue
@@ -1,5 +1,5 @@
 <!-- 负责人送检通知 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="CuratorNotice">
 import page from '@/views/tested/MeasurementPlan/dept/components/list.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/delay/index.vue b/src/views/tested/MeasurementPlan/delay/index.vue
index 1f44650..de91052 100644
--- a/src/views/tested/MeasurementPlan/delay/index.vue
+++ b/src/views/tested/MeasurementPlan/delay/index.vue
@@ -1,5 +1,5 @@
 <!-- 延迟送检申请 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="DelayApplication">
 import page from '@/views/tested/MeasurementPlan/early/components/page.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/dept/components/edit.vue b/src/views/tested/MeasurementPlan/dept/components/edit.vue
index bafdf9e..e1707f7 100644
--- a/src/views/tested/MeasurementPlan/dept/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/edit.vue
@@ -1,5 +1,5 @@
-<!-- 设备分组信息-编辑 -->
-<script lang="ts" setup name="addNotice">
+<!-- 送检通知 详情 -->
+<script lang="ts" setup name="NoticeEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import tableList from './tableList.vue'
 const $route = useRoute()
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index e1cd2ee..2c8e6e5 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -1,5 +1,5 @@
 <!-- 部门/负责人送检通知表格 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="NotceList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/measurementPlan/dept'
diff --git a/src/views/tested/MeasurementPlan/dept/components/tableList.vue b/src/views/tested/MeasurementPlan/dept/components/tableList.vue
index 878d6e9..49e3b43 100644
--- a/src/views/tested/MeasurementPlan/dept/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/tableList.vue
@@ -1,5 +1,5 @@
 <!-- 任务单列表 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="TaskTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListExpand, getListTogether } from '@/api/eqpt/measurementPlan/dept'
 const $props = defineProps({
@@ -126,7 +126,7 @@
 </script>
 
 <template>
-  <detail-block-switch title="任务单列表">
+  <detail-block-com>
     <table-container>
       <!-- 展开行表格 -->
       <normal-table
@@ -141,7 +141,7 @@
         :expand-row-keys="expands" :show-header="false" @expand-change="expandChange"
       >
         <el-table-column type="expand">
-          <template #default="props">
+          <template #default="">
             <normal-table
               :data="expandList" :total="0" :columns="columns" :list-loading="expandLoading" :options="{
                 needIndex: false, // 是否需要序号列
@@ -159,7 +159,7 @@
         </el-table-column>
       </el-table>
     </table-container>
-  </detail-block-switch>
+  </detail-block-com>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/tested/MeasurementPlan/dept/index.vue b/src/views/tested/MeasurementPlan/dept/index.vue
index 0be6e43..aafe5e1 100644
--- a/src/views/tested/MeasurementPlan/dept/index.vue
+++ b/src/views/tested/MeasurementPlan/dept/index.vue
@@ -1,5 +1,5 @@
 <!-- 部门送检通知 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="DeptNotice">
 import page from './components/list.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/early/components/detail.vue b/src/views/tested/MeasurementPlan/early/components/detail.vue
index 72cfdfc..e4e2a22 100644
--- a/src/views/tested/MeasurementPlan/early/components/detail.vue
+++ b/src/views/tested/MeasurementPlan/early/components/detail.vue
@@ -2,7 +2,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import baseInfo from './edit.vue'
 import ApprovalDialog from './ApprovalDialog.vue'
-import { editBtn } from '@/views/tested/device/info/components/applyBtns'
+import { editBtn } from '@/utils/applyBtns'
 import { cancelApply, delApply } from '@/api/eqpt/measurementPlan/early'
 const $route = useRoute()
 const activeName = ref('基本信息')
@@ -99,9 +99,9 @@
           审批详情
         </el-radio-button>
       </el-radio-group>
-      <base-info v-if="activeName === '基本信息'" class="device-base-info" />
-      <report-table v-if="activeName === '审批详情'" :data="[]" status="detail" />
     </detail-block-com>
+    <base-info v-if="activeName === '基本信息'" class="device-base-info" />
+    <!-- <report-table v-if="activeName === '审批详情'" :data="[]" status="detail" /> -->
   </app-container>
 </template>
 
diff --git a/src/views/tested/MeasurementPlan/early/components/edit.vue b/src/views/tested/MeasurementPlan/early/components/edit.vue
index 2cd80b2..2fe4276 100644
--- a/src/views/tested/MeasurementPlan/early/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/early/components/edit.vue
@@ -1,5 +1,5 @@
 <!-- 延迟/提前送检-编辑 -->
-<script lang="ts" setup name="PlanEdit">
+<script lang="ts" setup name="ApplicationEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
@@ -201,7 +201,7 @@
     <detail-block-com>
       <el-form
         ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form"
-        :class="[dialogStatus === 'detail' ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
+        :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
diff --git a/src/views/tested/MeasurementPlan/early/components/page.vue b/src/views/tested/MeasurementPlan/early/components/page.vue
index 19c0855..7e6d9b2 100644
--- a/src/views/tested/MeasurementPlan/early/components/page.vue
+++ b/src/views/tested/MeasurementPlan/early/components/page.vue
@@ -45,13 +45,13 @@
 }
 
 watch(current, (newValue) => {
-  window.sessionStorage.setItem(`plan-${$props.approvalType}`, newValue)
+  window.sessionStorage.setItem(`application-${$props.approvalType}`, newValue)
   com.value = menu.value.filter(item => item.name === newValue)[0].com
 })
 
 onMounted(async () => {
   await getMenuStatus()
-  current.value = window.sessionStorage.getItem(`plan-${$props.approvalType}`) || '全部'
+  current.value = window.sessionStorage.getItem(`application-${$props.approvalType}`) || '全部'
   com.value = menu.value.filter(item => item.name === current.value)[0].com
 })
 </script>
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index e4a148d..c3979ce 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -1,5 +1,5 @@
 <!-- 计量计划弹窗 -->
-<script lang="ts" setup name="PlanList">
+<script lang="ts" setup name="PlanListDialog">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import ApprovalDialog from './ApprovalDialog.vue'
diff --git a/src/views/tested/MeasurementPlan/early/components/table.vue b/src/views/tested/MeasurementPlan/early/components/table.vue
index ff9ef7e..1e4546b 100644
--- a/src/views/tested/MeasurementPlan/early/components/table.vue
+++ b/src/views/tested/MeasurementPlan/early/components/table.vue
@@ -1,5 +1,5 @@
 <!-- 计量计划-计划列表 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="PlanTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectPlan from './selelectPlan.vue'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
@@ -228,11 +228,11 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.id" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text"
         align="center"
       >
         <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
diff --git a/src/views/tested/MeasurementPlan/early/index.vue b/src/views/tested/MeasurementPlan/early/index.vue
index 723bb90..f389baa 100644
--- a/src/views/tested/MeasurementPlan/early/index.vue
+++ b/src/views/tested/MeasurementPlan/early/index.vue
@@ -1,5 +1,5 @@
 <!-- 提前送检申请 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="EarlyApplication">
 import page from './components/page.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/plan/components/dataList.vue b/src/views/tested/MeasurementPlan/plan/components/dataList.vue
index 521ed63..a7db75e 100644
--- a/src/views/tested/MeasurementPlan/plan/components/dataList.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/dataList.vue
@@ -127,7 +127,7 @@
       :row-key=" getRowKeys " :expand-row-keys=" expands " :show-header=" false " @expand-change=" expandChange "
     >
       <el-table-column type="expand">
-        <template #default="props">
+        <template #default="">
           <normal-table
             :data=" expandList " :total=" 0 " :columns=" columns " :list-loading=" expandLoading " :options="
               {
diff --git a/src/views/tested/MeasurementPlan/plan/components/detail.vue b/src/views/tested/MeasurementPlan/plan/components/detail.vue
index c830647..835df8b 100644
--- a/src/views/tested/MeasurementPlan/plan/components/detail.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/detail.vue
@@ -1,8 +1,9 @@
-<script lang="ts" setup name="addNotice">
+<!-- 计量计划 详情页面 -->
+<script lang="ts" setup name="PlanDetail">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import baseInfo from './infoDetail.vue'
 import ApprovalDialog from './ApprovalDialog.vue'
-import { editBtn, submitBtn } from '@/views/tested/device/info/components/applyBtns'
+import { editBtn, submitBtn } from '@/utils/applyBtns'
 import { cancelPlan, delPlan, editPlan, sendNotify, submitPlan } from '@/api/eqpt/measurementPlan/paln'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const $route = useRoute()
@@ -28,7 +29,7 @@
 // 删除
 const delForm = () => {
   ElMessageBox.confirm(
-    '确认删除设备信息吗?',
+    '确认删除吗?',
     '确认',
     {
       confirmButtonText: '确认',
@@ -94,12 +95,6 @@
         <el-button v-if="editBtn(statusName, 'detail')" type="primary" @click="editForm()">
           编辑
         </el-button>
-        <!-- <el-button v-if="submitBtn(statusName, 'detail')" type="primary" @click="submitForm()">
-          提交
-        </el-button> -->
-        <!-- <el-button v-if="submitBtn(statusName, 'detail')" type="primary" @click="saveForm(ruleFormRef, ruleFormRef1)">
-          保存
-        </el-button> -->
         <el-button v-if="statusName === '已通过' || statusName === '全部'" type="primary">
           打印
         </el-button>
@@ -123,18 +118,9 @@
           审批详情
         </el-radio-button>
       </el-radio-group>
-      <base-info v-if="activeName === '基本信息'" class="device-base-info" />
-      <report-table v-if="activeName === '审批详情'" :data="[]" status="detail" />
-      <!-- <el-tabs v-model="activeName" type="card" class="demo-tabs">
-        <el-tab-pane label="基本信息" name="基本信息">
-          <base-info />
-        </el-tab-pane>
-        <el-tab-pane label="审批详情" name="审批详情">
-          审批详情
-          <report-table :data="[]" status="detail" />
-        </el-tab-pane>
-      </el-tabs> -->
     </detail-block-com>
+    <base-info v-if="activeName === '基本信息'" class="device-base-info" />
+    <report-table v-if="activeName === '审批详情'" :data="[]" status="detail" />
   </app-container>
 </template>
 
diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue
index b8d1ab0..df1d62b 100644
--- a/src/views/tested/MeasurementPlan/plan/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue
@@ -289,7 +289,7 @@
     <detail-block-com>
       <el-form
         ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form"
-        :class="[dialogStatus === 'detail' ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
+        :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
diff --git a/src/views/tested/MeasurementPlan/plan/components/infoDetail.vue b/src/views/tested/MeasurementPlan/plan/components/infoDetail.vue
index c585682..0e5d0af 100644
--- a/src/views/tested/MeasurementPlan/plan/components/infoDetail.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/infoDetail.vue
@@ -52,7 +52,7 @@
   <detail-block-com>
     <el-form
       ref="ruleFormRef" :model="ruleForm" label-position="right" label-width="110px" class="form"
-      :class="[dialogStatus === 'detail' ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
+      :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
     >
       <el-row :gutter="24" class="marg">
         <el-col :span="6">
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 953432c..da9ecad 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -1,5 +1,5 @@
-<!-- 设备列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
+<!-- 设备列表弹窗-多选 -->
+<script lang="ts" setup name="SelectDeviceMultiple">
 import { ElMessage } from 'element-plus'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
@@ -131,7 +131,6 @@
     // 单选
     if (selectList.value.length) {
       emits('add', selectList.value[0])
-      // emits('add', device)
       dialogFormVisible.value = false
       reset()
     }
@@ -197,14 +196,9 @@
       <normal-table
         v-if="dialogFormVisible"
         :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
-        :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage" @multiSelect="multiSelect"
+        :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
       >
         <template #preColumns>
-          <!-- <el-table-column v-if="!multi" label="" width="55" align="center">
-            <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" :disabled="scope.row.isRadioDisabled" class="radio" />
-            </template>
-          </el-table-column> -->
           <el-table-column label="#" width="55" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index 1d48e55..67710f3 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -1,5 +1,5 @@
 <!-- 计量计划-计划列表 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="PlatListTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectDevice from './selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
@@ -9,13 +9,8 @@
     type: Array,
     default: () => ([]),
   },
-  status: {
-    type: String,
-    required: true,
-  },
 })
 const $route = useRoute()
-const dialogStatus = ref('update') // 对话框类型：create,update
 // 表头显示标题
 const columns = ref([
   {
@@ -64,7 +59,7 @@
 const list = ref<IlistObjType[]>([])
 // 检查数据列表
 function checkCertificateList() {
-  return useCheckList(list.value as any, columns.value as any, '设备信息')
+  return useCheckList(list.value as any, columns.value as any, '计划列表')
 }
 // 将列表置为不可编辑状态
 function setAllRowReadable() {
@@ -87,7 +82,6 @@
 }
 // 添加行
 const addRow = () => {
-  // certificateRef.value.initDialog({ title: '添加' })
   if (checkCertificateList()) {
     setAllRowReadable()
     list.value.push({
@@ -147,7 +141,6 @@
 }
 const initDialog = () => {
   list.value = $props.data as IlistObjType[]
-  dialogStatus.value = $props.status
 }
 // 批量增加
 const batch = () => {
@@ -193,7 +186,7 @@
         align="center"
       >
         <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
diff --git a/src/views/tested/MeasurementPlan/plan/index.vue b/src/views/tested/MeasurementPlan/plan/index.vue
index 90c24d0..f9d978a 100644
--- a/src/views/tested/MeasurementPlan/plan/index.vue
+++ b/src/views/tested/MeasurementPlan/plan/index.vue
@@ -1,5 +1,5 @@
 <!-- 计量计划 -->
-<script lang="ts" setup name="qualityFile">
+<script lang="ts" setup name="PlanIndex">
 import infoList from './components/list.vue'
 import { getDictByCode } from '@/api/system/dict'
 export interface menuType {
diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue
index bc1ca2c..6078532 100644
--- a/src/views/tested/MeasurementPlan/task/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/task/components/edit.vue
@@ -1,5 +1,5 @@
 <!-- 设备分组信息-编辑 -->
-<script lang="ts" setup name="addNotice">
+<script lang="ts" setup name="TaskEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
@@ -175,7 +175,7 @@
       </template>
     </detail-page>
     <detail-block-com>
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" :class="$route.path.includes('detail') ? 'isDetail' : ''" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="任务单编号">
@@ -261,11 +261,11 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="承接时间" prop="undertakeTime">
-              <el-input v-model.trim="ruleForm.undertakeTime" />
-              <!-- <el-date-picker
+              <!-- <el-input v-model.trim="ruleForm.undertakeTime" /> -->
+              <el-date-picker
                 v-model="ruleForm.undertakeTime" type="date" format="YYYY-MM-DD"
                 value-format="YYYY-MM-DD" placeholder="承接时间" class="normal-date" style="width: 100%;"
-              /> -->
+              />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index b9cc89e..22a466f 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -1,21 +1,17 @@
 <!-- 任务单列表 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="Task">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
 import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
 import { uploadApi } from '@/api/system/notice'
+import { useCheckList } from '@/utils/useCheckList'
 const $props = defineProps({
   data: {
     type: Array,
     default: () => ([]),
   },
-  status: {
-    type: String,
-    required: true,
-  },
 })
 const $route = useRoute()
-const dialogStatus = ref('update') // 对话框类型：create,update
 // 表头显示标题
 const columns = ref([
   {
@@ -72,17 +68,7 @@
 const list = ref<any[]>([])
 // 检查数据列表
 function checkCertificateList() {
-  for (let index = 0; index < list.value.length; index++) {
-    const item = list.value[index]
-    for (const prop of columns.value) {
-      // 检查必填
-      if (prop.required && !item[prop.value]) {
-        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
-        return false
-      }
-    }
-  }
-  return true
+  return useCheckList(list.value, columns.value, '任务单列表')
 }
 // 将列表置为不可编辑状态
 function setAllRowReadable() {
@@ -105,7 +91,6 @@
 }
 // 添加行
 const addRow = () => {
-  // certificateRef.value.initDialog({ title: '添加' })
   if (checkCertificateList()) {
     setAllRowReadable()
     list.value.push({
@@ -129,7 +114,6 @@
 }
 const initDialog = () => {
   list.value = $props.data
-  dialogStatus.value = $props.status
 }
 watch(() => $props.data, (newVal) => {
   if (newVal) {
@@ -255,11 +239,11 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.id" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in columns" :key="item.value" :width="item.width" :prop="item.value" :label="item.text"
         align="center"
       >
         <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
diff --git a/src/views/tested/MeasurementPlan/task/index.vue b/src/views/tested/MeasurementPlan/task/index.vue
index e01ab06..5dc4ad6 100644
--- a/src/views/tested/MeasurementPlan/task/index.vue
+++ b/src/views/tested/MeasurementPlan/task/index.vue
@@ -1,5 +1,5 @@
 <!-- 任务单管理表格 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="TaskList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { cancelTask, getListPage } from '@/api/eqpt/measurementPlan/task'
diff --git a/src/views/tested/document/list/edit.vue b/src/views/tested/document/list/edit.vue
index 8b9b91f..7d0037f 100644
--- a/src/views/tested/document/list/edit.vue
+++ b/src/views/tested/document/list/edit.vue
@@ -1,5 +1,5 @@
 <!-- 文档管理-编辑 -->
-<script lang="ts" setup name="addNotice">
+<script lang="ts" setup name="DocumentEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
@@ -40,8 +40,6 @@
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '文件名称必填', trigger: ['blur', 'change'] }],
   fileNo: [{ required: true, message: '文件号必填', trigger: ['blur', 'change'] }],
-  // implementationStatus: [{ required: true, message: '实施状态必选', trigger: ['blur', 'change'] }],
-  // fileType: [{ required: true, message: '文件类别必选', trigger: ['blur', 'change'] }],
   remark: [{ required: true, message: '备注必填', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 弹窗初始化
@@ -163,7 +161,7 @@
       </template>
     </detail-page>
     <detail-block-com>
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
+      <el-form ref="ruleFormRef" :model="ruleForm" :class="$route.path.includes('detail') ? 'isDetail' : ''" :rules="rules" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileNo">

diff --git a/src/components/DetailPage/DetailBlockCom.vue b/src/components/DetailPage/DetailBlockCom.vue
index 13bd2aa..3eee911 100644
--- a/src/components/DetailPage/DetailBlockCom.vue
+++ b/src/components/DetailPage/DetailBlockCom.vue
@@ -40,7 +40,7 @@
 
   .content {
     background-color: #fff;
-    // padding: 0 10px 20px;
+    padding: 0 10px 20px;
     margin-top: 10px;
   }
 }
diff --git a/src/views/tested/MeasurementPlan/board/index.vue b/src/views/tested/MeasurementPlan/board/index.vue
index a8f61aa..d632088 100644
--- a/src/views/tested/MeasurementPlan/board/index.vue
+++ b/src/views/tested/MeasurementPlan/board/index.vue
@@ -1,5 +1,5 @@
 <!-- 业务看板 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="BoardList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/measurementPlan/task'
diff --git a/src/views/tested/MeasurementPlan/curator/index.vue b/src/views/tested/MeasurementPlan/curator/index.vue
index 02499ee..6158ffd 100644
--- a/src/views/tested/MeasurementPlan/curator/index.vue
+++ b/src/views/tested/MeasurementPlan/curator/index.vue
@@ -1,5 +1,5 @@
 <!-- 负责人送检通知 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="CuratorNotice">
 import page from '@/views/tested/MeasurementPlan/dept/components/list.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/delay/index.vue b/src/views/tested/MeasurementPlan/delay/index.vue
index 1f44650..de91052 100644
--- a/src/views/tested/MeasurementPlan/delay/index.vue
+++ b/src/views/tested/MeasurementPlan/delay/index.vue
@@ -1,5 +1,5 @@
 <!-- 延迟送检申请 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="DelayApplication">
 import page from '@/views/tested/MeasurementPlan/early/components/page.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/dept/components/edit.vue b/src/views/tested/MeasurementPlan/dept/components/edit.vue
index bafdf9e..e1707f7 100644
--- a/src/views/tested/MeasurementPlan/dept/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/edit.vue
@@ -1,5 +1,5 @@
-<!-- 设备分组信息-编辑 -->
-<script lang="ts" setup name="addNotice">
+<!-- 送检通知 详情 -->
+<script lang="ts" setup name="NoticeEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import tableList from './tableList.vue'
 const $route = useRoute()
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index e1cd2ee..2c8e6e5 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -1,5 +1,5 @@
 <!-- 部门/负责人送检通知表格 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="NotceList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/measurementPlan/dept'
diff --git a/src/views/tested/MeasurementPlan/dept/components/tableList.vue b/src/views/tested/MeasurementPlan/dept/components/tableList.vue
index 878d6e9..49e3b43 100644
--- a/src/views/tested/MeasurementPlan/dept/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/tableList.vue
@@ -1,5 +1,5 @@
 <!-- 任务单列表 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="TaskTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListExpand, getListTogether } from '@/api/eqpt/measurementPlan/dept'
 const $props = defineProps({
@@ -126,7 +126,7 @@
 </script>
 
 <template>
-  <detail-block-switch title="任务单列表">
+  <detail-block-com>
     <table-container>
       <!-- 展开行表格 -->
       <normal-table
@@ -141,7 +141,7 @@
         :expand-row-keys="expands" :show-header="false" @expand-change="expandChange"
       >
         <el-table-column type="expand">
-          <template #default="props">
+          <template #default="">
             <normal-table
               :data="expandList" :total="0" :columns="columns" :list-loading="expandLoading" :options="{
                 needIndex: false, // 是否需要序号列
@@ -159,7 +159,7 @@
         </el-table-column>
       </el-table>
     </table-container>
-  </detail-block-switch>
+  </detail-block-com>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/tested/MeasurementPlan/dept/index.vue b/src/views/tested/MeasurementPlan/dept/index.vue
index 0be6e43..aafe5e1 100644
--- a/src/views/tested/MeasurementPlan/dept/index.vue
+++ b/src/views/tested/MeasurementPlan/dept/index.vue
@@ -1,5 +1,5 @@
 <!-- 部门送检通知 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="DeptNotice">
 import page from './components/list.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/early/components/detail.vue b/src/views/tested/MeasurementPlan/early/components/detail.vue
index 72cfdfc..e4e2a22 100644
--- a/src/views/tested/MeasurementPlan/early/components/detail.vue
+++ b/src/views/tested/MeasurementPlan/early/components/detail.vue
@@ -2,7 +2,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import baseInfo from './edit.vue'
 import ApprovalDialog from './ApprovalDialog.vue'
-import { editBtn } from '@/views/tested/device/info/components/applyBtns'
+import { editBtn } from '@/utils/applyBtns'
 import { cancelApply, delApply } from '@/api/eqpt/measurementPlan/early'
 const $route = useRoute()
 const activeName = ref('基本信息')
@@ -99,9 +99,9 @@
           审批详情
         </el-radio-button>
       </el-radio-group>
-      <base-info v-if="activeName === '基本信息'" class="device-base-info" />
-      <report-table v-if="activeName === '审批详情'" :data="[]" status="detail" />
     </detail-block-com>
+    <base-info v-if="activeName === '基本信息'" class="device-base-info" />
+    <!-- <report-table v-if="activeName === '审批详情'" :data="[]" status="detail" /> -->
   </app-container>
 </template>
 
diff --git a/src/views/tested/MeasurementPlan/early/components/edit.vue b/src/views/tested/MeasurementPlan/early/components/edit.vue
index 2cd80b2..2fe4276 100644
--- a/src/views/tested/MeasurementPlan/early/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/early/components/edit.vue
@@ -1,5 +1,5 @@
 <!-- 延迟/提前送检-编辑 -->
-<script lang="ts" setup name="PlanEdit">
+<script lang="ts" setup name="ApplicationEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
@@ -201,7 +201,7 @@
     <detail-block-com>
       <el-form
         ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form"
-        :class="[dialogStatus === 'detail' ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
+        :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
diff --git a/src/views/tested/MeasurementPlan/early/components/page.vue b/src/views/tested/MeasurementPlan/early/components/page.vue
index 19c0855..7e6d9b2 100644
--- a/src/views/tested/MeasurementPlan/early/components/page.vue
+++ b/src/views/tested/MeasurementPlan/early/components/page.vue
@@ -45,13 +45,13 @@
 }
 
 watch(current, (newValue) => {
-  window.sessionStorage.setItem(`plan-${$props.approvalType}`, newValue)
+  window.sessionStorage.setItem(`application-${$props.approvalType}`, newValue)
   com.value = menu.value.filter(item => item.name === newValue)[0].com
 })
 
 onMounted(async () => {
   await getMenuStatus()
-  current.value = window.sessionStorage.getItem(`plan-${$props.approvalType}`) || '全部'
+  current.value = window.sessionStorage.getItem(`application-${$props.approvalType}`) || '全部'
   com.value = menu.value.filter(item => item.name === current.value)[0].com
 })
 </script>
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index e4a148d..c3979ce 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -1,5 +1,5 @@
 <!-- 计量计划弹窗 -->
-<script lang="ts" setup name="PlanList">
+<script lang="ts" setup name="PlanListDialog">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import ApprovalDialog from './ApprovalDialog.vue'
diff --git a/src/views/tested/MeasurementPlan/early/components/table.vue b/src/views/tested/MeasurementPlan/early/components/table.vue
index ff9ef7e..1e4546b 100644
--- a/src/views/tested/MeasurementPlan/early/components/table.vue
+++ b/src/views/tested/MeasurementPlan/early/components/table.vue
@@ -1,5 +1,5 @@
 <!-- 计量计划-计划列表 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="PlanTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectPlan from './selelectPlan.vue'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
@@ -228,11 +228,11 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.id" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text"
         align="center"
       >
         <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
diff --git a/src/views/tested/MeasurementPlan/early/index.vue b/src/views/tested/MeasurementPlan/early/index.vue
index 723bb90..f389baa 100644
--- a/src/views/tested/MeasurementPlan/early/index.vue
+++ b/src/views/tested/MeasurementPlan/early/index.vue
@@ -1,5 +1,5 @@
 <!-- 提前送检申请 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="EarlyApplication">
 import page from './components/page.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/plan/components/dataList.vue b/src/views/tested/MeasurementPlan/plan/components/dataList.vue
index 521ed63..a7db75e 100644
--- a/src/views/tested/MeasurementPlan/plan/components/dataList.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/dataList.vue
@@ -127,7 +127,7 @@
       :row-key=" getRowKeys " :expand-row-keys=" expands " :show-header=" false " @expand-change=" expandChange "
     >
       <el-table-column type="expand">
-        <template #default="props">
+        <template #default="">
           <normal-table
             :data=" expandList " :total=" 0 " :columns=" columns " :list-loading=" expandLoading " :options="
               {
diff --git a/src/views/tested/MeasurementPlan/plan/components/detail.vue b/src/views/tested/MeasurementPlan/plan/components/detail.vue
index c830647..835df8b 100644
--- a/src/views/tested/MeasurementPlan/plan/components/detail.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/detail.vue
@@ -1,8 +1,9 @@
-<script lang="ts" setup name="addNotice">
+<!-- 计量计划 详情页面 -->
+<script lang="ts" setup name="PlanDetail">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import baseInfo from './infoDetail.vue'
 import ApprovalDialog from './ApprovalDialog.vue'
-import { editBtn, submitBtn } from '@/views/tested/device/info/components/applyBtns'
+import { editBtn, submitBtn } from '@/utils/applyBtns'
 import { cancelPlan, delPlan, editPlan, sendNotify, submitPlan } from '@/api/eqpt/measurementPlan/paln'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const $route = useRoute()
@@ -28,7 +29,7 @@
 // 删除
 const delForm = () => {
   ElMessageBox.confirm(
-    '确认删除设备信息吗?',
+    '确认删除吗?',
     '确认',
     {
       confirmButtonText: '确认',
@@ -94,12 +95,6 @@
         <el-button v-if="editBtn(statusName, 'detail')" type="primary" @click="editForm()">
           编辑
         </el-button>
-        <!-- <el-button v-if="submitBtn(statusName, 'detail')" type="primary" @click="submitForm()">
-          提交
-        </el-button> -->
-        <!-- <el-button v-if="submitBtn(statusName, 'detail')" type="primary" @click="saveForm(ruleFormRef, ruleFormRef1)">
-          保存
-        </el-button> -->
         <el-button v-if="statusName === '已通过' || statusName === '全部'" type="primary">
           打印
         </el-button>
@@ -123,18 +118,9 @@
           审批详情
         </el-radio-button>
       </el-radio-group>
-      <base-info v-if="activeName === '基本信息'" class="device-base-info" />
-      <report-table v-if="activeName === '审批详情'" :data="[]" status="detail" />
-      <!-- <el-tabs v-model="activeName" type="card" class="demo-tabs">
-        <el-tab-pane label="基本信息" name="基本信息">
-          <base-info />
-        </el-tab-pane>
-        <el-tab-pane label="审批详情" name="审批详情">
-          审批详情
-          <report-table :data="[]" status="detail" />
-        </el-tab-pane>
-      </el-tabs> -->
     </detail-block-com>
+    <base-info v-if="activeName === '基本信息'" class="device-base-info" />
+    <report-table v-if="activeName === '审批详情'" :data="[]" status="detail" />
   </app-container>
 </template>
 
diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue
index b8d1ab0..df1d62b 100644
--- a/src/views/tested/MeasurementPlan/plan/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue
@@ -289,7 +289,7 @@
     <detail-block-com>
       <el-form
         ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form"
-        :class="[dialogStatus === 'detail' ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
+        :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
diff --git a/src/views/tested/MeasurementPlan/plan/components/infoDetail.vue b/src/views/tested/MeasurementPlan/plan/components/infoDetail.vue
index c585682..0e5d0af 100644
--- a/src/views/tested/MeasurementPlan/plan/components/infoDetail.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/infoDetail.vue
@@ -52,7 +52,7 @@
   <detail-block-com>
     <el-form
       ref="ruleFormRef" :model="ruleForm" label-position="right" label-width="110px" class="form"
-      :class="[dialogStatus === 'detail' ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
+      :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
     >
       <el-row :gutter="24" class="marg">
         <el-col :span="6">
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 953432c..da9ecad 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -1,5 +1,5 @@
-<!-- 设备列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
+<!-- 设备列表弹窗-多选 -->
+<script lang="ts" setup name="SelectDeviceMultiple">
 import { ElMessage } from 'element-plus'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
@@ -131,7 +131,6 @@
     // 单选
     if (selectList.value.length) {
       emits('add', selectList.value[0])
-      // emits('add', device)
       dialogFormVisible.value = false
       reset()
     }
@@ -197,14 +196,9 @@
       <normal-table
         v-if="dialogFormVisible"
         :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
-        :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage" @multiSelect="multiSelect"
+        :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
       >
         <template #preColumns>
-          <!-- <el-table-column v-if="!multi" label="" width="55" align="center">
-            <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" :disabled="scope.row.isRadioDisabled" class="radio" />
-            </template>
-          </el-table-column> -->
           <el-table-column label="#" width="55" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index 1d48e55..67710f3 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -1,5 +1,5 @@
 <!-- 计量计划-计划列表 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="PlatListTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectDevice from './selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
@@ -9,13 +9,8 @@
     type: Array,
     default: () => ([]),
   },
-  status: {
-    type: String,
-    required: true,
-  },
 })
 const $route = useRoute()
-const dialogStatus = ref('update') // 对话框类型：create,update
 // 表头显示标题
 const columns = ref([
   {
@@ -64,7 +59,7 @@
 const list = ref<IlistObjType[]>([])
 // 检查数据列表
 function checkCertificateList() {
-  return useCheckList(list.value as any, columns.value as any, '设备信息')
+  return useCheckList(list.value as any, columns.value as any, '计划列表')
 }
 // 将列表置为不可编辑状态
 function setAllRowReadable() {
@@ -87,7 +82,6 @@
 }
 // 添加行
 const addRow = () => {
-  // certificateRef.value.initDialog({ title: '添加' })
   if (checkCertificateList()) {
     setAllRowReadable()
     list.value.push({
@@ -147,7 +141,6 @@
 }
 const initDialog = () => {
   list.value = $props.data as IlistObjType[]
-  dialogStatus.value = $props.status
 }
 // 批量增加
 const batch = () => {
@@ -193,7 +186,7 @@
         align="center"
       >
         <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
diff --git a/src/views/tested/MeasurementPlan/plan/index.vue b/src/views/tested/MeasurementPlan/plan/index.vue
index 90c24d0..f9d978a 100644
--- a/src/views/tested/MeasurementPlan/plan/index.vue
+++ b/src/views/tested/MeasurementPlan/plan/index.vue
@@ -1,5 +1,5 @@
 <!-- 计量计划 -->
-<script lang="ts" setup name="qualityFile">
+<script lang="ts" setup name="PlanIndex">
 import infoList from './components/list.vue'
 import { getDictByCode } from '@/api/system/dict'
 export interface menuType {
diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue
index bc1ca2c..6078532 100644
--- a/src/views/tested/MeasurementPlan/task/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/task/components/edit.vue
@@ -1,5 +1,5 @@
 <!-- 设备分组信息-编辑 -->
-<script lang="ts" setup name="addNotice">
+<script lang="ts" setup name="TaskEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
@@ -175,7 +175,7 @@
       </template>
     </detail-page>
     <detail-block-com>
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" :class="$route.path.includes('detail') ? 'isDetail' : ''" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="任务单编号">
@@ -261,11 +261,11 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="承接时间" prop="undertakeTime">
-              <el-input v-model.trim="ruleForm.undertakeTime" />
-              <!-- <el-date-picker
+              <!-- <el-input v-model.trim="ruleForm.undertakeTime" /> -->
+              <el-date-picker
                 v-model="ruleForm.undertakeTime" type="date" format="YYYY-MM-DD"
                 value-format="YYYY-MM-DD" placeholder="承接时间" class="normal-date" style="width: 100%;"
-              /> -->
+              />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index b9cc89e..22a466f 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -1,21 +1,17 @@
 <!-- 任务单列表 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="Task">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
 import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
 import { uploadApi } from '@/api/system/notice'
+import { useCheckList } from '@/utils/useCheckList'
 const $props = defineProps({
   data: {
     type: Array,
     default: () => ([]),
   },
-  status: {
-    type: String,
-    required: true,
-  },
 })
 const $route = useRoute()
-const dialogStatus = ref('update') // 对话框类型：create,update
 // 表头显示标题
 const columns = ref([
   {
@@ -72,17 +68,7 @@
 const list = ref<any[]>([])
 // 检查数据列表
 function checkCertificateList() {
-  for (let index = 0; index < list.value.length; index++) {
-    const item = list.value[index]
-    for (const prop of columns.value) {
-      // 检查必填
-      if (prop.required && !item[prop.value]) {
-        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
-        return false
-      }
-    }
-  }
-  return true
+  return useCheckList(list.value, columns.value, '任务单列表')
 }
 // 将列表置为不可编辑状态
 function setAllRowReadable() {
@@ -105,7 +91,6 @@
 }
 // 添加行
 const addRow = () => {
-  // certificateRef.value.initDialog({ title: '添加' })
   if (checkCertificateList()) {
     setAllRowReadable()
     list.value.push({
@@ -129,7 +114,6 @@
 }
 const initDialog = () => {
   list.value = $props.data
-  dialogStatus.value = $props.status
 }
 watch(() => $props.data, (newVal) => {
   if (newVal) {
@@ -255,11 +239,11 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.id" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in columns" :key="item.value" :width="item.width" :prop="item.value" :label="item.text"
         align="center"
       >
         <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
diff --git a/src/views/tested/MeasurementPlan/task/index.vue b/src/views/tested/MeasurementPlan/task/index.vue
index e01ab06..5dc4ad6 100644
--- a/src/views/tested/MeasurementPlan/task/index.vue
+++ b/src/views/tested/MeasurementPlan/task/index.vue
@@ -1,5 +1,5 @@
 <!-- 任务单管理表格 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="TaskList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { cancelTask, getListPage } from '@/api/eqpt/measurementPlan/task'
diff --git a/src/views/tested/document/list/edit.vue b/src/views/tested/document/list/edit.vue
index 8b9b91f..7d0037f 100644
--- a/src/views/tested/document/list/edit.vue
+++ b/src/views/tested/document/list/edit.vue
@@ -1,5 +1,5 @@
 <!-- 文档管理-编辑 -->
-<script lang="ts" setup name="addNotice">
+<script lang="ts" setup name="DocumentEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
@@ -40,8 +40,6 @@
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '文件名称必填', trigger: ['blur', 'change'] }],
   fileNo: [{ required: true, message: '文件号必填', trigger: ['blur', 'change'] }],
-  // implementationStatus: [{ required: true, message: '实施状态必选', trigger: ['blur', 'change'] }],
-  // fileType: [{ required: true, message: '文件类别必选', trigger: ['blur', 'change'] }],
   remark: [{ required: true, message: '备注必填', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 弹窗初始化
@@ -163,7 +161,7 @@
       </template>
     </detail-page>
     <detail-block-com>
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
+      <el-form ref="ruleFormRef" :model="ruleForm" :class="$route.path.includes('detail') ? 'isDetail' : ''" :rules="rules" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileNo">
diff --git a/src/views/tested/document/list/index.vue b/src/views/tested/document/list/index.vue
index aac3426..9d6637e 100644
--- a/src/views/tested/document/list/index.vue
+++ b/src/views/tested/document/list/index.vue
@@ -1,5 +1,5 @@
 <!-- 文档管理列表 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="DocumentList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { delDocument, getListPage } from '@/api/eqpt/document/index'

diff --git a/src/components/DetailPage/DetailBlockCom.vue b/src/components/DetailPage/DetailBlockCom.vue
index 13bd2aa..3eee911 100644
--- a/src/components/DetailPage/DetailBlockCom.vue
+++ b/src/components/DetailPage/DetailBlockCom.vue
@@ -40,7 +40,7 @@
 
   .content {
     background-color: #fff;
-    // padding: 0 10px 20px;
+    padding: 0 10px 20px;
     margin-top: 10px;
   }
 }
diff --git a/src/views/tested/MeasurementPlan/board/index.vue b/src/views/tested/MeasurementPlan/board/index.vue
index a8f61aa..d632088 100644
--- a/src/views/tested/MeasurementPlan/board/index.vue
+++ b/src/views/tested/MeasurementPlan/board/index.vue
@@ -1,5 +1,5 @@
 <!-- 业务看板 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="BoardList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/measurementPlan/task'
diff --git a/src/views/tested/MeasurementPlan/curator/index.vue b/src/views/tested/MeasurementPlan/curator/index.vue
index 02499ee..6158ffd 100644
--- a/src/views/tested/MeasurementPlan/curator/index.vue
+++ b/src/views/tested/MeasurementPlan/curator/index.vue
@@ -1,5 +1,5 @@
 <!-- 负责人送检通知 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="CuratorNotice">
 import page from '@/views/tested/MeasurementPlan/dept/components/list.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/delay/index.vue b/src/views/tested/MeasurementPlan/delay/index.vue
index 1f44650..de91052 100644
--- a/src/views/tested/MeasurementPlan/delay/index.vue
+++ b/src/views/tested/MeasurementPlan/delay/index.vue
@@ -1,5 +1,5 @@
 <!-- 延迟送检申请 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="DelayApplication">
 import page from '@/views/tested/MeasurementPlan/early/components/page.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/dept/components/edit.vue b/src/views/tested/MeasurementPlan/dept/components/edit.vue
index bafdf9e..e1707f7 100644
--- a/src/views/tested/MeasurementPlan/dept/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/edit.vue
@@ -1,5 +1,5 @@
-<!-- 设备分组信息-编辑 -->
-<script lang="ts" setup name="addNotice">
+<!-- 送检通知 详情 -->
+<script lang="ts" setup name="NoticeEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import tableList from './tableList.vue'
 const $route = useRoute()
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index e1cd2ee..2c8e6e5 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -1,5 +1,5 @@
 <!-- 部门/负责人送检通知表格 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="NotceList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/measurementPlan/dept'
diff --git a/src/views/tested/MeasurementPlan/dept/components/tableList.vue b/src/views/tested/MeasurementPlan/dept/components/tableList.vue
index 878d6e9..49e3b43 100644
--- a/src/views/tested/MeasurementPlan/dept/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/tableList.vue
@@ -1,5 +1,5 @@
 <!-- 任务单列表 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="TaskTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListExpand, getListTogether } from '@/api/eqpt/measurementPlan/dept'
 const $props = defineProps({
@@ -126,7 +126,7 @@
 </script>
 
 <template>
-  <detail-block-switch title="任务单列表">
+  <detail-block-com>
     <table-container>
       <!-- 展开行表格 -->
       <normal-table
@@ -141,7 +141,7 @@
         :expand-row-keys="expands" :show-header="false" @expand-change="expandChange"
       >
         <el-table-column type="expand">
-          <template #default="props">
+          <template #default="">
             <normal-table
               :data="expandList" :total="0" :columns="columns" :list-loading="expandLoading" :options="{
                 needIndex: false, // 是否需要序号列
@@ -159,7 +159,7 @@
         </el-table-column>
       </el-table>
     </table-container>
-  </detail-block-switch>
+  </detail-block-com>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/tested/MeasurementPlan/dept/index.vue b/src/views/tested/MeasurementPlan/dept/index.vue
index 0be6e43..aafe5e1 100644
--- a/src/views/tested/MeasurementPlan/dept/index.vue
+++ b/src/views/tested/MeasurementPlan/dept/index.vue
@@ -1,5 +1,5 @@
 <!-- 部门送检通知 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="DeptNotice">
 import page from './components/list.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/early/components/detail.vue b/src/views/tested/MeasurementPlan/early/components/detail.vue
index 72cfdfc..e4e2a22 100644
--- a/src/views/tested/MeasurementPlan/early/components/detail.vue
+++ b/src/views/tested/MeasurementPlan/early/components/detail.vue
@@ -2,7 +2,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import baseInfo from './edit.vue'
 import ApprovalDialog from './ApprovalDialog.vue'
-import { editBtn } from '@/views/tested/device/info/components/applyBtns'
+import { editBtn } from '@/utils/applyBtns'
 import { cancelApply, delApply } from '@/api/eqpt/measurementPlan/early'
 const $route = useRoute()
 const activeName = ref('基本信息')
@@ -99,9 +99,9 @@
           审批详情
         </el-radio-button>
       </el-radio-group>
-      <base-info v-if="activeName === '基本信息'" class="device-base-info" />
-      <report-table v-if="activeName === '审批详情'" :data="[]" status="detail" />
     </detail-block-com>
+    <base-info v-if="activeName === '基本信息'" class="device-base-info" />
+    <!-- <report-table v-if="activeName === '审批详情'" :data="[]" status="detail" /> -->
   </app-container>
 </template>
 
diff --git a/src/views/tested/MeasurementPlan/early/components/edit.vue b/src/views/tested/MeasurementPlan/early/components/edit.vue
index 2cd80b2..2fe4276 100644
--- a/src/views/tested/MeasurementPlan/early/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/early/components/edit.vue
@@ -1,5 +1,5 @@
 <!-- 延迟/提前送检-编辑 -->
-<script lang="ts" setup name="PlanEdit">
+<script lang="ts" setup name="ApplicationEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
@@ -201,7 +201,7 @@
     <detail-block-com>
       <el-form
         ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form"
-        :class="[dialogStatus === 'detail' ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
+        :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
diff --git a/src/views/tested/MeasurementPlan/early/components/page.vue b/src/views/tested/MeasurementPlan/early/components/page.vue
index 19c0855..7e6d9b2 100644
--- a/src/views/tested/MeasurementPlan/early/components/page.vue
+++ b/src/views/tested/MeasurementPlan/early/components/page.vue
@@ -45,13 +45,13 @@
 }
 
 watch(current, (newValue) => {
-  window.sessionStorage.setItem(`plan-${$props.approvalType}`, newValue)
+  window.sessionStorage.setItem(`application-${$props.approvalType}`, newValue)
   com.value = menu.value.filter(item => item.name === newValue)[0].com
 })
 
 onMounted(async () => {
   await getMenuStatus()
-  current.value = window.sessionStorage.getItem(`plan-${$props.approvalType}`) || '全部'
+  current.value = window.sessionStorage.getItem(`application-${$props.approvalType}`) || '全部'
   com.value = menu.value.filter(item => item.name === current.value)[0].com
 })
 </script>
diff --git a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
index e4a148d..c3979ce 100644
--- a/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
+++ b/src/views/tested/MeasurementPlan/early/components/selelectPlan.vue
@@ -1,5 +1,5 @@
 <!-- 计量计划弹窗 -->
-<script lang="ts" setup name="PlanList">
+<script lang="ts" setup name="PlanListDialog">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import ApprovalDialog from './ApprovalDialog.vue'
diff --git a/src/views/tested/MeasurementPlan/early/components/table.vue b/src/views/tested/MeasurementPlan/early/components/table.vue
index ff9ef7e..1e4546b 100644
--- a/src/views/tested/MeasurementPlan/early/components/table.vue
+++ b/src/views/tested/MeasurementPlan/early/components/table.vue
@@ -1,5 +1,5 @@
 <!-- 计量计划-计划列表 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="PlanTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectPlan from './selelectPlan.vue'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
@@ -228,11 +228,11 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.id" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text"
         align="center"
       >
         <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
diff --git a/src/views/tested/MeasurementPlan/early/index.vue b/src/views/tested/MeasurementPlan/early/index.vue
index 723bb90..f389baa 100644
--- a/src/views/tested/MeasurementPlan/early/index.vue
+++ b/src/views/tested/MeasurementPlan/early/index.vue
@@ -1,5 +1,5 @@
 <!-- 提前送检申请 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="EarlyApplication">
 import page from './components/page.vue'
 </script>
 
diff --git a/src/views/tested/MeasurementPlan/plan/components/dataList.vue b/src/views/tested/MeasurementPlan/plan/components/dataList.vue
index 521ed63..a7db75e 100644
--- a/src/views/tested/MeasurementPlan/plan/components/dataList.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/dataList.vue
@@ -127,7 +127,7 @@
       :row-key=" getRowKeys " :expand-row-keys=" expands " :show-header=" false " @expand-change=" expandChange "
     >
       <el-table-column type="expand">
-        <template #default="props">
+        <template #default="">
           <normal-table
             :data=" expandList " :total=" 0 " :columns=" columns " :list-loading=" expandLoading " :options="
               {
diff --git a/src/views/tested/MeasurementPlan/plan/components/detail.vue b/src/views/tested/MeasurementPlan/plan/components/detail.vue
index c830647..835df8b 100644
--- a/src/views/tested/MeasurementPlan/plan/components/detail.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/detail.vue
@@ -1,8 +1,9 @@
-<script lang="ts" setup name="addNotice">
+<!-- 计量计划 详情页面 -->
+<script lang="ts" setup name="PlanDetail">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import baseInfo from './infoDetail.vue'
 import ApprovalDialog from './ApprovalDialog.vue'
-import { editBtn, submitBtn } from '@/views/tested/device/info/components/applyBtns'
+import { editBtn, submitBtn } from '@/utils/applyBtns'
 import { cancelPlan, delPlan, editPlan, sendNotify, submitPlan } from '@/api/eqpt/measurementPlan/paln'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const $route = useRoute()
@@ -28,7 +29,7 @@
 // 删除
 const delForm = () => {
   ElMessageBox.confirm(
-    '确认删除设备信息吗?',
+    '确认删除吗?',
     '确认',
     {
       confirmButtonText: '确认',
@@ -94,12 +95,6 @@
         <el-button v-if="editBtn(statusName, 'detail')" type="primary" @click="editForm()">
           编辑
         </el-button>
-        <!-- <el-button v-if="submitBtn(statusName, 'detail')" type="primary" @click="submitForm()">
-          提交
-        </el-button> -->
-        <!-- <el-button v-if="submitBtn(statusName, 'detail')" type="primary" @click="saveForm(ruleFormRef, ruleFormRef1)">
-          保存
-        </el-button> -->
         <el-button v-if="statusName === '已通过' || statusName === '全部'" type="primary">
           打印
         </el-button>
@@ -123,18 +118,9 @@
           审批详情
         </el-radio-button>
       </el-radio-group>
-      <base-info v-if="activeName === '基本信息'" class="device-base-info" />
-      <report-table v-if="activeName === '审批详情'" :data="[]" status="detail" />
-      <!-- <el-tabs v-model="activeName" type="card" class="demo-tabs">
-        <el-tab-pane label="基本信息" name="基本信息">
-          <base-info />
-        </el-tab-pane>
-        <el-tab-pane label="审批详情" name="审批详情">
-          审批详情
-          <report-table :data="[]" status="detail" />
-        </el-tab-pane>
-      </el-tabs> -->
     </detail-block-com>
+    <base-info v-if="activeName === '基本信息'" class="device-base-info" />
+    <report-table v-if="activeName === '审批详情'" :data="[]" status="detail" />
   </app-container>
 </template>
 
diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue
index b8d1ab0..df1d62b 100644
--- a/src/views/tested/MeasurementPlan/plan/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue
@@ -289,7 +289,7 @@
     <detail-block-com>
       <el-form
         ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form"
-        :class="[dialogStatus === 'detail' ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
+        :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
diff --git a/src/views/tested/MeasurementPlan/plan/components/infoDetail.vue b/src/views/tested/MeasurementPlan/plan/components/infoDetail.vue
index c585682..0e5d0af 100644
--- a/src/views/tested/MeasurementPlan/plan/components/infoDetail.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/infoDetail.vue
@@ -52,7 +52,7 @@
   <detail-block-com>
     <el-form
       ref="ruleFormRef" :model="ruleForm" label-position="right" label-width="110px" class="form"
-      :class="[dialogStatus === 'detail' ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
+      :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
     >
       <el-row :gutter="24" class="marg">
         <el-col :span="6">
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 953432c..da9ecad 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -1,5 +1,5 @@
-<!-- 设备列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
+<!-- 设备列表弹窗-多选 -->
+<script lang="ts" setup name="SelectDeviceMultiple">
 import { ElMessage } from 'element-plus'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
@@ -131,7 +131,6 @@
     // 单选
     if (selectList.value.length) {
       emits('add', selectList.value[0])
-      // emits('add', device)
       dialogFormVisible.value = false
       reset()
     }
@@ -197,14 +196,9 @@
       <normal-table
         v-if="dialogFormVisible"
         :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
-        :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage" @multiSelect="multiSelect"
+        :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
       >
         <template #preColumns>
-          <!-- <el-table-column v-if="!multi" label="" width="55" align="center">
-            <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" :disabled="scope.row.isRadioDisabled" class="radio" />
-            </template>
-          </el-table-column> -->
           <el-table-column label="#" width="55" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index 1d48e55..67710f3 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -1,5 +1,5 @@
 <!-- 计量计划-计划列表 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="PlatListTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import selectDevice from './selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
@@ -9,13 +9,8 @@
     type: Array,
     default: () => ([]),
   },
-  status: {
-    type: String,
-    required: true,
-  },
 })
 const $route = useRoute()
-const dialogStatus = ref('update') // 对话框类型：create,update
 // 表头显示标题
 const columns = ref([
   {
@@ -64,7 +59,7 @@
 const list = ref<IlistObjType[]>([])
 // 检查数据列表
 function checkCertificateList() {
-  return useCheckList(list.value as any, columns.value as any, '设备信息')
+  return useCheckList(list.value as any, columns.value as any, '计划列表')
 }
 // 将列表置为不可编辑状态
 function setAllRowReadable() {
@@ -87,7 +82,6 @@
 }
 // 添加行
 const addRow = () => {
-  // certificateRef.value.initDialog({ title: '添加' })
   if (checkCertificateList()) {
     setAllRowReadable()
     list.value.push({
@@ -147,7 +141,6 @@
 }
 const initDialog = () => {
   list.value = $props.data as IlistObjType[]
-  dialogStatus.value = $props.status
 }
 // 批量增加
 const batch = () => {
@@ -193,7 +186,7 @@
         align="center"
       >
         <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
diff --git a/src/views/tested/MeasurementPlan/plan/index.vue b/src/views/tested/MeasurementPlan/plan/index.vue
index 90c24d0..f9d978a 100644
--- a/src/views/tested/MeasurementPlan/plan/index.vue
+++ b/src/views/tested/MeasurementPlan/plan/index.vue
@@ -1,5 +1,5 @@
 <!-- 计量计划 -->
-<script lang="ts" setup name="qualityFile">
+<script lang="ts" setup name="PlanIndex">
 import infoList from './components/list.vue'
 import { getDictByCode } from '@/api/system/dict'
 export interface menuType {
diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue
index bc1ca2c..6078532 100644
--- a/src/views/tested/MeasurementPlan/task/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/task/components/edit.vue
@@ -1,5 +1,5 @@
 <!-- 设备分组信息-编辑 -->
-<script lang="ts" setup name="addNotice">
+<script lang="ts" setup name="TaskEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
@@ -175,7 +175,7 @@
       </template>
     </detail-page>
     <detail-block-com>
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" :class="$route.path.includes('detail') ? 'isDetail' : ''" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="任务单编号">
@@ -261,11 +261,11 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="承接时间" prop="undertakeTime">
-              <el-input v-model.trim="ruleForm.undertakeTime" />
-              <!-- <el-date-picker
+              <!-- <el-input v-model.trim="ruleForm.undertakeTime" /> -->
+              <el-date-picker
                 v-model="ruleForm.undertakeTime" type="date" format="YYYY-MM-DD"
                 value-format="YYYY-MM-DD" placeholder="承接时间" class="normal-date" style="width: 100%;"
-              /> -->
+              />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index b9cc89e..22a466f 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -1,21 +1,17 @@
 <!-- 任务单列表 -->
-<script lang="ts" setup name="EditPlatform">
+<script lang="ts" setup name="Task">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue'
 import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
 import { uploadApi } from '@/api/system/notice'
+import { useCheckList } from '@/utils/useCheckList'
 const $props = defineProps({
   data: {
     type: Array,
     default: () => ([]),
   },
-  status: {
-    type: String,
-    required: true,
-  },
 })
 const $route = useRoute()
-const dialogStatus = ref('update') // 对话框类型：create,update
 // 表头显示标题
 const columns = ref([
   {
@@ -72,17 +68,7 @@
 const list = ref<any[]>([])
 // 检查数据列表
 function checkCertificateList() {
-  for (let index = 0; index < list.value.length; index++) {
-    const item = list.value[index]
-    for (const prop of columns.value) {
-      // 检查必填
-      if (prop.required && !item[prop.value]) {
-        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
-        return false
-      }
-    }
-  }
-  return true
+  return useCheckList(list.value, columns.value, '任务单列表')
 }
 // 将列表置为不可编辑状态
 function setAllRowReadable() {
@@ -105,7 +91,6 @@
 }
 // 添加行
 const addRow = () => {
-  // certificateRef.value.initDialog({ title: '添加' })
   if (checkCertificateList()) {
     setAllRowReadable()
     list.value.push({
@@ -129,7 +114,6 @@
 }
 const initDialog = () => {
   list.value = $props.data
-  dialogStatus.value = $props.status
 }
 watch(() => $props.data, (newVal) => {
   if (newVal) {
@@ -255,11 +239,11 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.id" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in columns" :key="item.value" :width="item.width" :prop="item.value" :label="item.text"
         align="center"
       >
         <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
diff --git a/src/views/tested/MeasurementPlan/task/index.vue b/src/views/tested/MeasurementPlan/task/index.vue
index e01ab06..5dc4ad6 100644
--- a/src/views/tested/MeasurementPlan/task/index.vue
+++ b/src/views/tested/MeasurementPlan/task/index.vue
@@ -1,5 +1,5 @@
 <!-- 任务单管理表格 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="TaskList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { cancelTask, getListPage } from '@/api/eqpt/measurementPlan/task'
diff --git a/src/views/tested/document/list/edit.vue b/src/views/tested/document/list/edit.vue
index 8b9b91f..7d0037f 100644
--- a/src/views/tested/document/list/edit.vue
+++ b/src/views/tested/document/list/edit.vue
@@ -1,5 +1,5 @@
 <!-- 文档管理-编辑 -->
-<script lang="ts" setup name="addNotice">
+<script lang="ts" setup name="DocumentEdit">
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
@@ -40,8 +40,6 @@
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '文件名称必填', trigger: ['blur', 'change'] }],
   fileNo: [{ required: true, message: '文件号必填', trigger: ['blur', 'change'] }],
-  // implementationStatus: [{ required: true, message: '实施状态必选', trigger: ['blur', 'change'] }],
-  // fileType: [{ required: true, message: '文件类别必选', trigger: ['blur', 'change'] }],
   remark: [{ required: true, message: '备注必填', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 弹窗初始化
@@ -163,7 +161,7 @@
       </template>
     </detail-page>
     <detail-block-com>
-      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
+      <el-form ref="ruleFormRef" :model="ruleForm" :class="$route.path.includes('detail') ? 'isDetail' : ''" :rules="rules" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileNo">
diff --git a/src/views/tested/document/list/index.vue b/src/views/tested/document/list/index.vue
index aac3426..9d6637e 100644
--- a/src/views/tested/document/list/index.vue
+++ b/src/views/tested/document/list/index.vue
@@ -1,5 +1,5 @@
 <!-- 文档管理列表 -->
-<script lang="ts" setup name="LoginLog">
+<script lang="ts" setup name="DocumentList">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { delDocument, getListPage } from '@/api/eqpt/document/index'
diff --git a/src/views/tested/document/list/tableList.vue b/src/views/tested/document/list/tableList.vue
index dbbd3ef..597b695 100644
--- a/src/views/tested/document/list/tableList.vue
+++ b/src/views/tested/document/list/tableList.vue
@@ -1,18 +1,13 @@
 <!-- 文档管理 - 变更记录 -->
-<script lang="ts" setup name="">
+<script lang="ts" setup name="DocuemntChangeTable">
 import { ElMessage, ElMessageBox } from 'element-plus'
 const $props = defineProps({
   data: {
     type: Array,
     default: () => ([]),
   },
-  status: {
-    type: String,
-    required: true,
-  },
 })
 const $route = useRoute()
-const dialogStatus = ref('update') // 对话框类型：create,update
 // 表头显示标题
 const columns = ref([
   {
@@ -37,16 +32,6 @@
 const list = ref<any[]>([])
 // 检查数据列表
 function checkCertificateList() {
-  for (let index = 0; index < list.value.length; index++) {
-    const item = list.value[index]
-    for (const prop of columns.value) {
-      // 检查必填
-      if (prop.required && !item[prop.value]) {
-        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
-        return false
-      }
-    }
-  }
   return true
 }
 // 将列表置为不可编辑状态
@@ -57,11 +42,6 @@
 }
 // 双击行显示输入框
 const dblclickRow = (row: any) => {
-  // if ($route.path.includes('detail')) {
-  //   return
-  // }
-  // setAllRowReadable()
-  // row.editable = true
 }
 const SelectionList = ref()
 // 表格选中
@@ -70,7 +50,6 @@
 }
 // 添加行
 const addRow = () => {
-  // certificateRef.value.initDialog({ title: '添加' })
   if (checkCertificateList()) {
     setAllRowReadable()
     list.value.push({
@@ -94,7 +73,6 @@
 })
 const initDialog = () => {
   list.value = $props.data
-  dialogStatus.value = $props.status
 }
 initDialog()
 defineExpose({
@@ -104,18 +82,6 @@
 
 <template>
   <detail-block-switch title="变更记录">
-    <!-- v-if="!$route.path.includes('detail')"" -->
-    <!-- <template v-if="false" #btns>
-      <el-button type="primary">
-        扫描增加
-      </el-button>
-      <el-button type="primary" @click="addRow">
-        增加行
-      </el-button>
-      <el-button type="info" @click="removeRow">
-        删除行
-      </el-button>
-    </template> -->
     <el-table
       ref="multipleTableRef" :data="list" style="width: 100%;" border @selection-change="handleSelectionChange"
       @row-dblclick="dblclickRow"
@@ -123,11 +89,11 @@
       <el-table-column v-if="!$route.path.includes('detail')" type="selection" width="38" />
       <el-table-column align="center" label="序号" width="80" type="index" />
       <el-table-column
-        v-for="item in columns" :key="item.id" :width="item.width" :prop="item.value" :label="item.text"
+        v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text"
         align="center"
       >
         <template #header>
-          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          <span v-show="item.required && !$route.path.includes('detail')" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
@@ -135,10 +101,10 @@
             v-if="scope.row.editable && !item.isSelect" v-model="scope.row[item.value]" :autofocus="true"
             :placeholder="`${item.text}`" class="input"
           />
-          <el-date-picker
+          <!-- <el-date-picker
             v-if="scope.row.editable && item.Select" v-model="scope.row[item.value]" type="date"
             format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`"
-          />
+          /> -->
         </template>
       </el-table-column>
     </el-table>