diff --git a/src/components.d.ts b/src/components.d.ts
index 6e85584..815d62f 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -16,14 +16,13 @@
     BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default']
     BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
-    Benchcol: typeof import('./components/benchcol/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/DetailPage/index copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
+    DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']

diff --git a/src/components.d.ts b/src/components.d.ts
index 6e85584..815d62f 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -16,14 +16,13 @@
     BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default']
     BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
-    Benchcol: typeof import('./components/benchcol/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/DetailPage/index copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
+    DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
diff --git a/src/components/DetailPage/DetailBlockSwitch.vue b/src/components/DetailPage/DetailBlockSwitch.vue
new file mode 100644
index 0000000..4d92074
--- /dev/null
+++ b/src/components/DetailPage/DetailBlockSwitch.vue
@@ -0,0 +1,71 @@
+<script lang="ts" setup name="DetailBlock">
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+})
+
+const slots = useSlots()
+</script>
+
+<template>
+  <div class="detail-main">
+    <div class="header">
+      <div class="menu">
+        <slot name="menu" />
+      </div>
+      <div class="title">
+        {{ title }}
+      </div>
+      <div class="btns">
+        <slot name="btns" />
+      </div>
+    </div>
+    <div v-if="slots.default" class="content">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-main {
+  background-color: #fff;
+  border-radius: 8px;
+  margin-top: 10px;
+  padding-top: 10px;
+
+  .header {
+    position: relative;
+    height: 40px;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+
+    .title {
+      font-weight: 500;
+    }
+
+    .btns {
+      position: absolute;
+      right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+
+    .menu {
+      position: absolute;
+      left: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+
+  .content {
+    background-color: #fff;
+    padding: 0 10px 20px;
+    margin-top: 10px;
+  }
+}
+</style>

diff --git a/src/components.d.ts b/src/components.d.ts
index 6e85584..815d62f 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -16,14 +16,13 @@
     BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default']
     BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
-    Benchcol: typeof import('./components/benchcol/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/DetailPage/index copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
+    DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
diff --git a/src/components/DetailPage/DetailBlockSwitch.vue b/src/components/DetailPage/DetailBlockSwitch.vue
new file mode 100644
index 0000000..4d92074
--- /dev/null
+++ b/src/components/DetailPage/DetailBlockSwitch.vue
@@ -0,0 +1,71 @@
+<script lang="ts" setup name="DetailBlock">
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+})
+
+const slots = useSlots()
+</script>
+
+<template>
+  <div class="detail-main">
+    <div class="header">
+      <div class="menu">
+        <slot name="menu" />
+      </div>
+      <div class="title">
+        {{ title }}
+      </div>
+      <div class="btns">
+        <slot name="btns" />
+      </div>
+    </div>
+    <div v-if="slots.default" class="content">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-main {
+  background-color: #fff;
+  border-radius: 8px;
+  margin-top: 10px;
+  padding-top: 10px;
+
+  .header {
+    position: relative;
+    height: 40px;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+
+    .title {
+      font-weight: 500;
+    }
+
+    .btns {
+      position: absolute;
+      right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+
+    .menu {
+      position: absolute;
+      left: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+
+  .content {
+    background-color: #fff;
+    padding: 0 10px 20px;
+    margin-top: 10px;
+  }
+}
+</style>
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d6c1c91..1644a80 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -314,6 +314,39 @@
       },
     ],
   },
+  {
+    path: '/borrow',
+    component: Layout,
+    redirect: '/device/borrow/borrowapply',
+    name: 'Borrow',
+    meta: {
+      title: '设备领用',
+      icon: 'ep:key',
+      auth: '/device/borrow',
+    },
+    children: [
+      {
+        path: 'borrowapply',
+        name: 'borroWapply',
+        component: () => import('@/views/device/borrow/borrwoApply.vue'),
+        meta: {
+          title: '设备借用申请',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowapply',
+        },
+      },
+      {
+        path: 'borrowhandle',
+        name: 'borrowHandle',
+        component: () => import('@/views/device/borrow/borrowHandle.vue'),
+        meta: {
+          title: '设备借用处理',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowhandle',
+        },
+      },
+    ],
+  },
 
 ]
 

diff --git a/src/components.d.ts b/src/components.d.ts
index 6e85584..815d62f 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -16,14 +16,13 @@
     BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default']
     BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
-    Benchcol: typeof import('./components/benchcol/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/DetailPage/index copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
+    DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
diff --git a/src/components/DetailPage/DetailBlockSwitch.vue b/src/components/DetailPage/DetailBlockSwitch.vue
new file mode 100644
index 0000000..4d92074
--- /dev/null
+++ b/src/components/DetailPage/DetailBlockSwitch.vue
@@ -0,0 +1,71 @@
+<script lang="ts" setup name="DetailBlock">
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+})
+
+const slots = useSlots()
+</script>
+
+<template>
+  <div class="detail-main">
+    <div class="header">
+      <div class="menu">
+        <slot name="menu" />
+      </div>
+      <div class="title">
+        {{ title }}
+      </div>
+      <div class="btns">
+        <slot name="btns" />
+      </div>
+    </div>
+    <div v-if="slots.default" class="content">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-main {
+  background-color: #fff;
+  border-radius: 8px;
+  margin-top: 10px;
+  padding-top: 10px;
+
+  .header {
+    position: relative;
+    height: 40px;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+
+    .title {
+      font-weight: 500;
+    }
+
+    .btns {
+      position: absolute;
+      right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+
+    .menu {
+      position: absolute;
+      left: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+
+  .content {
+    background-color: #fff;
+    padding: 0 10px 20px;
+    margin-top: 10px;
+  }
+}
+</style>
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d6c1c91..1644a80 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -314,6 +314,39 @@
       },
     ],
   },
+  {
+    path: '/borrow',
+    component: Layout,
+    redirect: '/device/borrow/borrowapply',
+    name: 'Borrow',
+    meta: {
+      title: '设备领用',
+      icon: 'ep:key',
+      auth: '/device/borrow',
+    },
+    children: [
+      {
+        path: 'borrowapply',
+        name: 'borroWapply',
+        component: () => import('@/views/device/borrow/borrwoApply.vue'),
+        meta: {
+          title: '设备借用申请',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowapply',
+        },
+      },
+      {
+        path: 'borrowhandle',
+        name: 'borrowHandle',
+        component: () => import('@/views/device/borrow/borrowHandle.vue'),
+        meta: {
+          title: '设备借用处理',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowhandle',
+        },
+      },
+    ],
+  },
 
 ]
 
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
new file mode 100644
index 0000000..1c2405e
--- /dev/null
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="borrowHandle">
+// 逻辑代码
+</script>
+
+<template>
+  <app-container>
+    设备借用处理
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>

diff --git a/src/components.d.ts b/src/components.d.ts
index 6e85584..815d62f 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -16,14 +16,13 @@
     BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default']
     BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
-    Benchcol: typeof import('./components/benchcol/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/DetailPage/index copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
+    DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
diff --git a/src/components/DetailPage/DetailBlockSwitch.vue b/src/components/DetailPage/DetailBlockSwitch.vue
new file mode 100644
index 0000000..4d92074
--- /dev/null
+++ b/src/components/DetailPage/DetailBlockSwitch.vue
@@ -0,0 +1,71 @@
+<script lang="ts" setup name="DetailBlock">
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+})
+
+const slots = useSlots()
+</script>
+
+<template>
+  <div class="detail-main">
+    <div class="header">
+      <div class="menu">
+        <slot name="menu" />
+      </div>
+      <div class="title">
+        {{ title }}
+      </div>
+      <div class="btns">
+        <slot name="btns" />
+      </div>
+    </div>
+    <div v-if="slots.default" class="content">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-main {
+  background-color: #fff;
+  border-radius: 8px;
+  margin-top: 10px;
+  padding-top: 10px;
+
+  .header {
+    position: relative;
+    height: 40px;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+
+    .title {
+      font-weight: 500;
+    }
+
+    .btns {
+      position: absolute;
+      right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+
+    .menu {
+      position: absolute;
+      left: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+
+  .content {
+    background-color: #fff;
+    padding: 0 10px 20px;
+    margin-top: 10px;
+  }
+}
+</style>
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d6c1c91..1644a80 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -314,6 +314,39 @@
       },
     ],
   },
+  {
+    path: '/borrow',
+    component: Layout,
+    redirect: '/device/borrow/borrowapply',
+    name: 'Borrow',
+    meta: {
+      title: '设备领用',
+      icon: 'ep:key',
+      auth: '/device/borrow',
+    },
+    children: [
+      {
+        path: 'borrowapply',
+        name: 'borroWapply',
+        component: () => import('@/views/device/borrow/borrwoApply.vue'),
+        meta: {
+          title: '设备借用申请',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowapply',
+        },
+      },
+      {
+        path: 'borrowhandle',
+        name: 'borrowHandle',
+        component: () => import('@/views/device/borrow/borrowHandle.vue'),
+        meta: {
+          title: '设备借用处理',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowhandle',
+        },
+      },
+    ],
+  },
 
 ]
 
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
new file mode 100644
index 0000000..1c2405e
--- /dev/null
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="borrowHandle">
+// 逻辑代码
+</script>
+
+<template>
+  <app-container>
+    设备借用处理
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
new file mode 100644
index 0000000..03d414b
--- /dev/null
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="borrowApply">
+// 逻辑代码
+</script>
+
+<template>
+  <app-container>
+    设备借用申请
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>

diff --git a/src/components.d.ts b/src/components.d.ts
index 6e85584..815d62f 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -16,14 +16,13 @@
     BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default']
     BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
-    Benchcol: typeof import('./components/benchcol/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/DetailPage/index copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
+    DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
diff --git a/src/components/DetailPage/DetailBlockSwitch.vue b/src/components/DetailPage/DetailBlockSwitch.vue
new file mode 100644
index 0000000..4d92074
--- /dev/null
+++ b/src/components/DetailPage/DetailBlockSwitch.vue
@@ -0,0 +1,71 @@
+<script lang="ts" setup name="DetailBlock">
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+})
+
+const slots = useSlots()
+</script>
+
+<template>
+  <div class="detail-main">
+    <div class="header">
+      <div class="menu">
+        <slot name="menu" />
+      </div>
+      <div class="title">
+        {{ title }}
+      </div>
+      <div class="btns">
+        <slot name="btns" />
+      </div>
+    </div>
+    <div v-if="slots.default" class="content">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-main {
+  background-color: #fff;
+  border-radius: 8px;
+  margin-top: 10px;
+  padding-top: 10px;
+
+  .header {
+    position: relative;
+    height: 40px;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+
+    .title {
+      font-weight: 500;
+    }
+
+    .btns {
+      position: absolute;
+      right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+
+    .menu {
+      position: absolute;
+      left: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+
+  .content {
+    background-color: #fff;
+    padding: 0 10px 20px;
+    margin-top: 10px;
+  }
+}
+</style>
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d6c1c91..1644a80 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -314,6 +314,39 @@
       },
     ],
   },
+  {
+    path: '/borrow',
+    component: Layout,
+    redirect: '/device/borrow/borrowapply',
+    name: 'Borrow',
+    meta: {
+      title: '设备领用',
+      icon: 'ep:key',
+      auth: '/device/borrow',
+    },
+    children: [
+      {
+        path: 'borrowapply',
+        name: 'borroWapply',
+        component: () => import('@/views/device/borrow/borrwoApply.vue'),
+        meta: {
+          title: '设备借用申请',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowapply',
+        },
+      },
+      {
+        path: 'borrowhandle',
+        name: 'borrowHandle',
+        component: () => import('@/views/device/borrow/borrowHandle.vue'),
+        meta: {
+          title: '设备借用处理',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowhandle',
+        },
+      },
+    ],
+  },
 
 ]
 
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
new file mode 100644
index 0000000..1c2405e
--- /dev/null
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="borrowHandle">
+// 逻辑代码
+</script>
+
+<template>
+  <app-container>
+    设备借用处理
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
new file mode 100644
index 0000000..03d414b
--- /dev/null
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="borrowApply">
+// 逻辑代码
+</script>
+
+<template>
+  <app-container>
+    设备借用申请
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index c2682fc..5f7b347 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -339,381 +339,374 @@
 
 <template>
   <div class="body-container">
-    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资产编号" prop="assetNo">
-            <el-input v-model.trim="ruleForm.assetNo" placeholder="系统自动生成" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="资产类型" prop="assetType">
-            <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备编号" prop="equipmentNo">
-            <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备名称" prop="equipmentName">
-            <el-input v-model.trim="ruleForm.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="生产厂家" prop="manufacturer">
-            <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="厂家国别" prop="manufacturerCountry">
-            <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="出厂编号" prop="manufacturingNo">
-            <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="出厂年月" prop="manufacturingDate">
-            <el-date-picker
-              v-model="ruleForm.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '出厂年月'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="型号" prop="modelNo">
-            <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="管理状态" prop="managerState">
-            <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="ABC" prop="abc">
-            <el-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'">
-              <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="标签绑定" prop="labelBind">
-            <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === '详情' ? '' : '标签'" :disabled="title === '详情'" clearable>
-              <template #append>
-                <el-button type="primary" size="small">
-                  扫描
-                </el-button>
-              </template>
-            </el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="立卡年月" prop="cardEstablishmentDate">
-            <el-date-picker
-              v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '立卡年月'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="启用日期" prop="enableDate">
-            <el-date-picker
-              v-model="ruleForm.enableDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '启用日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定方式" prop="mesureType">
-            <el-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'">
-              <el-option v-for="item in mesureTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定周期" prop="mesureCycle">
-            <el-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="12">
-          <el-form-item label="测量范围" prop="mesureRange">
-            <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === '详情' ? '' : '测量范围'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="不确定度" prop="uncertainty">
-            <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === '详情' ? '' : '不确定度'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="使用部门" prop="useDept">
-            <com-tree-select
-              v-if="title !== '详情'"
-              v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-              :tree-props="deptProps"
-            />
-            <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
-              <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="使用人" prop="usePerson">
-            <el-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'">
-              <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="专业分类" prop="majorCategory">
-            <el-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'">
-              <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="检定部门" prop="mesureDept">
-            <com-tree-select
-              v-if="title !== '详情'"
-              v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-              :tree-props="deptProps"
-            />
-            <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
-              <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定日期" prop="mesureDate">
-            <el-date-picker
-              v-model="ruleForm.mesureDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '检定日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="有效日期" prop="validDate">
-            <el-date-picker
-              v-model="ruleForm.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '有效日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定结果" prop="mesureResult">
-            <el-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'">
-              <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="8">
-          <el-form-item label="是否是技术指标需要校准/检定的设备" prop="isCalibrationTestEquipment" label-width="260px">
-            <el-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否是测量工装台账" prop="isMeasureAccount" label-width="260px">
-            <el-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否标准配套设备" prop="isStandardSupportEquipment" label-width="260px">
-            <el-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
+    <detail-block-switch title="基本信息">
+      <template #menu>
+        <slot name="menuswitch" />
+      </template>
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资产编号" prop="assetNo">
+              <el-input v-model.trim="ruleForm.assetNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="资产类型" prop="assetType">
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备编号" prop="equipmentNo">
+              <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="生产厂家" prop="manufacturer">
+              <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="厂家国别" prop="manufacturerCountry">
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号" prop="manufacturingNo">
+              <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂年月" prop="manufacturingDate">
+              <el-date-picker
+                v-model="ruleForm.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '出厂年月'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="型号" prop="modelNo">
+              <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="管理状态" prop="managerState">
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="ABC" prop="abc">
+              <el-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'">
+                <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标签绑定" prop="labelBind">
+              <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === '详情' ? '' : '标签'" :disabled="title === '详情'" clearable>
+                <template #append>
+                  <el-button type="primary" size="small">
+                    扫描
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="立卡年月" prop="cardEstablishmentDate">
+              <el-date-picker
+                v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '立卡年月'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="启用日期" prop="enableDate">
+              <el-date-picker
+                v-model="ruleForm.enableDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '启用日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定方式" prop="mesureType">
+              <el-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'">
+                <el-option v-for="item in mesureTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定周期" prop="mesureCycle">
+              <el-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="测量范围" prop="mesureRange">
+              <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === '详情' ? '' : '测量范围'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="不确定度" prop="uncertainty">
+              <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === '详情' ? '' : '不确定度'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="使用部门" prop="useDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
+                :tree-props="deptProps"
+              />
+              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="使用人" prop="usePerson">
+              <el-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'">
+                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="专业分类" prop="majorCategory">
+              <el-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'">
+                <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="检定部门" prop="mesureDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                :tree-props="deptProps"
+              />
+              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定日期" prop="mesureDate">
+              <el-date-picker
+                v-model="ruleForm.mesureDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '检定日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="有效日期" prop="validDate">
+              <el-date-picker
+                v-model="ruleForm.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '有效日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定结果" prop="mesureResult">
+              <el-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'">
+                <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="8">
+            <el-form-item label="是否是技术指标需要校准/检定的设备" prop="isCalibrationTestEquipment" label-width="260px">
+              <el-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否是测量工装台账" prop="isMeasureAccount" label-width="260px">
+              <el-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否标准配套设备" prop="isStandardSupportEquipment" label-width="260px">
+              <el-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资产来源" prop="assetSource">
-            <el-input v-model.trim="ruleForm.assetSource" :placeholder="title === '详情' ? '' : '资产来源'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备规格" prop="equipmentSpecifications">
-            <el-input v-model.trim="ruleForm.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备类别" prop="equipmentCategory">
-            <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
-              <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备类型" prop="equipmentType">
-            <el-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'">
-              <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资本来源" prop="capitalSource">
-            <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
-              <el-option v-for="item in capitalSourceList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="管理级别" prop="managerLevel">
-            <el-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'">
-              <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="用途" prop="purpose">
-            <el-input v-model.trim="ruleForm.purpose" :placeholder="title === '详情' ? '' : '用途'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="技术水平" prop="technicalLevel">
-            <el-input v-model.trim="ruleForm.technicalLevel" :placeholder="title === '详情' ? '' : '技术水平'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="完好状态" prop="intactState">
-            <el-input v-model.trim="ruleForm.intactState" :placeholder="title === '详情' ? '' : '完好状态'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="外形尺寸" prop="overallDimension">
-            <el-input v-model.trim="ruleForm.overallDimension" :placeholder="title === '详情' ? '' : '外形尺寸'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="重量(吨)" prop="weight">
-            <el-input v-model.trim="ruleForm.weight" :placeholder="title === '详情' ? '' : '重量'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="单价" prop="singlePrice">
-            <el-input v-model.trim="ruleForm.singlePrice" :placeholder="title === '详情' ? '' : '单价'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="安装及杂费" prop="installIncidentalExpenses">
-            <el-input v-model.trim="ruleForm.installIncidentalExpenses" :placeholder="title === '详情' ? '' : '安装及杂费'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="安装地点" prop="installPlace">
-            <el-input v-model.trim="ruleForm.installPlace" :placeholder="title === '详情' ? '' : '安装地点'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="原值" prop="originValue">
-            <el-input v-model.trim="ruleForm.originValue" :placeholder="title === '详情' ? '' : '原值'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="目前原值" prop="presentOriginValue">
-            <el-input v-model.trim="ruleForm.presentOriginValue" :placeholder="title === '详情' ? '' : '目前原值'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="折旧年限" prop="depreciationPeriod">
-            <el-input v-model.trim="ruleForm.depreciationPeriod" :placeholder="title === '详情' ? '' : '折旧年限'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="折旧方法" prop="depreciationMethod">
-            <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
-              <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="属性" prop="attribute">
-            <el-input v-model.trim="ruleForm.attribute" placeholder="属性" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="12">
-          <el-form-item label="说明书" prop="minioFileName">
-            <show-photo :minio-file-name="ruleForm.fileList[0]?.minioFileName || ''" />
-            <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
-            <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
-              {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
-            </el-button>
-            <span v-if="title === '详情' && !ruleForm.fileList[0]?.minioFileName">暂无</span>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="24">
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" placeholder="备注" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资产来源" prop="assetSource">
+              <el-input v-model.trim="ruleForm.assetSource" :placeholder="title === '详情' ? '' : '资产来源'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备规格" prop="equipmentSpecifications">
+              <el-input v-model.trim="ruleForm.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备类别" prop="equipmentCategory">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+                <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备类型" prop="equipmentType">
+              <el-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'">
+                <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资本来源" prop="capitalSource">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+                <el-option v-for="item in capitalSourceList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="管理级别" prop="managerLevel">
+              <el-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'">
+                <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="用途" prop="purpose">
+              <el-input v-model.trim="ruleForm.purpose" :placeholder="title === '详情' ? '' : '用途'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="技术水平" prop="technicalLevel">
+              <el-input v-model.trim="ruleForm.technicalLevel" :placeholder="title === '详情' ? '' : '技术水平'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="完好状态" prop="intactState">
+              <el-input v-model.trim="ruleForm.intactState" :placeholder="title === '详情' ? '' : '完好状态'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="外形尺寸" prop="overallDimension">
+              <el-input v-model.trim="ruleForm.overallDimension" :placeholder="title === '详情' ? '' : '外形尺寸'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="重量(吨)" prop="weight">
+              <el-input v-model.trim="ruleForm.weight" :placeholder="title === '详情' ? '' : '重量'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="单价" prop="singlePrice">
+              <el-input v-model.trim="ruleForm.singlePrice" :placeholder="title === '详情' ? '' : '单价'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="安装及杂费" prop="installIncidentalExpenses">
+              <el-input v-model.trim="ruleForm.installIncidentalExpenses" :placeholder="title === '详情' ? '' : '安装及杂费'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="安装地点" prop="installPlace">
+              <el-input v-model.trim="ruleForm.installPlace" :placeholder="title === '详情' ? '' : '安装地点'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="原值" prop="originValue">
+              <el-input v-model.trim="ruleForm.originValue" :placeholder="title === '详情' ? '' : '原值'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="目前原值" prop="presentOriginValue">
+              <el-input v-model.trim="ruleForm.presentOriginValue" :placeholder="title === '详情' ? '' : '目前原值'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="折旧年限" prop="depreciationPeriod">
+              <el-input v-model.trim="ruleForm.depreciationPeriod" :placeholder="title === '详情' ? '' : '折旧年限'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="折旧方法" prop="depreciationMethod">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+                <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="属性" prop="attribute">
+              <el-input v-model.trim="ruleForm.attribute" placeholder="属性" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="说明书" prop="minioFileName">
+              <show-photo :minio-file-name="ruleForm.fileList[0]?.minioFileName || ''" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
+                {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
+              </el-button>
+              <span v-if="title === '详情' && !ruleForm.fileList[0]?.minioFileName">暂无</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" placeholder="备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block-switch>
   </div>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    padding-top: 20px;
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,

diff --git a/src/components.d.ts b/src/components.d.ts
index 6e85584..815d62f 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -16,14 +16,13 @@
     BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default']
     BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
-    Benchcol: typeof import('./components/benchcol/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/DetailPage/index copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
+    DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
diff --git a/src/components/DetailPage/DetailBlockSwitch.vue b/src/components/DetailPage/DetailBlockSwitch.vue
new file mode 100644
index 0000000..4d92074
--- /dev/null
+++ b/src/components/DetailPage/DetailBlockSwitch.vue
@@ -0,0 +1,71 @@
+<script lang="ts" setup name="DetailBlock">
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+})
+
+const slots = useSlots()
+</script>
+
+<template>
+  <div class="detail-main">
+    <div class="header">
+      <div class="menu">
+        <slot name="menu" />
+      </div>
+      <div class="title">
+        {{ title }}
+      </div>
+      <div class="btns">
+        <slot name="btns" />
+      </div>
+    </div>
+    <div v-if="slots.default" class="content">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-main {
+  background-color: #fff;
+  border-radius: 8px;
+  margin-top: 10px;
+  padding-top: 10px;
+
+  .header {
+    position: relative;
+    height: 40px;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+
+    .title {
+      font-weight: 500;
+    }
+
+    .btns {
+      position: absolute;
+      right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+
+    .menu {
+      position: absolute;
+      left: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+
+  .content {
+    background-color: #fff;
+    padding: 0 10px 20px;
+    margin-top: 10px;
+  }
+}
+</style>
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d6c1c91..1644a80 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -314,6 +314,39 @@
       },
     ],
   },
+  {
+    path: '/borrow',
+    component: Layout,
+    redirect: '/device/borrow/borrowapply',
+    name: 'Borrow',
+    meta: {
+      title: '设备领用',
+      icon: 'ep:key',
+      auth: '/device/borrow',
+    },
+    children: [
+      {
+        path: 'borrowapply',
+        name: 'borroWapply',
+        component: () => import('@/views/device/borrow/borrwoApply.vue'),
+        meta: {
+          title: '设备借用申请',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowapply',
+        },
+      },
+      {
+        path: 'borrowhandle',
+        name: 'borrowHandle',
+        component: () => import('@/views/device/borrow/borrowHandle.vue'),
+        meta: {
+          title: '设备借用处理',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowhandle',
+        },
+      },
+    ],
+  },
 
 ]
 
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
new file mode 100644
index 0000000..1c2405e
--- /dev/null
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="borrowHandle">
+// 逻辑代码
+</script>
+
+<template>
+  <app-container>
+    设备借用处理
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
new file mode 100644
index 0000000..03d414b
--- /dev/null
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="borrowApply">
+// 逻辑代码
+</script>
+
+<template>
+  <app-container>
+    设备借用申请
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index c2682fc..5f7b347 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -339,381 +339,374 @@
 
 <template>
   <div class="body-container">
-    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资产编号" prop="assetNo">
-            <el-input v-model.trim="ruleForm.assetNo" placeholder="系统自动生成" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="资产类型" prop="assetType">
-            <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备编号" prop="equipmentNo">
-            <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备名称" prop="equipmentName">
-            <el-input v-model.trim="ruleForm.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="生产厂家" prop="manufacturer">
-            <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="厂家国别" prop="manufacturerCountry">
-            <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="出厂编号" prop="manufacturingNo">
-            <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="出厂年月" prop="manufacturingDate">
-            <el-date-picker
-              v-model="ruleForm.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '出厂年月'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="型号" prop="modelNo">
-            <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="管理状态" prop="managerState">
-            <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="ABC" prop="abc">
-            <el-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'">
-              <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="标签绑定" prop="labelBind">
-            <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === '详情' ? '' : '标签'" :disabled="title === '详情'" clearable>
-              <template #append>
-                <el-button type="primary" size="small">
-                  扫描
-                </el-button>
-              </template>
-            </el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="立卡年月" prop="cardEstablishmentDate">
-            <el-date-picker
-              v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '立卡年月'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="启用日期" prop="enableDate">
-            <el-date-picker
-              v-model="ruleForm.enableDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '启用日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定方式" prop="mesureType">
-            <el-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'">
-              <el-option v-for="item in mesureTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定周期" prop="mesureCycle">
-            <el-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="12">
-          <el-form-item label="测量范围" prop="mesureRange">
-            <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === '详情' ? '' : '测量范围'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="不确定度" prop="uncertainty">
-            <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === '详情' ? '' : '不确定度'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="使用部门" prop="useDept">
-            <com-tree-select
-              v-if="title !== '详情'"
-              v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-              :tree-props="deptProps"
-            />
-            <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
-              <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="使用人" prop="usePerson">
-            <el-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'">
-              <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="专业分类" prop="majorCategory">
-            <el-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'">
-              <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="检定部门" prop="mesureDept">
-            <com-tree-select
-              v-if="title !== '详情'"
-              v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-              :tree-props="deptProps"
-            />
-            <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
-              <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定日期" prop="mesureDate">
-            <el-date-picker
-              v-model="ruleForm.mesureDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '检定日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="有效日期" prop="validDate">
-            <el-date-picker
-              v-model="ruleForm.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '有效日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定结果" prop="mesureResult">
-            <el-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'">
-              <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="8">
-          <el-form-item label="是否是技术指标需要校准/检定的设备" prop="isCalibrationTestEquipment" label-width="260px">
-            <el-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否是测量工装台账" prop="isMeasureAccount" label-width="260px">
-            <el-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否标准配套设备" prop="isStandardSupportEquipment" label-width="260px">
-            <el-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
+    <detail-block-switch title="基本信息">
+      <template #menu>
+        <slot name="menuswitch" />
+      </template>
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资产编号" prop="assetNo">
+              <el-input v-model.trim="ruleForm.assetNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="资产类型" prop="assetType">
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备编号" prop="equipmentNo">
+              <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="生产厂家" prop="manufacturer">
+              <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="厂家国别" prop="manufacturerCountry">
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号" prop="manufacturingNo">
+              <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂年月" prop="manufacturingDate">
+              <el-date-picker
+                v-model="ruleForm.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '出厂年月'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="型号" prop="modelNo">
+              <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="管理状态" prop="managerState">
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="ABC" prop="abc">
+              <el-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'">
+                <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标签绑定" prop="labelBind">
+              <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === '详情' ? '' : '标签'" :disabled="title === '详情'" clearable>
+                <template #append>
+                  <el-button type="primary" size="small">
+                    扫描
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="立卡年月" prop="cardEstablishmentDate">
+              <el-date-picker
+                v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '立卡年月'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="启用日期" prop="enableDate">
+              <el-date-picker
+                v-model="ruleForm.enableDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '启用日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定方式" prop="mesureType">
+              <el-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'">
+                <el-option v-for="item in mesureTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定周期" prop="mesureCycle">
+              <el-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="测量范围" prop="mesureRange">
+              <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === '详情' ? '' : '测量范围'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="不确定度" prop="uncertainty">
+              <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === '详情' ? '' : '不确定度'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="使用部门" prop="useDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
+                :tree-props="deptProps"
+              />
+              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="使用人" prop="usePerson">
+              <el-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'">
+                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="专业分类" prop="majorCategory">
+              <el-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'">
+                <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="检定部门" prop="mesureDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                :tree-props="deptProps"
+              />
+              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定日期" prop="mesureDate">
+              <el-date-picker
+                v-model="ruleForm.mesureDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '检定日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="有效日期" prop="validDate">
+              <el-date-picker
+                v-model="ruleForm.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '有效日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定结果" prop="mesureResult">
+              <el-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'">
+                <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="8">
+            <el-form-item label="是否是技术指标需要校准/检定的设备" prop="isCalibrationTestEquipment" label-width="260px">
+              <el-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否是测量工装台账" prop="isMeasureAccount" label-width="260px">
+              <el-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否标准配套设备" prop="isStandardSupportEquipment" label-width="260px">
+              <el-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资产来源" prop="assetSource">
-            <el-input v-model.trim="ruleForm.assetSource" :placeholder="title === '详情' ? '' : '资产来源'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备规格" prop="equipmentSpecifications">
-            <el-input v-model.trim="ruleForm.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备类别" prop="equipmentCategory">
-            <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
-              <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备类型" prop="equipmentType">
-            <el-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'">
-              <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资本来源" prop="capitalSource">
-            <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
-              <el-option v-for="item in capitalSourceList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="管理级别" prop="managerLevel">
-            <el-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'">
-              <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="用途" prop="purpose">
-            <el-input v-model.trim="ruleForm.purpose" :placeholder="title === '详情' ? '' : '用途'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="技术水平" prop="technicalLevel">
-            <el-input v-model.trim="ruleForm.technicalLevel" :placeholder="title === '详情' ? '' : '技术水平'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="完好状态" prop="intactState">
-            <el-input v-model.trim="ruleForm.intactState" :placeholder="title === '详情' ? '' : '完好状态'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="外形尺寸" prop="overallDimension">
-            <el-input v-model.trim="ruleForm.overallDimension" :placeholder="title === '详情' ? '' : '外形尺寸'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="重量(吨)" prop="weight">
-            <el-input v-model.trim="ruleForm.weight" :placeholder="title === '详情' ? '' : '重量'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="单价" prop="singlePrice">
-            <el-input v-model.trim="ruleForm.singlePrice" :placeholder="title === '详情' ? '' : '单价'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="安装及杂费" prop="installIncidentalExpenses">
-            <el-input v-model.trim="ruleForm.installIncidentalExpenses" :placeholder="title === '详情' ? '' : '安装及杂费'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="安装地点" prop="installPlace">
-            <el-input v-model.trim="ruleForm.installPlace" :placeholder="title === '详情' ? '' : '安装地点'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="原值" prop="originValue">
-            <el-input v-model.trim="ruleForm.originValue" :placeholder="title === '详情' ? '' : '原值'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="目前原值" prop="presentOriginValue">
-            <el-input v-model.trim="ruleForm.presentOriginValue" :placeholder="title === '详情' ? '' : '目前原值'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="折旧年限" prop="depreciationPeriod">
-            <el-input v-model.trim="ruleForm.depreciationPeriod" :placeholder="title === '详情' ? '' : '折旧年限'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="折旧方法" prop="depreciationMethod">
-            <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
-              <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="属性" prop="attribute">
-            <el-input v-model.trim="ruleForm.attribute" placeholder="属性" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="12">
-          <el-form-item label="说明书" prop="minioFileName">
-            <show-photo :minio-file-name="ruleForm.fileList[0]?.minioFileName || ''" />
-            <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
-            <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
-              {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
-            </el-button>
-            <span v-if="title === '详情' && !ruleForm.fileList[0]?.minioFileName">暂无</span>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="24">
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" placeholder="备注" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资产来源" prop="assetSource">
+              <el-input v-model.trim="ruleForm.assetSource" :placeholder="title === '详情' ? '' : '资产来源'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备规格" prop="equipmentSpecifications">
+              <el-input v-model.trim="ruleForm.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备类别" prop="equipmentCategory">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+                <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备类型" prop="equipmentType">
+              <el-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'">
+                <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资本来源" prop="capitalSource">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+                <el-option v-for="item in capitalSourceList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="管理级别" prop="managerLevel">
+              <el-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'">
+                <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="用途" prop="purpose">
+              <el-input v-model.trim="ruleForm.purpose" :placeholder="title === '详情' ? '' : '用途'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="技术水平" prop="technicalLevel">
+              <el-input v-model.trim="ruleForm.technicalLevel" :placeholder="title === '详情' ? '' : '技术水平'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="完好状态" prop="intactState">
+              <el-input v-model.trim="ruleForm.intactState" :placeholder="title === '详情' ? '' : '完好状态'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="外形尺寸" prop="overallDimension">
+              <el-input v-model.trim="ruleForm.overallDimension" :placeholder="title === '详情' ? '' : '外形尺寸'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="重量(吨)" prop="weight">
+              <el-input v-model.trim="ruleForm.weight" :placeholder="title === '详情' ? '' : '重量'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="单价" prop="singlePrice">
+              <el-input v-model.trim="ruleForm.singlePrice" :placeholder="title === '详情' ? '' : '单价'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="安装及杂费" prop="installIncidentalExpenses">
+              <el-input v-model.trim="ruleForm.installIncidentalExpenses" :placeholder="title === '详情' ? '' : '安装及杂费'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="安装地点" prop="installPlace">
+              <el-input v-model.trim="ruleForm.installPlace" :placeholder="title === '详情' ? '' : '安装地点'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="原值" prop="originValue">
+              <el-input v-model.trim="ruleForm.originValue" :placeholder="title === '详情' ? '' : '原值'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="目前原值" prop="presentOriginValue">
+              <el-input v-model.trim="ruleForm.presentOriginValue" :placeholder="title === '详情' ? '' : '目前原值'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="折旧年限" prop="depreciationPeriod">
+              <el-input v-model.trim="ruleForm.depreciationPeriod" :placeholder="title === '详情' ? '' : '折旧年限'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="折旧方法" prop="depreciationMethod">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+                <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="属性" prop="attribute">
+              <el-input v-model.trim="ruleForm.attribute" placeholder="属性" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="说明书" prop="minioFileName">
+              <show-photo :minio-file-name="ruleForm.fileList[0]?.minioFileName || ''" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
+                {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
+              </el-button>
+              <span v-if="title === '详情' && !ruleForm.fileList[0]?.minioFileName">暂无</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" placeholder="备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block-switch>
   </div>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    padding-top: 20px;
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index f46553a..fc3fd54 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -360,20 +360,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          固定资产-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`固定资产-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -763,44 +758,11 @@
           </el-row>
         </div> -->
       </el-form>
-    </div>
+    </detail-page>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,

diff --git a/src/components.d.ts b/src/components.d.ts
index 6e85584..815d62f 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -16,14 +16,13 @@
     BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default']
     BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
-    Benchcol: typeof import('./components/benchcol/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/DetailPage/index copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
+    DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
diff --git a/src/components/DetailPage/DetailBlockSwitch.vue b/src/components/DetailPage/DetailBlockSwitch.vue
new file mode 100644
index 0000000..4d92074
--- /dev/null
+++ b/src/components/DetailPage/DetailBlockSwitch.vue
@@ -0,0 +1,71 @@
+<script lang="ts" setup name="DetailBlock">
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+})
+
+const slots = useSlots()
+</script>
+
+<template>
+  <div class="detail-main">
+    <div class="header">
+      <div class="menu">
+        <slot name="menu" />
+      </div>
+      <div class="title">
+        {{ title }}
+      </div>
+      <div class="btns">
+        <slot name="btns" />
+      </div>
+    </div>
+    <div v-if="slots.default" class="content">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-main {
+  background-color: #fff;
+  border-radius: 8px;
+  margin-top: 10px;
+  padding-top: 10px;
+
+  .header {
+    position: relative;
+    height: 40px;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+
+    .title {
+      font-weight: 500;
+    }
+
+    .btns {
+      position: absolute;
+      right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+
+    .menu {
+      position: absolute;
+      left: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+
+  .content {
+    background-color: #fff;
+    padding: 0 10px 20px;
+    margin-top: 10px;
+  }
+}
+</style>
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d6c1c91..1644a80 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -314,6 +314,39 @@
       },
     ],
   },
+  {
+    path: '/borrow',
+    component: Layout,
+    redirect: '/device/borrow/borrowapply',
+    name: 'Borrow',
+    meta: {
+      title: '设备领用',
+      icon: 'ep:key',
+      auth: '/device/borrow',
+    },
+    children: [
+      {
+        path: 'borrowapply',
+        name: 'borroWapply',
+        component: () => import('@/views/device/borrow/borrwoApply.vue'),
+        meta: {
+          title: '设备借用申请',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowapply',
+        },
+      },
+      {
+        path: 'borrowhandle',
+        name: 'borrowHandle',
+        component: () => import('@/views/device/borrow/borrowHandle.vue'),
+        meta: {
+          title: '设备借用处理',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowhandle',
+        },
+      },
+    ],
+  },
 
 ]
 
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
new file mode 100644
index 0000000..1c2405e
--- /dev/null
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="borrowHandle">
+// 逻辑代码
+</script>
+
+<template>
+  <app-container>
+    设备借用处理
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
new file mode 100644
index 0000000..03d414b
--- /dev/null
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="borrowApply">
+// 逻辑代码
+</script>
+
+<template>
+  <app-container>
+    设备借用申请
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index c2682fc..5f7b347 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -339,381 +339,374 @@
 
 <template>
   <div class="body-container">
-    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资产编号" prop="assetNo">
-            <el-input v-model.trim="ruleForm.assetNo" placeholder="系统自动生成" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="资产类型" prop="assetType">
-            <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备编号" prop="equipmentNo">
-            <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备名称" prop="equipmentName">
-            <el-input v-model.trim="ruleForm.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="生产厂家" prop="manufacturer">
-            <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="厂家国别" prop="manufacturerCountry">
-            <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="出厂编号" prop="manufacturingNo">
-            <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="出厂年月" prop="manufacturingDate">
-            <el-date-picker
-              v-model="ruleForm.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '出厂年月'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="型号" prop="modelNo">
-            <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="管理状态" prop="managerState">
-            <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="ABC" prop="abc">
-            <el-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'">
-              <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="标签绑定" prop="labelBind">
-            <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === '详情' ? '' : '标签'" :disabled="title === '详情'" clearable>
-              <template #append>
-                <el-button type="primary" size="small">
-                  扫描
-                </el-button>
-              </template>
-            </el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="立卡年月" prop="cardEstablishmentDate">
-            <el-date-picker
-              v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '立卡年月'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="启用日期" prop="enableDate">
-            <el-date-picker
-              v-model="ruleForm.enableDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '启用日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定方式" prop="mesureType">
-            <el-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'">
-              <el-option v-for="item in mesureTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定周期" prop="mesureCycle">
-            <el-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="12">
-          <el-form-item label="测量范围" prop="mesureRange">
-            <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === '详情' ? '' : '测量范围'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="不确定度" prop="uncertainty">
-            <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === '详情' ? '' : '不确定度'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="使用部门" prop="useDept">
-            <com-tree-select
-              v-if="title !== '详情'"
-              v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-              :tree-props="deptProps"
-            />
-            <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
-              <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="使用人" prop="usePerson">
-            <el-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'">
-              <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="专业分类" prop="majorCategory">
-            <el-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'">
-              <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="检定部门" prop="mesureDept">
-            <com-tree-select
-              v-if="title !== '详情'"
-              v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-              :tree-props="deptProps"
-            />
-            <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
-              <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定日期" prop="mesureDate">
-            <el-date-picker
-              v-model="ruleForm.mesureDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '检定日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="有效日期" prop="validDate">
-            <el-date-picker
-              v-model="ruleForm.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '有效日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定结果" prop="mesureResult">
-            <el-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'">
-              <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="8">
-          <el-form-item label="是否是技术指标需要校准/检定的设备" prop="isCalibrationTestEquipment" label-width="260px">
-            <el-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否是测量工装台账" prop="isMeasureAccount" label-width="260px">
-            <el-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否标准配套设备" prop="isStandardSupportEquipment" label-width="260px">
-            <el-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
+    <detail-block-switch title="基本信息">
+      <template #menu>
+        <slot name="menuswitch" />
+      </template>
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资产编号" prop="assetNo">
+              <el-input v-model.trim="ruleForm.assetNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="资产类型" prop="assetType">
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备编号" prop="equipmentNo">
+              <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="生产厂家" prop="manufacturer">
+              <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="厂家国别" prop="manufacturerCountry">
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号" prop="manufacturingNo">
+              <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂年月" prop="manufacturingDate">
+              <el-date-picker
+                v-model="ruleForm.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '出厂年月'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="型号" prop="modelNo">
+              <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="管理状态" prop="managerState">
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="ABC" prop="abc">
+              <el-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'">
+                <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标签绑定" prop="labelBind">
+              <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === '详情' ? '' : '标签'" :disabled="title === '详情'" clearable>
+                <template #append>
+                  <el-button type="primary" size="small">
+                    扫描
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="立卡年月" prop="cardEstablishmentDate">
+              <el-date-picker
+                v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '立卡年月'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="启用日期" prop="enableDate">
+              <el-date-picker
+                v-model="ruleForm.enableDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '启用日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定方式" prop="mesureType">
+              <el-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'">
+                <el-option v-for="item in mesureTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定周期" prop="mesureCycle">
+              <el-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="测量范围" prop="mesureRange">
+              <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === '详情' ? '' : '测量范围'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="不确定度" prop="uncertainty">
+              <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === '详情' ? '' : '不确定度'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="使用部门" prop="useDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
+                :tree-props="deptProps"
+              />
+              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="使用人" prop="usePerson">
+              <el-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'">
+                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="专业分类" prop="majorCategory">
+              <el-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'">
+                <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="检定部门" prop="mesureDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                :tree-props="deptProps"
+              />
+              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定日期" prop="mesureDate">
+              <el-date-picker
+                v-model="ruleForm.mesureDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '检定日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="有效日期" prop="validDate">
+              <el-date-picker
+                v-model="ruleForm.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '有效日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定结果" prop="mesureResult">
+              <el-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'">
+                <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="8">
+            <el-form-item label="是否是技术指标需要校准/检定的设备" prop="isCalibrationTestEquipment" label-width="260px">
+              <el-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否是测量工装台账" prop="isMeasureAccount" label-width="260px">
+              <el-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否标准配套设备" prop="isStandardSupportEquipment" label-width="260px">
+              <el-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资产来源" prop="assetSource">
-            <el-input v-model.trim="ruleForm.assetSource" :placeholder="title === '详情' ? '' : '资产来源'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备规格" prop="equipmentSpecifications">
-            <el-input v-model.trim="ruleForm.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备类别" prop="equipmentCategory">
-            <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
-              <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备类型" prop="equipmentType">
-            <el-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'">
-              <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资本来源" prop="capitalSource">
-            <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
-              <el-option v-for="item in capitalSourceList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="管理级别" prop="managerLevel">
-            <el-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'">
-              <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="用途" prop="purpose">
-            <el-input v-model.trim="ruleForm.purpose" :placeholder="title === '详情' ? '' : '用途'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="技术水平" prop="technicalLevel">
-            <el-input v-model.trim="ruleForm.technicalLevel" :placeholder="title === '详情' ? '' : '技术水平'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="完好状态" prop="intactState">
-            <el-input v-model.trim="ruleForm.intactState" :placeholder="title === '详情' ? '' : '完好状态'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="外形尺寸" prop="overallDimension">
-            <el-input v-model.trim="ruleForm.overallDimension" :placeholder="title === '详情' ? '' : '外形尺寸'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="重量(吨)" prop="weight">
-            <el-input v-model.trim="ruleForm.weight" :placeholder="title === '详情' ? '' : '重量'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="单价" prop="singlePrice">
-            <el-input v-model.trim="ruleForm.singlePrice" :placeholder="title === '详情' ? '' : '单价'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="安装及杂费" prop="installIncidentalExpenses">
-            <el-input v-model.trim="ruleForm.installIncidentalExpenses" :placeholder="title === '详情' ? '' : '安装及杂费'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="安装地点" prop="installPlace">
-            <el-input v-model.trim="ruleForm.installPlace" :placeholder="title === '详情' ? '' : '安装地点'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="原值" prop="originValue">
-            <el-input v-model.trim="ruleForm.originValue" :placeholder="title === '详情' ? '' : '原值'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="目前原值" prop="presentOriginValue">
-            <el-input v-model.trim="ruleForm.presentOriginValue" :placeholder="title === '详情' ? '' : '目前原值'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="折旧年限" prop="depreciationPeriod">
-            <el-input v-model.trim="ruleForm.depreciationPeriod" :placeholder="title === '详情' ? '' : '折旧年限'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="折旧方法" prop="depreciationMethod">
-            <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
-              <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="属性" prop="attribute">
-            <el-input v-model.trim="ruleForm.attribute" placeholder="属性" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="12">
-          <el-form-item label="说明书" prop="minioFileName">
-            <show-photo :minio-file-name="ruleForm.fileList[0]?.minioFileName || ''" />
-            <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
-            <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
-              {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
-            </el-button>
-            <span v-if="title === '详情' && !ruleForm.fileList[0]?.minioFileName">暂无</span>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="24">
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" placeholder="备注" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资产来源" prop="assetSource">
+              <el-input v-model.trim="ruleForm.assetSource" :placeholder="title === '详情' ? '' : '资产来源'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备规格" prop="equipmentSpecifications">
+              <el-input v-model.trim="ruleForm.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备类别" prop="equipmentCategory">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+                <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备类型" prop="equipmentType">
+              <el-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'">
+                <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资本来源" prop="capitalSource">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+                <el-option v-for="item in capitalSourceList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="管理级别" prop="managerLevel">
+              <el-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'">
+                <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="用途" prop="purpose">
+              <el-input v-model.trim="ruleForm.purpose" :placeholder="title === '详情' ? '' : '用途'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="技术水平" prop="technicalLevel">
+              <el-input v-model.trim="ruleForm.technicalLevel" :placeholder="title === '详情' ? '' : '技术水平'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="完好状态" prop="intactState">
+              <el-input v-model.trim="ruleForm.intactState" :placeholder="title === '详情' ? '' : '完好状态'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="外形尺寸" prop="overallDimension">
+              <el-input v-model.trim="ruleForm.overallDimension" :placeholder="title === '详情' ? '' : '外形尺寸'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="重量(吨)" prop="weight">
+              <el-input v-model.trim="ruleForm.weight" :placeholder="title === '详情' ? '' : '重量'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="单价" prop="singlePrice">
+              <el-input v-model.trim="ruleForm.singlePrice" :placeholder="title === '详情' ? '' : '单价'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="安装及杂费" prop="installIncidentalExpenses">
+              <el-input v-model.trim="ruleForm.installIncidentalExpenses" :placeholder="title === '详情' ? '' : '安装及杂费'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="安装地点" prop="installPlace">
+              <el-input v-model.trim="ruleForm.installPlace" :placeholder="title === '详情' ? '' : '安装地点'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="原值" prop="originValue">
+              <el-input v-model.trim="ruleForm.originValue" :placeholder="title === '详情' ? '' : '原值'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="目前原值" prop="presentOriginValue">
+              <el-input v-model.trim="ruleForm.presentOriginValue" :placeholder="title === '详情' ? '' : '目前原值'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="折旧年限" prop="depreciationPeriod">
+              <el-input v-model.trim="ruleForm.depreciationPeriod" :placeholder="title === '详情' ? '' : '折旧年限'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="折旧方法" prop="depreciationMethod">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+                <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="属性" prop="attribute">
+              <el-input v-model.trim="ruleForm.attribute" placeholder="属性" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="说明书" prop="minioFileName">
+              <show-photo :minio-file-name="ruleForm.fileList[0]?.minioFileName || ''" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
+                {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
+              </el-button>
+              <span v-if="title === '详情' && !ruleForm.fileList[0]?.minioFileName">暂无</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" placeholder="备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block-switch>
   </div>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    padding-top: 20px;
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index f46553a..fc3fd54 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -360,20 +360,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          固定资产-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`固定资产-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -763,44 +758,11 @@
           </el-row>
         </div> -->
       </el-form>
-    </div>
+    </detail-page>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index 0abbdb1..6e88e96 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -74,33 +74,29 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ name }} -{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm">
-            关闭
-          </el-button>
-        </span>
-      </div>
-      <div class="body">
-        <!-- 三级菜单 -->
-        <el-radio-group v-model="current">
-          <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
-            {{ item.name }}
-          </el-radio-button>
-        </el-radio-group>
-      </div>
-      <!-- 展示区域 -->
-      <keep-alive>
-        <component :is="currentComp" ref="currentCompRef" :name="current" :title="title" :row="row" />
-      </keep-alive>
-    </div>
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <!-- 展示区域 -->
+    <keep-alive>
+      <component :is="currentComp" ref="currentCompRef" :name="current" :title="title" :row="row">
+        <template #menuswitch>
+          <!-- 三级菜单 -->
+          <el-radio-group v-model="current">
+            <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+              {{ item.name }}
+            </el-radio-button>
+          </el-radio-group>
+        </template>
+      </component>
+    </keep-alive>
   </app-container>
 </template>
 

diff --git a/src/components.d.ts b/src/components.d.ts
index 6e85584..815d62f 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -16,14 +16,13 @@
     BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default']
     BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
-    Benchcol: typeof import('./components/benchcol/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/DetailPage/index copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
+    DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
diff --git a/src/components/DetailPage/DetailBlockSwitch.vue b/src/components/DetailPage/DetailBlockSwitch.vue
new file mode 100644
index 0000000..4d92074
--- /dev/null
+++ b/src/components/DetailPage/DetailBlockSwitch.vue
@@ -0,0 +1,71 @@
+<script lang="ts" setup name="DetailBlock">
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+})
+
+const slots = useSlots()
+</script>
+
+<template>
+  <div class="detail-main">
+    <div class="header">
+      <div class="menu">
+        <slot name="menu" />
+      </div>
+      <div class="title">
+        {{ title }}
+      </div>
+      <div class="btns">
+        <slot name="btns" />
+      </div>
+    </div>
+    <div v-if="slots.default" class="content">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-main {
+  background-color: #fff;
+  border-radius: 8px;
+  margin-top: 10px;
+  padding-top: 10px;
+
+  .header {
+    position: relative;
+    height: 40px;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+
+    .title {
+      font-weight: 500;
+    }
+
+    .btns {
+      position: absolute;
+      right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+
+    .menu {
+      position: absolute;
+      left: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+
+  .content {
+    background-color: #fff;
+    padding: 0 10px 20px;
+    margin-top: 10px;
+  }
+}
+</style>
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d6c1c91..1644a80 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -314,6 +314,39 @@
       },
     ],
   },
+  {
+    path: '/borrow',
+    component: Layout,
+    redirect: '/device/borrow/borrowapply',
+    name: 'Borrow',
+    meta: {
+      title: '设备领用',
+      icon: 'ep:key',
+      auth: '/device/borrow',
+    },
+    children: [
+      {
+        path: 'borrowapply',
+        name: 'borroWapply',
+        component: () => import('@/views/device/borrow/borrwoApply.vue'),
+        meta: {
+          title: '设备借用申请',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowapply',
+        },
+      },
+      {
+        path: 'borrowhandle',
+        name: 'borrowHandle',
+        component: () => import('@/views/device/borrow/borrowHandle.vue'),
+        meta: {
+          title: '设备借用处理',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowhandle',
+        },
+      },
+    ],
+  },
 
 ]
 
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
new file mode 100644
index 0000000..1c2405e
--- /dev/null
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="borrowHandle">
+// 逻辑代码
+</script>
+
+<template>
+  <app-container>
+    设备借用处理
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
new file mode 100644
index 0000000..03d414b
--- /dev/null
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="borrowApply">
+// 逻辑代码
+</script>
+
+<template>
+  <app-container>
+    设备借用申请
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index c2682fc..5f7b347 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -339,381 +339,374 @@
 
 <template>
   <div class="body-container">
-    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资产编号" prop="assetNo">
-            <el-input v-model.trim="ruleForm.assetNo" placeholder="系统自动生成" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="资产类型" prop="assetType">
-            <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备编号" prop="equipmentNo">
-            <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备名称" prop="equipmentName">
-            <el-input v-model.trim="ruleForm.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="生产厂家" prop="manufacturer">
-            <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="厂家国别" prop="manufacturerCountry">
-            <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="出厂编号" prop="manufacturingNo">
-            <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="出厂年月" prop="manufacturingDate">
-            <el-date-picker
-              v-model="ruleForm.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '出厂年月'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="型号" prop="modelNo">
-            <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="管理状态" prop="managerState">
-            <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="ABC" prop="abc">
-            <el-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'">
-              <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="标签绑定" prop="labelBind">
-            <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === '详情' ? '' : '标签'" :disabled="title === '详情'" clearable>
-              <template #append>
-                <el-button type="primary" size="small">
-                  扫描
-                </el-button>
-              </template>
-            </el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="立卡年月" prop="cardEstablishmentDate">
-            <el-date-picker
-              v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '立卡年月'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="启用日期" prop="enableDate">
-            <el-date-picker
-              v-model="ruleForm.enableDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '启用日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定方式" prop="mesureType">
-            <el-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'">
-              <el-option v-for="item in mesureTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定周期" prop="mesureCycle">
-            <el-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="12">
-          <el-form-item label="测量范围" prop="mesureRange">
-            <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === '详情' ? '' : '测量范围'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="不确定度" prop="uncertainty">
-            <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === '详情' ? '' : '不确定度'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="使用部门" prop="useDept">
-            <com-tree-select
-              v-if="title !== '详情'"
-              v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-              :tree-props="deptProps"
-            />
-            <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
-              <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="使用人" prop="usePerson">
-            <el-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'">
-              <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="专业分类" prop="majorCategory">
-            <el-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'">
-              <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="检定部门" prop="mesureDept">
-            <com-tree-select
-              v-if="title !== '详情'"
-              v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-              :tree-props="deptProps"
-            />
-            <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
-              <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定日期" prop="mesureDate">
-            <el-date-picker
-              v-model="ruleForm.mesureDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '检定日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="有效日期" prop="validDate">
-            <el-date-picker
-              v-model="ruleForm.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '有效日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定结果" prop="mesureResult">
-            <el-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'">
-              <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="8">
-          <el-form-item label="是否是技术指标需要校准/检定的设备" prop="isCalibrationTestEquipment" label-width="260px">
-            <el-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否是测量工装台账" prop="isMeasureAccount" label-width="260px">
-            <el-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否标准配套设备" prop="isStandardSupportEquipment" label-width="260px">
-            <el-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
+    <detail-block-switch title="基本信息">
+      <template #menu>
+        <slot name="menuswitch" />
+      </template>
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资产编号" prop="assetNo">
+              <el-input v-model.trim="ruleForm.assetNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="资产类型" prop="assetType">
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备编号" prop="equipmentNo">
+              <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="生产厂家" prop="manufacturer">
+              <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="厂家国别" prop="manufacturerCountry">
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号" prop="manufacturingNo">
+              <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂年月" prop="manufacturingDate">
+              <el-date-picker
+                v-model="ruleForm.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '出厂年月'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="型号" prop="modelNo">
+              <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="管理状态" prop="managerState">
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="ABC" prop="abc">
+              <el-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'">
+                <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标签绑定" prop="labelBind">
+              <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === '详情' ? '' : '标签'" :disabled="title === '详情'" clearable>
+                <template #append>
+                  <el-button type="primary" size="small">
+                    扫描
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="立卡年月" prop="cardEstablishmentDate">
+              <el-date-picker
+                v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '立卡年月'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="启用日期" prop="enableDate">
+              <el-date-picker
+                v-model="ruleForm.enableDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '启用日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定方式" prop="mesureType">
+              <el-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'">
+                <el-option v-for="item in mesureTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定周期" prop="mesureCycle">
+              <el-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="测量范围" prop="mesureRange">
+              <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === '详情' ? '' : '测量范围'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="不确定度" prop="uncertainty">
+              <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === '详情' ? '' : '不确定度'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="使用部门" prop="useDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
+                :tree-props="deptProps"
+              />
+              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="使用人" prop="usePerson">
+              <el-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'">
+                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="专业分类" prop="majorCategory">
+              <el-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'">
+                <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="检定部门" prop="mesureDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                :tree-props="deptProps"
+              />
+              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定日期" prop="mesureDate">
+              <el-date-picker
+                v-model="ruleForm.mesureDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '检定日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="有效日期" prop="validDate">
+              <el-date-picker
+                v-model="ruleForm.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '有效日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定结果" prop="mesureResult">
+              <el-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'">
+                <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="8">
+            <el-form-item label="是否是技术指标需要校准/检定的设备" prop="isCalibrationTestEquipment" label-width="260px">
+              <el-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否是测量工装台账" prop="isMeasureAccount" label-width="260px">
+              <el-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否标准配套设备" prop="isStandardSupportEquipment" label-width="260px">
+              <el-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资产来源" prop="assetSource">
-            <el-input v-model.trim="ruleForm.assetSource" :placeholder="title === '详情' ? '' : '资产来源'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备规格" prop="equipmentSpecifications">
-            <el-input v-model.trim="ruleForm.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备类别" prop="equipmentCategory">
-            <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
-              <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备类型" prop="equipmentType">
-            <el-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'">
-              <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资本来源" prop="capitalSource">
-            <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
-              <el-option v-for="item in capitalSourceList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="管理级别" prop="managerLevel">
-            <el-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'">
-              <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="用途" prop="purpose">
-            <el-input v-model.trim="ruleForm.purpose" :placeholder="title === '详情' ? '' : '用途'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="技术水平" prop="technicalLevel">
-            <el-input v-model.trim="ruleForm.technicalLevel" :placeholder="title === '详情' ? '' : '技术水平'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="完好状态" prop="intactState">
-            <el-input v-model.trim="ruleForm.intactState" :placeholder="title === '详情' ? '' : '完好状态'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="外形尺寸" prop="overallDimension">
-            <el-input v-model.trim="ruleForm.overallDimension" :placeholder="title === '详情' ? '' : '外形尺寸'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="重量(吨)" prop="weight">
-            <el-input v-model.trim="ruleForm.weight" :placeholder="title === '详情' ? '' : '重量'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="单价" prop="singlePrice">
-            <el-input v-model.trim="ruleForm.singlePrice" :placeholder="title === '详情' ? '' : '单价'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="安装及杂费" prop="installIncidentalExpenses">
-            <el-input v-model.trim="ruleForm.installIncidentalExpenses" :placeholder="title === '详情' ? '' : '安装及杂费'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="安装地点" prop="installPlace">
-            <el-input v-model.trim="ruleForm.installPlace" :placeholder="title === '详情' ? '' : '安装地点'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="原值" prop="originValue">
-            <el-input v-model.trim="ruleForm.originValue" :placeholder="title === '详情' ? '' : '原值'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="目前原值" prop="presentOriginValue">
-            <el-input v-model.trim="ruleForm.presentOriginValue" :placeholder="title === '详情' ? '' : '目前原值'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="折旧年限" prop="depreciationPeriod">
-            <el-input v-model.trim="ruleForm.depreciationPeriod" :placeholder="title === '详情' ? '' : '折旧年限'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="折旧方法" prop="depreciationMethod">
-            <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
-              <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="属性" prop="attribute">
-            <el-input v-model.trim="ruleForm.attribute" placeholder="属性" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="12">
-          <el-form-item label="说明书" prop="minioFileName">
-            <show-photo :minio-file-name="ruleForm.fileList[0]?.minioFileName || ''" />
-            <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
-            <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
-              {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
-            </el-button>
-            <span v-if="title === '详情' && !ruleForm.fileList[0]?.minioFileName">暂无</span>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="24">
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" placeholder="备注" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资产来源" prop="assetSource">
+              <el-input v-model.trim="ruleForm.assetSource" :placeholder="title === '详情' ? '' : '资产来源'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备规格" prop="equipmentSpecifications">
+              <el-input v-model.trim="ruleForm.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备类别" prop="equipmentCategory">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+                <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备类型" prop="equipmentType">
+              <el-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'">
+                <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资本来源" prop="capitalSource">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+                <el-option v-for="item in capitalSourceList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="管理级别" prop="managerLevel">
+              <el-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'">
+                <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="用途" prop="purpose">
+              <el-input v-model.trim="ruleForm.purpose" :placeholder="title === '详情' ? '' : '用途'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="技术水平" prop="technicalLevel">
+              <el-input v-model.trim="ruleForm.technicalLevel" :placeholder="title === '详情' ? '' : '技术水平'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="完好状态" prop="intactState">
+              <el-input v-model.trim="ruleForm.intactState" :placeholder="title === '详情' ? '' : '完好状态'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="外形尺寸" prop="overallDimension">
+              <el-input v-model.trim="ruleForm.overallDimension" :placeholder="title === '详情' ? '' : '外形尺寸'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="重量(吨)" prop="weight">
+              <el-input v-model.trim="ruleForm.weight" :placeholder="title === '详情' ? '' : '重量'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="单价" prop="singlePrice">
+              <el-input v-model.trim="ruleForm.singlePrice" :placeholder="title === '详情' ? '' : '单价'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="安装及杂费" prop="installIncidentalExpenses">
+              <el-input v-model.trim="ruleForm.installIncidentalExpenses" :placeholder="title === '详情' ? '' : '安装及杂费'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="安装地点" prop="installPlace">
+              <el-input v-model.trim="ruleForm.installPlace" :placeholder="title === '详情' ? '' : '安装地点'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="原值" prop="originValue">
+              <el-input v-model.trim="ruleForm.originValue" :placeholder="title === '详情' ? '' : '原值'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="目前原值" prop="presentOriginValue">
+              <el-input v-model.trim="ruleForm.presentOriginValue" :placeholder="title === '详情' ? '' : '目前原值'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="折旧年限" prop="depreciationPeriod">
+              <el-input v-model.trim="ruleForm.depreciationPeriod" :placeholder="title === '详情' ? '' : '折旧年限'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="折旧方法" prop="depreciationMethod">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+                <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="属性" prop="attribute">
+              <el-input v-model.trim="ruleForm.attribute" placeholder="属性" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="说明书" prop="minioFileName">
+              <show-photo :minio-file-name="ruleForm.fileList[0]?.minioFileName || ''" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
+                {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
+              </el-button>
+              <span v-if="title === '详情' && !ruleForm.fileList[0]?.minioFileName">暂无</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" placeholder="备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block-switch>
   </div>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    padding-top: 20px;
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index f46553a..fc3fd54 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -360,20 +360,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          固定资产-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`固定资产-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -763,44 +758,11 @@
           </el-row>
         </div> -->
       </el-form>
-    </div>
+    </detail-page>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index 0abbdb1..6e88e96 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -74,33 +74,29 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ name }} -{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm">
-            关闭
-          </el-button>
-        </span>
-      </div>
-      <div class="body">
-        <!-- 三级菜单 -->
-        <el-radio-group v-model="current">
-          <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
-            {{ item.name }}
-          </el-radio-button>
-        </el-radio-group>
-      </div>
-      <!-- 展示区域 -->
-      <keep-alive>
-        <component :is="currentComp" ref="currentCompRef" :name="current" :title="title" :row="row" />
-      </keep-alive>
-    </div>
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <!-- 展示区域 -->
+    <keep-alive>
+      <component :is="currentComp" ref="currentCompRef" :name="current" :title="title" :row="row">
+        <template #menuswitch>
+          <!-- 三级菜单 -->
+          <el-radio-group v-model="current">
+            <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+              {{ item.name }}
+            </el-radio-button>
+          </el-radio-group>
+        </template>
+      </component>
+    </keep-alive>
   </app-container>
 </template>
 
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f9cdcd0..f653095 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -256,7 +256,7 @@
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
-  // 原生上传图片
+  // 原生上传
   // console.log(event.target.files)
   // if (event.target.files[0].type === 'application/pdf') {
   if (event.target.files?.length !== 0) {
@@ -354,7 +354,7 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" type="primary" @click="identify">
+          <!-- <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" type="primary" @click="identify">
             标签识别
           </el-button>
           <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/import`)" type="primary" @click="batchImport">
@@ -371,7 +371,13 @@
           </el-button>
           <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/print`)" v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table

diff --git a/src/components.d.ts b/src/components.d.ts
index 6e85584..815d62f 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -16,14 +16,13 @@
     BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default']
     BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
-    Benchcol: typeof import('./components/benchcol/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/DetailPage/index copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
+    DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
diff --git a/src/components/DetailPage/DetailBlockSwitch.vue b/src/components/DetailPage/DetailBlockSwitch.vue
new file mode 100644
index 0000000..4d92074
--- /dev/null
+++ b/src/components/DetailPage/DetailBlockSwitch.vue
@@ -0,0 +1,71 @@
+<script lang="ts" setup name="DetailBlock">
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+})
+
+const slots = useSlots()
+</script>
+
+<template>
+  <div class="detail-main">
+    <div class="header">
+      <div class="menu">
+        <slot name="menu" />
+      </div>
+      <div class="title">
+        {{ title }}
+      </div>
+      <div class="btns">
+        <slot name="btns" />
+      </div>
+    </div>
+    <div v-if="slots.default" class="content">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-main {
+  background-color: #fff;
+  border-radius: 8px;
+  margin-top: 10px;
+  padding-top: 10px;
+
+  .header {
+    position: relative;
+    height: 40px;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+
+    .title {
+      font-weight: 500;
+    }
+
+    .btns {
+      position: absolute;
+      right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+
+    .menu {
+      position: absolute;
+      left: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+
+  .content {
+    background-color: #fff;
+    padding: 0 10px 20px;
+    margin-top: 10px;
+  }
+}
+</style>
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d6c1c91..1644a80 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -314,6 +314,39 @@
       },
     ],
   },
+  {
+    path: '/borrow',
+    component: Layout,
+    redirect: '/device/borrow/borrowapply',
+    name: 'Borrow',
+    meta: {
+      title: '设备领用',
+      icon: 'ep:key',
+      auth: '/device/borrow',
+    },
+    children: [
+      {
+        path: 'borrowapply',
+        name: 'borroWapply',
+        component: () => import('@/views/device/borrow/borrwoApply.vue'),
+        meta: {
+          title: '设备借用申请',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowapply',
+        },
+      },
+      {
+        path: 'borrowhandle',
+        name: 'borrowHandle',
+        component: () => import('@/views/device/borrow/borrowHandle.vue'),
+        meta: {
+          title: '设备借用处理',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowhandle',
+        },
+      },
+    ],
+  },
 
 ]
 
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
new file mode 100644
index 0000000..1c2405e
--- /dev/null
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="borrowHandle">
+// 逻辑代码
+</script>
+
+<template>
+  <app-container>
+    设备借用处理
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
new file mode 100644
index 0000000..03d414b
--- /dev/null
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="borrowApply">
+// 逻辑代码
+</script>
+
+<template>
+  <app-container>
+    设备借用申请
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index c2682fc..5f7b347 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -339,381 +339,374 @@
 
 <template>
   <div class="body-container">
-    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资产编号" prop="assetNo">
-            <el-input v-model.trim="ruleForm.assetNo" placeholder="系统自动生成" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="资产类型" prop="assetType">
-            <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备编号" prop="equipmentNo">
-            <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备名称" prop="equipmentName">
-            <el-input v-model.trim="ruleForm.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="生产厂家" prop="manufacturer">
-            <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="厂家国别" prop="manufacturerCountry">
-            <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="出厂编号" prop="manufacturingNo">
-            <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="出厂年月" prop="manufacturingDate">
-            <el-date-picker
-              v-model="ruleForm.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '出厂年月'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="型号" prop="modelNo">
-            <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="管理状态" prop="managerState">
-            <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="ABC" prop="abc">
-            <el-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'">
-              <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="标签绑定" prop="labelBind">
-            <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === '详情' ? '' : '标签'" :disabled="title === '详情'" clearable>
-              <template #append>
-                <el-button type="primary" size="small">
-                  扫描
-                </el-button>
-              </template>
-            </el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="立卡年月" prop="cardEstablishmentDate">
-            <el-date-picker
-              v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '立卡年月'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="启用日期" prop="enableDate">
-            <el-date-picker
-              v-model="ruleForm.enableDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '启用日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定方式" prop="mesureType">
-            <el-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'">
-              <el-option v-for="item in mesureTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定周期" prop="mesureCycle">
-            <el-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="12">
-          <el-form-item label="测量范围" prop="mesureRange">
-            <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === '详情' ? '' : '测量范围'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="不确定度" prop="uncertainty">
-            <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === '详情' ? '' : '不确定度'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="使用部门" prop="useDept">
-            <com-tree-select
-              v-if="title !== '详情'"
-              v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-              :tree-props="deptProps"
-            />
-            <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
-              <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="使用人" prop="usePerson">
-            <el-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'">
-              <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="专业分类" prop="majorCategory">
-            <el-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'">
-              <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="检定部门" prop="mesureDept">
-            <com-tree-select
-              v-if="title !== '详情'"
-              v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-              :tree-props="deptProps"
-            />
-            <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
-              <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定日期" prop="mesureDate">
-            <el-date-picker
-              v-model="ruleForm.mesureDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '检定日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="有效日期" prop="validDate">
-            <el-date-picker
-              v-model="ruleForm.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '有效日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定结果" prop="mesureResult">
-            <el-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'">
-              <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="8">
-          <el-form-item label="是否是技术指标需要校准/检定的设备" prop="isCalibrationTestEquipment" label-width="260px">
-            <el-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否是测量工装台账" prop="isMeasureAccount" label-width="260px">
-            <el-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否标准配套设备" prop="isStandardSupportEquipment" label-width="260px">
-            <el-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
+    <detail-block-switch title="基本信息">
+      <template #menu>
+        <slot name="menuswitch" />
+      </template>
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资产编号" prop="assetNo">
+              <el-input v-model.trim="ruleForm.assetNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="资产类型" prop="assetType">
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备编号" prop="equipmentNo">
+              <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="生产厂家" prop="manufacturer">
+              <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="厂家国别" prop="manufacturerCountry">
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号" prop="manufacturingNo">
+              <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂年月" prop="manufacturingDate">
+              <el-date-picker
+                v-model="ruleForm.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '出厂年月'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="型号" prop="modelNo">
+              <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="管理状态" prop="managerState">
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="ABC" prop="abc">
+              <el-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'">
+                <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标签绑定" prop="labelBind">
+              <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === '详情' ? '' : '标签'" :disabled="title === '详情'" clearable>
+                <template #append>
+                  <el-button type="primary" size="small">
+                    扫描
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="立卡年月" prop="cardEstablishmentDate">
+              <el-date-picker
+                v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '立卡年月'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="启用日期" prop="enableDate">
+              <el-date-picker
+                v-model="ruleForm.enableDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '启用日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定方式" prop="mesureType">
+              <el-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'">
+                <el-option v-for="item in mesureTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定周期" prop="mesureCycle">
+              <el-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="测量范围" prop="mesureRange">
+              <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === '详情' ? '' : '测量范围'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="不确定度" prop="uncertainty">
+              <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === '详情' ? '' : '不确定度'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="使用部门" prop="useDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
+                :tree-props="deptProps"
+              />
+              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="使用人" prop="usePerson">
+              <el-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'">
+                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="专业分类" prop="majorCategory">
+              <el-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'">
+                <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="检定部门" prop="mesureDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                :tree-props="deptProps"
+              />
+              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定日期" prop="mesureDate">
+              <el-date-picker
+                v-model="ruleForm.mesureDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '检定日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="有效日期" prop="validDate">
+              <el-date-picker
+                v-model="ruleForm.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '有效日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定结果" prop="mesureResult">
+              <el-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'">
+                <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="8">
+            <el-form-item label="是否是技术指标需要校准/检定的设备" prop="isCalibrationTestEquipment" label-width="260px">
+              <el-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否是测量工装台账" prop="isMeasureAccount" label-width="260px">
+              <el-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否标准配套设备" prop="isStandardSupportEquipment" label-width="260px">
+              <el-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资产来源" prop="assetSource">
-            <el-input v-model.trim="ruleForm.assetSource" :placeholder="title === '详情' ? '' : '资产来源'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备规格" prop="equipmentSpecifications">
-            <el-input v-model.trim="ruleForm.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备类别" prop="equipmentCategory">
-            <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
-              <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备类型" prop="equipmentType">
-            <el-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'">
-              <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资本来源" prop="capitalSource">
-            <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
-              <el-option v-for="item in capitalSourceList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="管理级别" prop="managerLevel">
-            <el-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'">
-              <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="用途" prop="purpose">
-            <el-input v-model.trim="ruleForm.purpose" :placeholder="title === '详情' ? '' : '用途'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="技术水平" prop="technicalLevel">
-            <el-input v-model.trim="ruleForm.technicalLevel" :placeholder="title === '详情' ? '' : '技术水平'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="完好状态" prop="intactState">
-            <el-input v-model.trim="ruleForm.intactState" :placeholder="title === '详情' ? '' : '完好状态'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="外形尺寸" prop="overallDimension">
-            <el-input v-model.trim="ruleForm.overallDimension" :placeholder="title === '详情' ? '' : '外形尺寸'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="重量(吨)" prop="weight">
-            <el-input v-model.trim="ruleForm.weight" :placeholder="title === '详情' ? '' : '重量'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="单价" prop="singlePrice">
-            <el-input v-model.trim="ruleForm.singlePrice" :placeholder="title === '详情' ? '' : '单价'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="安装及杂费" prop="installIncidentalExpenses">
-            <el-input v-model.trim="ruleForm.installIncidentalExpenses" :placeholder="title === '详情' ? '' : '安装及杂费'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="安装地点" prop="installPlace">
-            <el-input v-model.trim="ruleForm.installPlace" :placeholder="title === '详情' ? '' : '安装地点'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="原值" prop="originValue">
-            <el-input v-model.trim="ruleForm.originValue" :placeholder="title === '详情' ? '' : '原值'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="目前原值" prop="presentOriginValue">
-            <el-input v-model.trim="ruleForm.presentOriginValue" :placeholder="title === '详情' ? '' : '目前原值'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="折旧年限" prop="depreciationPeriod">
-            <el-input v-model.trim="ruleForm.depreciationPeriod" :placeholder="title === '详情' ? '' : '折旧年限'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="折旧方法" prop="depreciationMethod">
-            <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
-              <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="属性" prop="attribute">
-            <el-input v-model.trim="ruleForm.attribute" placeholder="属性" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="12">
-          <el-form-item label="说明书" prop="minioFileName">
-            <show-photo :minio-file-name="ruleForm.fileList[0]?.minioFileName || ''" />
-            <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
-            <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
-              {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
-            </el-button>
-            <span v-if="title === '详情' && !ruleForm.fileList[0]?.minioFileName">暂无</span>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="24">
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" placeholder="备注" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资产来源" prop="assetSource">
+              <el-input v-model.trim="ruleForm.assetSource" :placeholder="title === '详情' ? '' : '资产来源'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备规格" prop="equipmentSpecifications">
+              <el-input v-model.trim="ruleForm.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备类别" prop="equipmentCategory">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+                <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备类型" prop="equipmentType">
+              <el-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'">
+                <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资本来源" prop="capitalSource">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+                <el-option v-for="item in capitalSourceList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="管理级别" prop="managerLevel">
+              <el-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'">
+                <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="用途" prop="purpose">
+              <el-input v-model.trim="ruleForm.purpose" :placeholder="title === '详情' ? '' : '用途'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="技术水平" prop="technicalLevel">
+              <el-input v-model.trim="ruleForm.technicalLevel" :placeholder="title === '详情' ? '' : '技术水平'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="完好状态" prop="intactState">
+              <el-input v-model.trim="ruleForm.intactState" :placeholder="title === '详情' ? '' : '完好状态'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="外形尺寸" prop="overallDimension">
+              <el-input v-model.trim="ruleForm.overallDimension" :placeholder="title === '详情' ? '' : '外形尺寸'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="重量(吨)" prop="weight">
+              <el-input v-model.trim="ruleForm.weight" :placeholder="title === '详情' ? '' : '重量'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="单价" prop="singlePrice">
+              <el-input v-model.trim="ruleForm.singlePrice" :placeholder="title === '详情' ? '' : '单价'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="安装及杂费" prop="installIncidentalExpenses">
+              <el-input v-model.trim="ruleForm.installIncidentalExpenses" :placeholder="title === '详情' ? '' : '安装及杂费'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="安装地点" prop="installPlace">
+              <el-input v-model.trim="ruleForm.installPlace" :placeholder="title === '详情' ? '' : '安装地点'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="原值" prop="originValue">
+              <el-input v-model.trim="ruleForm.originValue" :placeholder="title === '详情' ? '' : '原值'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="目前原值" prop="presentOriginValue">
+              <el-input v-model.trim="ruleForm.presentOriginValue" :placeholder="title === '详情' ? '' : '目前原值'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="折旧年限" prop="depreciationPeriod">
+              <el-input v-model.trim="ruleForm.depreciationPeriod" :placeholder="title === '详情' ? '' : '折旧年限'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="折旧方法" prop="depreciationMethod">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+                <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="属性" prop="attribute">
+              <el-input v-model.trim="ruleForm.attribute" placeholder="属性" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="说明书" prop="minioFileName">
+              <show-photo :minio-file-name="ruleForm.fileList[0]?.minioFileName || ''" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
+                {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
+              </el-button>
+              <span v-if="title === '详情' && !ruleForm.fileList[0]?.minioFileName">暂无</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" placeholder="备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block-switch>
   </div>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    padding-top: 20px;
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index f46553a..fc3fd54 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -360,20 +360,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          固定资产-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`固定资产-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -763,44 +758,11 @@
           </el-row>
         </div> -->
       </el-form>
-    </div>
+    </detail-page>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index 0abbdb1..6e88e96 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -74,33 +74,29 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ name }} -{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm">
-            关闭
-          </el-button>
-        </span>
-      </div>
-      <div class="body">
-        <!-- 三级菜单 -->
-        <el-radio-group v-model="current">
-          <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
-            {{ item.name }}
-          </el-radio-button>
-        </el-radio-group>
-      </div>
-      <!-- 展示区域 -->
-      <keep-alive>
-        <component :is="currentComp" ref="currentCompRef" :name="current" :title="title" :row="row" />
-      </keep-alive>
-    </div>
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <!-- 展示区域 -->
+    <keep-alive>
+      <component :is="currentComp" ref="currentCompRef" :name="current" :title="title" :row="row">
+        <template #menuswitch>
+          <!-- 三级菜单 -->
+          <el-radio-group v-model="current">
+            <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+              {{ item.name }}
+            </el-radio-button>
+          </el-radio-group>
+        </template>
+      </component>
+    </keep-alive>
   </app-container>
 </template>
 
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f9cdcd0..f653095 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -256,7 +256,7 @@
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
-  // 原生上传图片
+  // 原生上传
   // console.log(event.target.files)
   // if (event.target.files[0].type === 'application/pdf') {
   if (event.target.files?.length !== 0) {
@@ -354,7 +354,7 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" type="primary" @click="identify">
+          <!-- <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" type="primary" @click="identify">
             标签识别
           </el-button>
           <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/import`)" type="primary" @click="batchImport">
@@ -371,7 +371,13 @@
           </el-button>
           <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/print`)" v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/device/standingBook/components/templateTable.vue b/src/views/device/standingBook/components/templateTable.vue
index 8a928f0..7aa563f 100644
--- a/src/views/device/standingBook/components/templateTable.vue
+++ b/src/views/device/standingBook/components/templateTable.vue
@@ -245,11 +245,11 @@
   <div>
     <!-- 添加证书信息组件 -->
     <add-row ref="addRowRef" @add="addRowData" />
-    <div class="header">
-      <div class="title">
-        <!-- {{ $props.name }} -->
-      </div>
-      <span class="btns">
+    <detail-block-switch :title="name">
+      <template #menu>
+        <slot name="menuswitch" />
+      </template>
+      <template #btns>
         <el-button v-if="title !== '详情'" type="info" @click="removeRow">
           删除行
         </el-button>
@@ -259,55 +259,33 @@
         <el-button v-if="title !== '详情'" type="primary" @click="editRow">
           编辑行
         </el-button>
-      </span>
-    </div>
-    <!-- 表格区域 -->
-    <normal-table
-      id="print"
-      :data="list" :total="total" :columns="columns as any"
-      :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-      :list-loading="loadingTable"
-      style="padding-top: 20px;background-color: #fff;"
-      @change="changePage"
-    >
-      <template #preColumns>
-        <el-table-column label="" width="55" align="center">
-          <template #default="scope">
-            <el-radio v-model="select" :label="scope.$index" class="radio" />
-          </template>
-        </el-table-column>
-        <el-table-column label="序号" width="55" align="center">
-          <template #default="scope">
-            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-          </template>
-        </el-table-column>
       </template>
-    </normal-table>
+      <!-- 表格区域 -->
+      <normal-table
+        id="print"
+        :data="list" :total="total" :columns="columns as any"
+        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+        :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </detail-block-switch>
   </div>
 </template>
 
 <style lang="scss" scoped>
-.header {
-  background-color: #fff;
-  // height: 40px;
-  border-radius: 8px;
-  display: flex;
-  align-items: center;
-  flex-direction: column;
-  justify-content: center;
-  position: relative;
-
-  .title {
-    // font-weight: 700;
-  }
-
-  .btns {
-    position: absolute;
-    right: 40px;
-    top: -22px;
-  }
-}
-
 :deep(.el-radio__label) {
   display: none;
 }

diff --git a/src/components.d.ts b/src/components.d.ts
index 6e85584..815d62f 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -16,14 +16,13 @@
     BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default']
     BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
-    Benchcol: typeof import('./components/benchcol/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/DetailPage/index copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
+    DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
diff --git a/src/components/DetailPage/DetailBlockSwitch.vue b/src/components/DetailPage/DetailBlockSwitch.vue
new file mode 100644
index 0000000..4d92074
--- /dev/null
+++ b/src/components/DetailPage/DetailBlockSwitch.vue
@@ -0,0 +1,71 @@
+<script lang="ts" setup name="DetailBlock">
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+})
+
+const slots = useSlots()
+</script>
+
+<template>
+  <div class="detail-main">
+    <div class="header">
+      <div class="menu">
+        <slot name="menu" />
+      </div>
+      <div class="title">
+        {{ title }}
+      </div>
+      <div class="btns">
+        <slot name="btns" />
+      </div>
+    </div>
+    <div v-if="slots.default" class="content">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-main {
+  background-color: #fff;
+  border-radius: 8px;
+  margin-top: 10px;
+  padding-top: 10px;
+
+  .header {
+    position: relative;
+    height: 40px;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+
+    .title {
+      font-weight: 500;
+    }
+
+    .btns {
+      position: absolute;
+      right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+
+    .menu {
+      position: absolute;
+      left: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+
+  .content {
+    background-color: #fff;
+    padding: 0 10px 20px;
+    margin-top: 10px;
+  }
+}
+</style>
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d6c1c91..1644a80 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -314,6 +314,39 @@
       },
     ],
   },
+  {
+    path: '/borrow',
+    component: Layout,
+    redirect: '/device/borrow/borrowapply',
+    name: 'Borrow',
+    meta: {
+      title: '设备领用',
+      icon: 'ep:key',
+      auth: '/device/borrow',
+    },
+    children: [
+      {
+        path: 'borrowapply',
+        name: 'borroWapply',
+        component: () => import('@/views/device/borrow/borrwoApply.vue'),
+        meta: {
+          title: '设备借用申请',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowapply',
+        },
+      },
+      {
+        path: 'borrowhandle',
+        name: 'borrowHandle',
+        component: () => import('@/views/device/borrow/borrowHandle.vue'),
+        meta: {
+          title: '设备借用处理',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowhandle',
+        },
+      },
+    ],
+  },
 
 ]
 
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
new file mode 100644
index 0000000..1c2405e
--- /dev/null
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="borrowHandle">
+// 逻辑代码
+</script>
+
+<template>
+  <app-container>
+    设备借用处理
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
new file mode 100644
index 0000000..03d414b
--- /dev/null
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="borrowApply">
+// 逻辑代码
+</script>
+
+<template>
+  <app-container>
+    设备借用申请
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index c2682fc..5f7b347 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -339,381 +339,374 @@
 
 <template>
   <div class="body-container">
-    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资产编号" prop="assetNo">
-            <el-input v-model.trim="ruleForm.assetNo" placeholder="系统自动生成" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="资产类型" prop="assetType">
-            <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备编号" prop="equipmentNo">
-            <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备名称" prop="equipmentName">
-            <el-input v-model.trim="ruleForm.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="生产厂家" prop="manufacturer">
-            <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="厂家国别" prop="manufacturerCountry">
-            <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="出厂编号" prop="manufacturingNo">
-            <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="出厂年月" prop="manufacturingDate">
-            <el-date-picker
-              v-model="ruleForm.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '出厂年月'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="型号" prop="modelNo">
-            <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="管理状态" prop="managerState">
-            <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="ABC" prop="abc">
-            <el-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'">
-              <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="标签绑定" prop="labelBind">
-            <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === '详情' ? '' : '标签'" :disabled="title === '详情'" clearable>
-              <template #append>
-                <el-button type="primary" size="small">
-                  扫描
-                </el-button>
-              </template>
-            </el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="立卡年月" prop="cardEstablishmentDate">
-            <el-date-picker
-              v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '立卡年月'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="启用日期" prop="enableDate">
-            <el-date-picker
-              v-model="ruleForm.enableDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '启用日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定方式" prop="mesureType">
-            <el-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'">
-              <el-option v-for="item in mesureTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定周期" prop="mesureCycle">
-            <el-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="12">
-          <el-form-item label="测量范围" prop="mesureRange">
-            <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === '详情' ? '' : '测量范围'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="不确定度" prop="uncertainty">
-            <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === '详情' ? '' : '不确定度'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="使用部门" prop="useDept">
-            <com-tree-select
-              v-if="title !== '详情'"
-              v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-              :tree-props="deptProps"
-            />
-            <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
-              <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="使用人" prop="usePerson">
-            <el-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'">
-              <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="专业分类" prop="majorCategory">
-            <el-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'">
-              <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="检定部门" prop="mesureDept">
-            <com-tree-select
-              v-if="title !== '详情'"
-              v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-              :tree-props="deptProps"
-            />
-            <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
-              <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定日期" prop="mesureDate">
-            <el-date-picker
-              v-model="ruleForm.mesureDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '检定日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="有效日期" prop="validDate">
-            <el-date-picker
-              v-model="ruleForm.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '有效日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定结果" prop="mesureResult">
-            <el-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'">
-              <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="8">
-          <el-form-item label="是否是技术指标需要校准/检定的设备" prop="isCalibrationTestEquipment" label-width="260px">
-            <el-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否是测量工装台账" prop="isMeasureAccount" label-width="260px">
-            <el-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否标准配套设备" prop="isStandardSupportEquipment" label-width="260px">
-            <el-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
+    <detail-block-switch title="基本信息">
+      <template #menu>
+        <slot name="menuswitch" />
+      </template>
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资产编号" prop="assetNo">
+              <el-input v-model.trim="ruleForm.assetNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="资产类型" prop="assetType">
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备编号" prop="equipmentNo">
+              <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="生产厂家" prop="manufacturer">
+              <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="厂家国别" prop="manufacturerCountry">
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号" prop="manufacturingNo">
+              <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂年月" prop="manufacturingDate">
+              <el-date-picker
+                v-model="ruleForm.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '出厂年月'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="型号" prop="modelNo">
+              <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="管理状态" prop="managerState">
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="ABC" prop="abc">
+              <el-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'">
+                <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标签绑定" prop="labelBind">
+              <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === '详情' ? '' : '标签'" :disabled="title === '详情'" clearable>
+                <template #append>
+                  <el-button type="primary" size="small">
+                    扫描
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="立卡年月" prop="cardEstablishmentDate">
+              <el-date-picker
+                v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '立卡年月'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="启用日期" prop="enableDate">
+              <el-date-picker
+                v-model="ruleForm.enableDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '启用日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定方式" prop="mesureType">
+              <el-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'">
+                <el-option v-for="item in mesureTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定周期" prop="mesureCycle">
+              <el-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="测量范围" prop="mesureRange">
+              <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === '详情' ? '' : '测量范围'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="不确定度" prop="uncertainty">
+              <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === '详情' ? '' : '不确定度'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="使用部门" prop="useDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
+                :tree-props="deptProps"
+              />
+              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="使用人" prop="usePerson">
+              <el-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'">
+                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="专业分类" prop="majorCategory">
+              <el-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'">
+                <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="检定部门" prop="mesureDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                :tree-props="deptProps"
+              />
+              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定日期" prop="mesureDate">
+              <el-date-picker
+                v-model="ruleForm.mesureDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '检定日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="有效日期" prop="validDate">
+              <el-date-picker
+                v-model="ruleForm.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '有效日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定结果" prop="mesureResult">
+              <el-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'">
+                <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="8">
+            <el-form-item label="是否是技术指标需要校准/检定的设备" prop="isCalibrationTestEquipment" label-width="260px">
+              <el-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否是测量工装台账" prop="isMeasureAccount" label-width="260px">
+              <el-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否标准配套设备" prop="isStandardSupportEquipment" label-width="260px">
+              <el-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资产来源" prop="assetSource">
-            <el-input v-model.trim="ruleForm.assetSource" :placeholder="title === '详情' ? '' : '资产来源'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备规格" prop="equipmentSpecifications">
-            <el-input v-model.trim="ruleForm.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备类别" prop="equipmentCategory">
-            <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
-              <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备类型" prop="equipmentType">
-            <el-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'">
-              <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资本来源" prop="capitalSource">
-            <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
-              <el-option v-for="item in capitalSourceList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="管理级别" prop="managerLevel">
-            <el-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'">
-              <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="用途" prop="purpose">
-            <el-input v-model.trim="ruleForm.purpose" :placeholder="title === '详情' ? '' : '用途'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="技术水平" prop="technicalLevel">
-            <el-input v-model.trim="ruleForm.technicalLevel" :placeholder="title === '详情' ? '' : '技术水平'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="完好状态" prop="intactState">
-            <el-input v-model.trim="ruleForm.intactState" :placeholder="title === '详情' ? '' : '完好状态'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="外形尺寸" prop="overallDimension">
-            <el-input v-model.trim="ruleForm.overallDimension" :placeholder="title === '详情' ? '' : '外形尺寸'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="重量(吨)" prop="weight">
-            <el-input v-model.trim="ruleForm.weight" :placeholder="title === '详情' ? '' : '重量'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="单价" prop="singlePrice">
-            <el-input v-model.trim="ruleForm.singlePrice" :placeholder="title === '详情' ? '' : '单价'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="安装及杂费" prop="installIncidentalExpenses">
-            <el-input v-model.trim="ruleForm.installIncidentalExpenses" :placeholder="title === '详情' ? '' : '安装及杂费'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="安装地点" prop="installPlace">
-            <el-input v-model.trim="ruleForm.installPlace" :placeholder="title === '详情' ? '' : '安装地点'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="原值" prop="originValue">
-            <el-input v-model.trim="ruleForm.originValue" :placeholder="title === '详情' ? '' : '原值'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="目前原值" prop="presentOriginValue">
-            <el-input v-model.trim="ruleForm.presentOriginValue" :placeholder="title === '详情' ? '' : '目前原值'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="折旧年限" prop="depreciationPeriod">
-            <el-input v-model.trim="ruleForm.depreciationPeriod" :placeholder="title === '详情' ? '' : '折旧年限'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="折旧方法" prop="depreciationMethod">
-            <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
-              <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="属性" prop="attribute">
-            <el-input v-model.trim="ruleForm.attribute" placeholder="属性" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="12">
-          <el-form-item label="说明书" prop="minioFileName">
-            <show-photo :minio-file-name="ruleForm.fileList[0]?.minioFileName || ''" />
-            <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
-            <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
-              {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
-            </el-button>
-            <span v-if="title === '详情' && !ruleForm.fileList[0]?.minioFileName">暂无</span>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="24">
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" placeholder="备注" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资产来源" prop="assetSource">
+              <el-input v-model.trim="ruleForm.assetSource" :placeholder="title === '详情' ? '' : '资产来源'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备规格" prop="equipmentSpecifications">
+              <el-input v-model.trim="ruleForm.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备类别" prop="equipmentCategory">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+                <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备类型" prop="equipmentType">
+              <el-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'">
+                <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资本来源" prop="capitalSource">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+                <el-option v-for="item in capitalSourceList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="管理级别" prop="managerLevel">
+              <el-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'">
+                <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="用途" prop="purpose">
+              <el-input v-model.trim="ruleForm.purpose" :placeholder="title === '详情' ? '' : '用途'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="技术水平" prop="technicalLevel">
+              <el-input v-model.trim="ruleForm.technicalLevel" :placeholder="title === '详情' ? '' : '技术水平'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="完好状态" prop="intactState">
+              <el-input v-model.trim="ruleForm.intactState" :placeholder="title === '详情' ? '' : '完好状态'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="外形尺寸" prop="overallDimension">
+              <el-input v-model.trim="ruleForm.overallDimension" :placeholder="title === '详情' ? '' : '外形尺寸'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="重量(吨)" prop="weight">
+              <el-input v-model.trim="ruleForm.weight" :placeholder="title === '详情' ? '' : '重量'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="单价" prop="singlePrice">
+              <el-input v-model.trim="ruleForm.singlePrice" :placeholder="title === '详情' ? '' : '单价'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="安装及杂费" prop="installIncidentalExpenses">
+              <el-input v-model.trim="ruleForm.installIncidentalExpenses" :placeholder="title === '详情' ? '' : '安装及杂费'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="安装地点" prop="installPlace">
+              <el-input v-model.trim="ruleForm.installPlace" :placeholder="title === '详情' ? '' : '安装地点'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="原值" prop="originValue">
+              <el-input v-model.trim="ruleForm.originValue" :placeholder="title === '详情' ? '' : '原值'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="目前原值" prop="presentOriginValue">
+              <el-input v-model.trim="ruleForm.presentOriginValue" :placeholder="title === '详情' ? '' : '目前原值'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="折旧年限" prop="depreciationPeriod">
+              <el-input v-model.trim="ruleForm.depreciationPeriod" :placeholder="title === '详情' ? '' : '折旧年限'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="折旧方法" prop="depreciationMethod">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+                <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="属性" prop="attribute">
+              <el-input v-model.trim="ruleForm.attribute" placeholder="属性" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="说明书" prop="minioFileName">
+              <show-photo :minio-file-name="ruleForm.fileList[0]?.minioFileName || ''" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
+                {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
+              </el-button>
+              <span v-if="title === '详情' && !ruleForm.fileList[0]?.minioFileName">暂无</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" placeholder="备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block-switch>
   </div>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    padding-top: 20px;
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index f46553a..fc3fd54 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -360,20 +360,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          固定资产-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`固定资产-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -763,44 +758,11 @@
           </el-row>
         </div> -->
       </el-form>
-    </div>
+    </detail-page>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index 0abbdb1..6e88e96 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -74,33 +74,29 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ name }} -{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm">
-            关闭
-          </el-button>
-        </span>
-      </div>
-      <div class="body">
-        <!-- 三级菜单 -->
-        <el-radio-group v-model="current">
-          <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
-            {{ item.name }}
-          </el-radio-button>
-        </el-radio-group>
-      </div>
-      <!-- 展示区域 -->
-      <keep-alive>
-        <component :is="currentComp" ref="currentCompRef" :name="current" :title="title" :row="row" />
-      </keep-alive>
-    </div>
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <!-- 展示区域 -->
+    <keep-alive>
+      <component :is="currentComp" ref="currentCompRef" :name="current" :title="title" :row="row">
+        <template #menuswitch>
+          <!-- 三级菜单 -->
+          <el-radio-group v-model="current">
+            <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+              {{ item.name }}
+            </el-radio-button>
+          </el-radio-group>
+        </template>
+      </component>
+    </keep-alive>
   </app-container>
 </template>
 
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f9cdcd0..f653095 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -256,7 +256,7 @@
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
-  // 原生上传图片
+  // 原生上传
   // console.log(event.target.files)
   // if (event.target.files[0].type === 'application/pdf') {
   if (event.target.files?.length !== 0) {
@@ -354,7 +354,7 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" type="primary" @click="identify">
+          <!-- <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" type="primary" @click="identify">
             标签识别
           </el-button>
           <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/import`)" type="primary" @click="batchImport">
@@ -371,7 +371,13 @@
           </el-button>
           <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/print`)" v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/device/standingBook/components/templateTable.vue b/src/views/device/standingBook/components/templateTable.vue
index 8a928f0..7aa563f 100644
--- a/src/views/device/standingBook/components/templateTable.vue
+++ b/src/views/device/standingBook/components/templateTable.vue
@@ -245,11 +245,11 @@
   <div>
     <!-- 添加证书信息组件 -->
     <add-row ref="addRowRef" @add="addRowData" />
-    <div class="header">
-      <div class="title">
-        <!-- {{ $props.name }} -->
-      </div>
-      <span class="btns">
+    <detail-block-switch :title="name">
+      <template #menu>
+        <slot name="menuswitch" />
+      </template>
+      <template #btns>
         <el-button v-if="title !== '详情'" type="info" @click="removeRow">
           删除行
         </el-button>
@@ -259,55 +259,33 @@
         <el-button v-if="title !== '详情'" type="primary" @click="editRow">
           编辑行
         </el-button>
-      </span>
-    </div>
-    <!-- 表格区域 -->
-    <normal-table
-      id="print"
-      :data="list" :total="total" :columns="columns as any"
-      :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-      :list-loading="loadingTable"
-      style="padding-top: 20px;background-color: #fff;"
-      @change="changePage"
-    >
-      <template #preColumns>
-        <el-table-column label="" width="55" align="center">
-          <template #default="scope">
-            <el-radio v-model="select" :label="scope.$index" class="radio" />
-          </template>
-        </el-table-column>
-        <el-table-column label="序号" width="55" align="center">
-          <template #default="scope">
-            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-          </template>
-        </el-table-column>
       </template>
-    </normal-table>
+      <!-- 表格区域 -->
+      <normal-table
+        id="print"
+        :data="list" :total="total" :columns="columns as any"
+        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+        :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </detail-block-switch>
   </div>
 </template>
 
 <style lang="scss" scoped>
-.header {
-  background-color: #fff;
-  // height: 40px;
-  border-radius: 8px;
-  display: flex;
-  align-items: center;
-  flex-direction: column;
-  justify-content: center;
-  position: relative;
-
-  .title {
-    // font-weight: 700;
-  }
-
-  .btns {
-    position: absolute;
-    right: 40px;
-    top: -22px;
-  }
-}
-
 :deep(.el-radio__label) {
   display: none;
 }
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 7538bc8..78a3800 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -272,24 +272,12 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/identify`)" type="primary" @click="identify">
-            标签识别
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/import`)" type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/mould`)" type="primary" @click="templateDownload">
-            模板下载
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/add`)" type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/export`)" type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/print`)" v-print="printObj" type="primary">
-            打印
-          </el-button>
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/identify`)" icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table

diff --git a/src/components.d.ts b/src/components.d.ts
index 6e85584..815d62f 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -16,14 +16,13 @@
     BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default']
     BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
-    Benchcol: typeof import('./components/benchcol/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/DetailPage/index copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
+    DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
diff --git a/src/components/DetailPage/DetailBlockSwitch.vue b/src/components/DetailPage/DetailBlockSwitch.vue
new file mode 100644
index 0000000..4d92074
--- /dev/null
+++ b/src/components/DetailPage/DetailBlockSwitch.vue
@@ -0,0 +1,71 @@
+<script lang="ts" setup name="DetailBlock">
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+})
+
+const slots = useSlots()
+</script>
+
+<template>
+  <div class="detail-main">
+    <div class="header">
+      <div class="menu">
+        <slot name="menu" />
+      </div>
+      <div class="title">
+        {{ title }}
+      </div>
+      <div class="btns">
+        <slot name="btns" />
+      </div>
+    </div>
+    <div v-if="slots.default" class="content">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-main {
+  background-color: #fff;
+  border-radius: 8px;
+  margin-top: 10px;
+  padding-top: 10px;
+
+  .header {
+    position: relative;
+    height: 40px;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+
+    .title {
+      font-weight: 500;
+    }
+
+    .btns {
+      position: absolute;
+      right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+
+    .menu {
+      position: absolute;
+      left: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+
+  .content {
+    background-color: #fff;
+    padding: 0 10px 20px;
+    margin-top: 10px;
+  }
+}
+</style>
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d6c1c91..1644a80 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -314,6 +314,39 @@
       },
     ],
   },
+  {
+    path: '/borrow',
+    component: Layout,
+    redirect: '/device/borrow/borrowapply',
+    name: 'Borrow',
+    meta: {
+      title: '设备领用',
+      icon: 'ep:key',
+      auth: '/device/borrow',
+    },
+    children: [
+      {
+        path: 'borrowapply',
+        name: 'borroWapply',
+        component: () => import('@/views/device/borrow/borrwoApply.vue'),
+        meta: {
+          title: '设备借用申请',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowapply',
+        },
+      },
+      {
+        path: 'borrowhandle',
+        name: 'borrowHandle',
+        component: () => import('@/views/device/borrow/borrowHandle.vue'),
+        meta: {
+          title: '设备借用处理',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowhandle',
+        },
+      },
+    ],
+  },
 
 ]
 
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
new file mode 100644
index 0000000..1c2405e
--- /dev/null
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="borrowHandle">
+// 逻辑代码
+</script>
+
+<template>
+  <app-container>
+    设备借用处理
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
new file mode 100644
index 0000000..03d414b
--- /dev/null
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="borrowApply">
+// 逻辑代码
+</script>
+
+<template>
+  <app-container>
+    设备借用申请
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index c2682fc..5f7b347 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -339,381 +339,374 @@
 
 <template>
   <div class="body-container">
-    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资产编号" prop="assetNo">
-            <el-input v-model.trim="ruleForm.assetNo" placeholder="系统自动生成" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="资产类型" prop="assetType">
-            <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备编号" prop="equipmentNo">
-            <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备名称" prop="equipmentName">
-            <el-input v-model.trim="ruleForm.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="生产厂家" prop="manufacturer">
-            <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="厂家国别" prop="manufacturerCountry">
-            <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="出厂编号" prop="manufacturingNo">
-            <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="出厂年月" prop="manufacturingDate">
-            <el-date-picker
-              v-model="ruleForm.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '出厂年月'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="型号" prop="modelNo">
-            <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="管理状态" prop="managerState">
-            <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="ABC" prop="abc">
-            <el-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'">
-              <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="标签绑定" prop="labelBind">
-            <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === '详情' ? '' : '标签'" :disabled="title === '详情'" clearable>
-              <template #append>
-                <el-button type="primary" size="small">
-                  扫描
-                </el-button>
-              </template>
-            </el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="立卡年月" prop="cardEstablishmentDate">
-            <el-date-picker
-              v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '立卡年月'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="启用日期" prop="enableDate">
-            <el-date-picker
-              v-model="ruleForm.enableDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '启用日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定方式" prop="mesureType">
-            <el-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'">
-              <el-option v-for="item in mesureTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定周期" prop="mesureCycle">
-            <el-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="12">
-          <el-form-item label="测量范围" prop="mesureRange">
-            <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === '详情' ? '' : '测量范围'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="不确定度" prop="uncertainty">
-            <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === '详情' ? '' : '不确定度'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="使用部门" prop="useDept">
-            <com-tree-select
-              v-if="title !== '详情'"
-              v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-              :tree-props="deptProps"
-            />
-            <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
-              <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="使用人" prop="usePerson">
-            <el-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'">
-              <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="专业分类" prop="majorCategory">
-            <el-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'">
-              <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="检定部门" prop="mesureDept">
-            <com-tree-select
-              v-if="title !== '详情'"
-              v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-              :tree-props="deptProps"
-            />
-            <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
-              <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定日期" prop="mesureDate">
-            <el-date-picker
-              v-model="ruleForm.mesureDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '检定日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="有效日期" prop="validDate">
-            <el-date-picker
-              v-model="ruleForm.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '有效日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定结果" prop="mesureResult">
-            <el-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'">
-              <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="8">
-          <el-form-item label="是否是技术指标需要校准/检定的设备" prop="isCalibrationTestEquipment" label-width="260px">
-            <el-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否是测量工装台账" prop="isMeasureAccount" label-width="260px">
-            <el-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否标准配套设备" prop="isStandardSupportEquipment" label-width="260px">
-            <el-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
+    <detail-block-switch title="基本信息">
+      <template #menu>
+        <slot name="menuswitch" />
+      </template>
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资产编号" prop="assetNo">
+              <el-input v-model.trim="ruleForm.assetNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="资产类型" prop="assetType">
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备编号" prop="equipmentNo">
+              <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="生产厂家" prop="manufacturer">
+              <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="厂家国别" prop="manufacturerCountry">
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号" prop="manufacturingNo">
+              <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂年月" prop="manufacturingDate">
+              <el-date-picker
+                v-model="ruleForm.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '出厂年月'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="型号" prop="modelNo">
+              <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="管理状态" prop="managerState">
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="ABC" prop="abc">
+              <el-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'">
+                <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标签绑定" prop="labelBind">
+              <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === '详情' ? '' : '标签'" :disabled="title === '详情'" clearable>
+                <template #append>
+                  <el-button type="primary" size="small">
+                    扫描
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="立卡年月" prop="cardEstablishmentDate">
+              <el-date-picker
+                v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '立卡年月'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="启用日期" prop="enableDate">
+              <el-date-picker
+                v-model="ruleForm.enableDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '启用日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定方式" prop="mesureType">
+              <el-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'">
+                <el-option v-for="item in mesureTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定周期" prop="mesureCycle">
+              <el-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="测量范围" prop="mesureRange">
+              <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === '详情' ? '' : '测量范围'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="不确定度" prop="uncertainty">
+              <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === '详情' ? '' : '不确定度'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="使用部门" prop="useDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
+                :tree-props="deptProps"
+              />
+              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="使用人" prop="usePerson">
+              <el-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'">
+                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="专业分类" prop="majorCategory">
+              <el-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'">
+                <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="检定部门" prop="mesureDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                :tree-props="deptProps"
+              />
+              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定日期" prop="mesureDate">
+              <el-date-picker
+                v-model="ruleForm.mesureDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '检定日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="有效日期" prop="validDate">
+              <el-date-picker
+                v-model="ruleForm.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '有效日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定结果" prop="mesureResult">
+              <el-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'">
+                <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="8">
+            <el-form-item label="是否是技术指标需要校准/检定的设备" prop="isCalibrationTestEquipment" label-width="260px">
+              <el-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否是测量工装台账" prop="isMeasureAccount" label-width="260px">
+              <el-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否标准配套设备" prop="isStandardSupportEquipment" label-width="260px">
+              <el-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资产来源" prop="assetSource">
-            <el-input v-model.trim="ruleForm.assetSource" :placeholder="title === '详情' ? '' : '资产来源'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备规格" prop="equipmentSpecifications">
-            <el-input v-model.trim="ruleForm.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备类别" prop="equipmentCategory">
-            <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
-              <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备类型" prop="equipmentType">
-            <el-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'">
-              <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资本来源" prop="capitalSource">
-            <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
-              <el-option v-for="item in capitalSourceList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="管理级别" prop="managerLevel">
-            <el-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'">
-              <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="用途" prop="purpose">
-            <el-input v-model.trim="ruleForm.purpose" :placeholder="title === '详情' ? '' : '用途'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="技术水平" prop="technicalLevel">
-            <el-input v-model.trim="ruleForm.technicalLevel" :placeholder="title === '详情' ? '' : '技术水平'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="完好状态" prop="intactState">
-            <el-input v-model.trim="ruleForm.intactState" :placeholder="title === '详情' ? '' : '完好状态'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="外形尺寸" prop="overallDimension">
-            <el-input v-model.trim="ruleForm.overallDimension" :placeholder="title === '详情' ? '' : '外形尺寸'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="重量(吨)" prop="weight">
-            <el-input v-model.trim="ruleForm.weight" :placeholder="title === '详情' ? '' : '重量'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="单价" prop="singlePrice">
-            <el-input v-model.trim="ruleForm.singlePrice" :placeholder="title === '详情' ? '' : '单价'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="安装及杂费" prop="installIncidentalExpenses">
-            <el-input v-model.trim="ruleForm.installIncidentalExpenses" :placeholder="title === '详情' ? '' : '安装及杂费'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="安装地点" prop="installPlace">
-            <el-input v-model.trim="ruleForm.installPlace" :placeholder="title === '详情' ? '' : '安装地点'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="原值" prop="originValue">
-            <el-input v-model.trim="ruleForm.originValue" :placeholder="title === '详情' ? '' : '原值'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="目前原值" prop="presentOriginValue">
-            <el-input v-model.trim="ruleForm.presentOriginValue" :placeholder="title === '详情' ? '' : '目前原值'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="折旧年限" prop="depreciationPeriod">
-            <el-input v-model.trim="ruleForm.depreciationPeriod" :placeholder="title === '详情' ? '' : '折旧年限'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="折旧方法" prop="depreciationMethod">
-            <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
-              <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="属性" prop="attribute">
-            <el-input v-model.trim="ruleForm.attribute" placeholder="属性" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="12">
-          <el-form-item label="说明书" prop="minioFileName">
-            <show-photo :minio-file-name="ruleForm.fileList[0]?.minioFileName || ''" />
-            <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
-            <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
-              {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
-            </el-button>
-            <span v-if="title === '详情' && !ruleForm.fileList[0]?.minioFileName">暂无</span>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="24">
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" placeholder="备注" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资产来源" prop="assetSource">
+              <el-input v-model.trim="ruleForm.assetSource" :placeholder="title === '详情' ? '' : '资产来源'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备规格" prop="equipmentSpecifications">
+              <el-input v-model.trim="ruleForm.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备类别" prop="equipmentCategory">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+                <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备类型" prop="equipmentType">
+              <el-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'">
+                <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资本来源" prop="capitalSource">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+                <el-option v-for="item in capitalSourceList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="管理级别" prop="managerLevel">
+              <el-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'">
+                <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="用途" prop="purpose">
+              <el-input v-model.trim="ruleForm.purpose" :placeholder="title === '详情' ? '' : '用途'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="技术水平" prop="technicalLevel">
+              <el-input v-model.trim="ruleForm.technicalLevel" :placeholder="title === '详情' ? '' : '技术水平'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="完好状态" prop="intactState">
+              <el-input v-model.trim="ruleForm.intactState" :placeholder="title === '详情' ? '' : '完好状态'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="外形尺寸" prop="overallDimension">
+              <el-input v-model.trim="ruleForm.overallDimension" :placeholder="title === '详情' ? '' : '外形尺寸'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="重量(吨)" prop="weight">
+              <el-input v-model.trim="ruleForm.weight" :placeholder="title === '详情' ? '' : '重量'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="单价" prop="singlePrice">
+              <el-input v-model.trim="ruleForm.singlePrice" :placeholder="title === '详情' ? '' : '单价'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="安装及杂费" prop="installIncidentalExpenses">
+              <el-input v-model.trim="ruleForm.installIncidentalExpenses" :placeholder="title === '详情' ? '' : '安装及杂费'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="安装地点" prop="installPlace">
+              <el-input v-model.trim="ruleForm.installPlace" :placeholder="title === '详情' ? '' : '安装地点'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="原值" prop="originValue">
+              <el-input v-model.trim="ruleForm.originValue" :placeholder="title === '详情' ? '' : '原值'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="目前原值" prop="presentOriginValue">
+              <el-input v-model.trim="ruleForm.presentOriginValue" :placeholder="title === '详情' ? '' : '目前原值'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="折旧年限" prop="depreciationPeriod">
+              <el-input v-model.trim="ruleForm.depreciationPeriod" :placeholder="title === '详情' ? '' : '折旧年限'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="折旧方法" prop="depreciationMethod">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+                <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="属性" prop="attribute">
+              <el-input v-model.trim="ruleForm.attribute" placeholder="属性" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="说明书" prop="minioFileName">
+              <show-photo :minio-file-name="ruleForm.fileList[0]?.minioFileName || ''" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
+                {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
+              </el-button>
+              <span v-if="title === '详情' && !ruleForm.fileList[0]?.minioFileName">暂无</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" placeholder="备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block-switch>
   </div>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    padding-top: 20px;
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index f46553a..fc3fd54 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -360,20 +360,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          固定资产-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`固定资产-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -763,44 +758,11 @@
           </el-row>
         </div> -->
       </el-form>
-    </div>
+    </detail-page>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index 0abbdb1..6e88e96 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -74,33 +74,29 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ name }} -{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm">
-            关闭
-          </el-button>
-        </span>
-      </div>
-      <div class="body">
-        <!-- 三级菜单 -->
-        <el-radio-group v-model="current">
-          <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
-            {{ item.name }}
-          </el-radio-button>
-        </el-radio-group>
-      </div>
-      <!-- 展示区域 -->
-      <keep-alive>
-        <component :is="currentComp" ref="currentCompRef" :name="current" :title="title" :row="row" />
-      </keep-alive>
-    </div>
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <!-- 展示区域 -->
+    <keep-alive>
+      <component :is="currentComp" ref="currentCompRef" :name="current" :title="title" :row="row">
+        <template #menuswitch>
+          <!-- 三级菜单 -->
+          <el-radio-group v-model="current">
+            <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+              {{ item.name }}
+            </el-radio-button>
+          </el-radio-group>
+        </template>
+      </component>
+    </keep-alive>
   </app-container>
 </template>
 
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f9cdcd0..f653095 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -256,7 +256,7 @@
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
-  // 原生上传图片
+  // 原生上传
   // console.log(event.target.files)
   // if (event.target.files[0].type === 'application/pdf') {
   if (event.target.files?.length !== 0) {
@@ -354,7 +354,7 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" type="primary" @click="identify">
+          <!-- <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" type="primary" @click="identify">
             标签识别
           </el-button>
           <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/import`)" type="primary" @click="batchImport">
@@ -371,7 +371,13 @@
           </el-button>
           <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/print`)" v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/device/standingBook/components/templateTable.vue b/src/views/device/standingBook/components/templateTable.vue
index 8a928f0..7aa563f 100644
--- a/src/views/device/standingBook/components/templateTable.vue
+++ b/src/views/device/standingBook/components/templateTable.vue
@@ -245,11 +245,11 @@
   <div>
     <!-- 添加证书信息组件 -->
     <add-row ref="addRowRef" @add="addRowData" />
-    <div class="header">
-      <div class="title">
-        <!-- {{ $props.name }} -->
-      </div>
-      <span class="btns">
+    <detail-block-switch :title="name">
+      <template #menu>
+        <slot name="menuswitch" />
+      </template>
+      <template #btns>
         <el-button v-if="title !== '详情'" type="info" @click="removeRow">
           删除行
         </el-button>
@@ -259,55 +259,33 @@
         <el-button v-if="title !== '详情'" type="primary" @click="editRow">
           编辑行
         </el-button>
-      </span>
-    </div>
-    <!-- 表格区域 -->
-    <normal-table
-      id="print"
-      :data="list" :total="total" :columns="columns as any"
-      :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-      :list-loading="loadingTable"
-      style="padding-top: 20px;background-color: #fff;"
-      @change="changePage"
-    >
-      <template #preColumns>
-        <el-table-column label="" width="55" align="center">
-          <template #default="scope">
-            <el-radio v-model="select" :label="scope.$index" class="radio" />
-          </template>
-        </el-table-column>
-        <el-table-column label="序号" width="55" align="center">
-          <template #default="scope">
-            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-          </template>
-        </el-table-column>
       </template>
-    </normal-table>
+      <!-- 表格区域 -->
+      <normal-table
+        id="print"
+        :data="list" :total="total" :columns="columns as any"
+        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+        :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </detail-block-switch>
   </div>
 </template>
 
 <style lang="scss" scoped>
-.header {
-  background-color: #fff;
-  // height: 40px;
-  border-radius: 8px;
-  display: flex;
-  align-items: center;
-  flex-direction: column;
-  justify-content: center;
-  position: relative;
-
-  .title {
-    // font-weight: 700;
-  }
-
-  .btns {
-    position: absolute;
-    right: 40px;
-    top: -22px;
-  }
-}
-
 :deep(.el-radio__label) {
   display: none;
 }
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 7538bc8..78a3800 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -272,24 +272,12 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/identify`)" type="primary" @click="identify">
-            标签识别
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/import`)" type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/mould`)" type="primary" @click="templateDownload">
-            模板下载
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/add`)" type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/export`)" type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/print`)" v-print="printObj" type="primary">
-            打印
-          </el-button>
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/identify`)" icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index fc364c8..e74d70e 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -361,20 +361,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ name }} - {{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -458,73 +453,33 @@
           </el-col>
         </el-row>
       </el-form>
-      <div v-if="title !== '新建' ">
-        <div class="header" style="margin-top: 10px;">
-          <div class="title">
-            审批流程
-          </div>
-        </div>
-        <div class="timeline">
-          <el-timeline>
-            <el-timeline-item timestamp="2018/4/12" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/12 20:46</p>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="2018/4/3" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/3 20:46</p>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="2018/4/2" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/2 20:46</p>
-              </el-card>
-            </el-timeline-item>
-          </el-timeline>
-        </div>
-      </div>
-    </div>
+    </detail-page>
+    <detail-block v-if="title !== '新建' " title="审批流程">
+      <el-timeline>
+        <el-timeline-item timestamp="2018/4/12" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/12 20:46</p>
+          </el-card>
+        </el-timeline-item>
+        <el-timeline-item timestamp="2018/4/3" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/3 20:46</p>
+          </el-card>
+        </el-timeline-item>
+        <el-timeline-item timestamp="2018/4/2" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/2 20:46</p>
+          </el-card>
+        </el-timeline-item>
+      </el-timeline>
+    </detail-block>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .timeline {
   background-color: #fff;
 }

diff --git a/src/components.d.ts b/src/components.d.ts
index 6e85584..815d62f 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -16,14 +16,13 @@
     BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default']
     BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
-    Benchcol: typeof import('./components/benchcol/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/DetailPage/index copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
+    DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
diff --git a/src/components/DetailPage/DetailBlockSwitch.vue b/src/components/DetailPage/DetailBlockSwitch.vue
new file mode 100644
index 0000000..4d92074
--- /dev/null
+++ b/src/components/DetailPage/DetailBlockSwitch.vue
@@ -0,0 +1,71 @@
+<script lang="ts" setup name="DetailBlock">
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+})
+
+const slots = useSlots()
+</script>
+
+<template>
+  <div class="detail-main">
+    <div class="header">
+      <div class="menu">
+        <slot name="menu" />
+      </div>
+      <div class="title">
+        {{ title }}
+      </div>
+      <div class="btns">
+        <slot name="btns" />
+      </div>
+    </div>
+    <div v-if="slots.default" class="content">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-main {
+  background-color: #fff;
+  border-radius: 8px;
+  margin-top: 10px;
+  padding-top: 10px;
+
+  .header {
+    position: relative;
+    height: 40px;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+
+    .title {
+      font-weight: 500;
+    }
+
+    .btns {
+      position: absolute;
+      right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+
+    .menu {
+      position: absolute;
+      left: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+
+  .content {
+    background-color: #fff;
+    padding: 0 10px 20px;
+    margin-top: 10px;
+  }
+}
+</style>
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d6c1c91..1644a80 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -314,6 +314,39 @@
       },
     ],
   },
+  {
+    path: '/borrow',
+    component: Layout,
+    redirect: '/device/borrow/borrowapply',
+    name: 'Borrow',
+    meta: {
+      title: '设备领用',
+      icon: 'ep:key',
+      auth: '/device/borrow',
+    },
+    children: [
+      {
+        path: 'borrowapply',
+        name: 'borroWapply',
+        component: () => import('@/views/device/borrow/borrwoApply.vue'),
+        meta: {
+          title: '设备借用申请',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowapply',
+        },
+      },
+      {
+        path: 'borrowhandle',
+        name: 'borrowHandle',
+        component: () => import('@/views/device/borrow/borrowHandle.vue'),
+        meta: {
+          title: '设备借用处理',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowhandle',
+        },
+      },
+    ],
+  },
 
 ]
 
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
new file mode 100644
index 0000000..1c2405e
--- /dev/null
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="borrowHandle">
+// 逻辑代码
+</script>
+
+<template>
+  <app-container>
+    设备借用处理
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
new file mode 100644
index 0000000..03d414b
--- /dev/null
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="borrowApply">
+// 逻辑代码
+</script>
+
+<template>
+  <app-container>
+    设备借用申请
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index c2682fc..5f7b347 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -339,381 +339,374 @@
 
 <template>
   <div class="body-container">
-    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资产编号" prop="assetNo">
-            <el-input v-model.trim="ruleForm.assetNo" placeholder="系统自动生成" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="资产类型" prop="assetType">
-            <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备编号" prop="equipmentNo">
-            <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备名称" prop="equipmentName">
-            <el-input v-model.trim="ruleForm.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="生产厂家" prop="manufacturer">
-            <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="厂家国别" prop="manufacturerCountry">
-            <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="出厂编号" prop="manufacturingNo">
-            <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="出厂年月" prop="manufacturingDate">
-            <el-date-picker
-              v-model="ruleForm.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '出厂年月'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="型号" prop="modelNo">
-            <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="管理状态" prop="managerState">
-            <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="ABC" prop="abc">
-            <el-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'">
-              <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="标签绑定" prop="labelBind">
-            <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === '详情' ? '' : '标签'" :disabled="title === '详情'" clearable>
-              <template #append>
-                <el-button type="primary" size="small">
-                  扫描
-                </el-button>
-              </template>
-            </el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="立卡年月" prop="cardEstablishmentDate">
-            <el-date-picker
-              v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '立卡年月'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="启用日期" prop="enableDate">
-            <el-date-picker
-              v-model="ruleForm.enableDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '启用日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定方式" prop="mesureType">
-            <el-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'">
-              <el-option v-for="item in mesureTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定周期" prop="mesureCycle">
-            <el-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="12">
-          <el-form-item label="测量范围" prop="mesureRange">
-            <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === '详情' ? '' : '测量范围'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="不确定度" prop="uncertainty">
-            <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === '详情' ? '' : '不确定度'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="使用部门" prop="useDept">
-            <com-tree-select
-              v-if="title !== '详情'"
-              v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-              :tree-props="deptProps"
-            />
-            <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
-              <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="使用人" prop="usePerson">
-            <el-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'">
-              <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="专业分类" prop="majorCategory">
-            <el-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'">
-              <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="检定部门" prop="mesureDept">
-            <com-tree-select
-              v-if="title !== '详情'"
-              v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-              :tree-props="deptProps"
-            />
-            <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
-              <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定日期" prop="mesureDate">
-            <el-date-picker
-              v-model="ruleForm.mesureDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '检定日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="有效日期" prop="validDate">
-            <el-date-picker
-              v-model="ruleForm.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '有效日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定结果" prop="mesureResult">
-            <el-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'">
-              <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="8">
-          <el-form-item label="是否是技术指标需要校准/检定的设备" prop="isCalibrationTestEquipment" label-width="260px">
-            <el-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否是测量工装台账" prop="isMeasureAccount" label-width="260px">
-            <el-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否标准配套设备" prop="isStandardSupportEquipment" label-width="260px">
-            <el-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
+    <detail-block-switch title="基本信息">
+      <template #menu>
+        <slot name="menuswitch" />
+      </template>
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资产编号" prop="assetNo">
+              <el-input v-model.trim="ruleForm.assetNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="资产类型" prop="assetType">
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备编号" prop="equipmentNo">
+              <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="生产厂家" prop="manufacturer">
+              <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="厂家国别" prop="manufacturerCountry">
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号" prop="manufacturingNo">
+              <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂年月" prop="manufacturingDate">
+              <el-date-picker
+                v-model="ruleForm.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '出厂年月'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="型号" prop="modelNo">
+              <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="管理状态" prop="managerState">
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="ABC" prop="abc">
+              <el-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'">
+                <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标签绑定" prop="labelBind">
+              <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === '详情' ? '' : '标签'" :disabled="title === '详情'" clearable>
+                <template #append>
+                  <el-button type="primary" size="small">
+                    扫描
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="立卡年月" prop="cardEstablishmentDate">
+              <el-date-picker
+                v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '立卡年月'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="启用日期" prop="enableDate">
+              <el-date-picker
+                v-model="ruleForm.enableDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '启用日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定方式" prop="mesureType">
+              <el-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'">
+                <el-option v-for="item in mesureTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定周期" prop="mesureCycle">
+              <el-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="测量范围" prop="mesureRange">
+              <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === '详情' ? '' : '测量范围'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="不确定度" prop="uncertainty">
+              <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === '详情' ? '' : '不确定度'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="使用部门" prop="useDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
+                :tree-props="deptProps"
+              />
+              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="使用人" prop="usePerson">
+              <el-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'">
+                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="专业分类" prop="majorCategory">
+              <el-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'">
+                <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="检定部门" prop="mesureDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                :tree-props="deptProps"
+              />
+              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定日期" prop="mesureDate">
+              <el-date-picker
+                v-model="ruleForm.mesureDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '检定日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="有效日期" prop="validDate">
+              <el-date-picker
+                v-model="ruleForm.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '有效日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定结果" prop="mesureResult">
+              <el-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'">
+                <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="8">
+            <el-form-item label="是否是技术指标需要校准/检定的设备" prop="isCalibrationTestEquipment" label-width="260px">
+              <el-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否是测量工装台账" prop="isMeasureAccount" label-width="260px">
+              <el-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否标准配套设备" prop="isStandardSupportEquipment" label-width="260px">
+              <el-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资产来源" prop="assetSource">
-            <el-input v-model.trim="ruleForm.assetSource" :placeholder="title === '详情' ? '' : '资产来源'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备规格" prop="equipmentSpecifications">
-            <el-input v-model.trim="ruleForm.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备类别" prop="equipmentCategory">
-            <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
-              <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备类型" prop="equipmentType">
-            <el-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'">
-              <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资本来源" prop="capitalSource">
-            <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
-              <el-option v-for="item in capitalSourceList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="管理级别" prop="managerLevel">
-            <el-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'">
-              <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="用途" prop="purpose">
-            <el-input v-model.trim="ruleForm.purpose" :placeholder="title === '详情' ? '' : '用途'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="技术水平" prop="technicalLevel">
-            <el-input v-model.trim="ruleForm.technicalLevel" :placeholder="title === '详情' ? '' : '技术水平'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="完好状态" prop="intactState">
-            <el-input v-model.trim="ruleForm.intactState" :placeholder="title === '详情' ? '' : '完好状态'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="外形尺寸" prop="overallDimension">
-            <el-input v-model.trim="ruleForm.overallDimension" :placeholder="title === '详情' ? '' : '外形尺寸'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="重量(吨)" prop="weight">
-            <el-input v-model.trim="ruleForm.weight" :placeholder="title === '详情' ? '' : '重量'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="单价" prop="singlePrice">
-            <el-input v-model.trim="ruleForm.singlePrice" :placeholder="title === '详情' ? '' : '单价'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="安装及杂费" prop="installIncidentalExpenses">
-            <el-input v-model.trim="ruleForm.installIncidentalExpenses" :placeholder="title === '详情' ? '' : '安装及杂费'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="安装地点" prop="installPlace">
-            <el-input v-model.trim="ruleForm.installPlace" :placeholder="title === '详情' ? '' : '安装地点'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="原值" prop="originValue">
-            <el-input v-model.trim="ruleForm.originValue" :placeholder="title === '详情' ? '' : '原值'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="目前原值" prop="presentOriginValue">
-            <el-input v-model.trim="ruleForm.presentOriginValue" :placeholder="title === '详情' ? '' : '目前原值'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="折旧年限" prop="depreciationPeriod">
-            <el-input v-model.trim="ruleForm.depreciationPeriod" :placeholder="title === '详情' ? '' : '折旧年限'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="折旧方法" prop="depreciationMethod">
-            <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
-              <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="属性" prop="attribute">
-            <el-input v-model.trim="ruleForm.attribute" placeholder="属性" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="12">
-          <el-form-item label="说明书" prop="minioFileName">
-            <show-photo :minio-file-name="ruleForm.fileList[0]?.minioFileName || ''" />
-            <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
-            <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
-              {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
-            </el-button>
-            <span v-if="title === '详情' && !ruleForm.fileList[0]?.minioFileName">暂无</span>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="24">
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" placeholder="备注" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资产来源" prop="assetSource">
+              <el-input v-model.trim="ruleForm.assetSource" :placeholder="title === '详情' ? '' : '资产来源'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备规格" prop="equipmentSpecifications">
+              <el-input v-model.trim="ruleForm.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备类别" prop="equipmentCategory">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+                <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备类型" prop="equipmentType">
+              <el-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'">
+                <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资本来源" prop="capitalSource">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+                <el-option v-for="item in capitalSourceList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="管理级别" prop="managerLevel">
+              <el-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'">
+                <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="用途" prop="purpose">
+              <el-input v-model.trim="ruleForm.purpose" :placeholder="title === '详情' ? '' : '用途'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="技术水平" prop="technicalLevel">
+              <el-input v-model.trim="ruleForm.technicalLevel" :placeholder="title === '详情' ? '' : '技术水平'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="完好状态" prop="intactState">
+              <el-input v-model.trim="ruleForm.intactState" :placeholder="title === '详情' ? '' : '完好状态'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="外形尺寸" prop="overallDimension">
+              <el-input v-model.trim="ruleForm.overallDimension" :placeholder="title === '详情' ? '' : '外形尺寸'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="重量(吨)" prop="weight">
+              <el-input v-model.trim="ruleForm.weight" :placeholder="title === '详情' ? '' : '重量'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="单价" prop="singlePrice">
+              <el-input v-model.trim="ruleForm.singlePrice" :placeholder="title === '详情' ? '' : '单价'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="安装及杂费" prop="installIncidentalExpenses">
+              <el-input v-model.trim="ruleForm.installIncidentalExpenses" :placeholder="title === '详情' ? '' : '安装及杂费'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="安装地点" prop="installPlace">
+              <el-input v-model.trim="ruleForm.installPlace" :placeholder="title === '详情' ? '' : '安装地点'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="原值" prop="originValue">
+              <el-input v-model.trim="ruleForm.originValue" :placeholder="title === '详情' ? '' : '原值'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="目前原值" prop="presentOriginValue">
+              <el-input v-model.trim="ruleForm.presentOriginValue" :placeholder="title === '详情' ? '' : '目前原值'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="折旧年限" prop="depreciationPeriod">
+              <el-input v-model.trim="ruleForm.depreciationPeriod" :placeholder="title === '详情' ? '' : '折旧年限'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="折旧方法" prop="depreciationMethod">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+                <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="属性" prop="attribute">
+              <el-input v-model.trim="ruleForm.attribute" placeholder="属性" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="说明书" prop="minioFileName">
+              <show-photo :minio-file-name="ruleForm.fileList[0]?.minioFileName || ''" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
+                {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
+              </el-button>
+              <span v-if="title === '详情' && !ruleForm.fileList[0]?.minioFileName">暂无</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" placeholder="备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block-switch>
   </div>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    padding-top: 20px;
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index f46553a..fc3fd54 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -360,20 +360,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          固定资产-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`固定资产-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -763,44 +758,11 @@
           </el-row>
         </div> -->
       </el-form>
-    </div>
+    </detail-page>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index 0abbdb1..6e88e96 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -74,33 +74,29 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ name }} -{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm">
-            关闭
-          </el-button>
-        </span>
-      </div>
-      <div class="body">
-        <!-- 三级菜单 -->
-        <el-radio-group v-model="current">
-          <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
-            {{ item.name }}
-          </el-radio-button>
-        </el-radio-group>
-      </div>
-      <!-- 展示区域 -->
-      <keep-alive>
-        <component :is="currentComp" ref="currentCompRef" :name="current" :title="title" :row="row" />
-      </keep-alive>
-    </div>
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <!-- 展示区域 -->
+    <keep-alive>
+      <component :is="currentComp" ref="currentCompRef" :name="current" :title="title" :row="row">
+        <template #menuswitch>
+          <!-- 三级菜单 -->
+          <el-radio-group v-model="current">
+            <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+              {{ item.name }}
+            </el-radio-button>
+          </el-radio-group>
+        </template>
+      </component>
+    </keep-alive>
   </app-container>
 </template>
 
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f9cdcd0..f653095 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -256,7 +256,7 @@
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
-  // 原生上传图片
+  // 原生上传
   // console.log(event.target.files)
   // if (event.target.files[0].type === 'application/pdf') {
   if (event.target.files?.length !== 0) {
@@ -354,7 +354,7 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" type="primary" @click="identify">
+          <!-- <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" type="primary" @click="identify">
             标签识别
           </el-button>
           <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/import`)" type="primary" @click="batchImport">
@@ -371,7 +371,13 @@
           </el-button>
           <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/print`)" v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/device/standingBook/components/templateTable.vue b/src/views/device/standingBook/components/templateTable.vue
index 8a928f0..7aa563f 100644
--- a/src/views/device/standingBook/components/templateTable.vue
+++ b/src/views/device/standingBook/components/templateTable.vue
@@ -245,11 +245,11 @@
   <div>
     <!-- 添加证书信息组件 -->
     <add-row ref="addRowRef" @add="addRowData" />
-    <div class="header">
-      <div class="title">
-        <!-- {{ $props.name }} -->
-      </div>
-      <span class="btns">
+    <detail-block-switch :title="name">
+      <template #menu>
+        <slot name="menuswitch" />
+      </template>
+      <template #btns>
         <el-button v-if="title !== '详情'" type="info" @click="removeRow">
           删除行
         </el-button>
@@ -259,55 +259,33 @@
         <el-button v-if="title !== '详情'" type="primary" @click="editRow">
           编辑行
         </el-button>
-      </span>
-    </div>
-    <!-- 表格区域 -->
-    <normal-table
-      id="print"
-      :data="list" :total="total" :columns="columns as any"
-      :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-      :list-loading="loadingTable"
-      style="padding-top: 20px;background-color: #fff;"
-      @change="changePage"
-    >
-      <template #preColumns>
-        <el-table-column label="" width="55" align="center">
-          <template #default="scope">
-            <el-radio v-model="select" :label="scope.$index" class="radio" />
-          </template>
-        </el-table-column>
-        <el-table-column label="序号" width="55" align="center">
-          <template #default="scope">
-            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-          </template>
-        </el-table-column>
       </template>
-    </normal-table>
+      <!-- 表格区域 -->
+      <normal-table
+        id="print"
+        :data="list" :total="total" :columns="columns as any"
+        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+        :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </detail-block-switch>
   </div>
 </template>
 
 <style lang="scss" scoped>
-.header {
-  background-color: #fff;
-  // height: 40px;
-  border-radius: 8px;
-  display: flex;
-  align-items: center;
-  flex-direction: column;
-  justify-content: center;
-  position: relative;
-
-  .title {
-    // font-weight: 700;
-  }
-
-  .btns {
-    position: absolute;
-    right: 40px;
-    top: -22px;
-  }
-}
-
 :deep(.el-radio__label) {
   display: none;
 }
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 7538bc8..78a3800 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -272,24 +272,12 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/identify`)" type="primary" @click="identify">
-            标签识别
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/import`)" type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/mould`)" type="primary" @click="templateDownload">
-            模板下载
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/add`)" type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/export`)" type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/print`)" v-print="printObj" type="primary">
-            打印
-          </el-button>
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/identify`)" icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index fc364c8..e74d70e 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -361,20 +361,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ name }} - {{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -458,73 +453,33 @@
           </el-col>
         </el-row>
       </el-form>
-      <div v-if="title !== '新建' ">
-        <div class="header" style="margin-top: 10px;">
-          <div class="title">
-            审批流程
-          </div>
-        </div>
-        <div class="timeline">
-          <el-timeline>
-            <el-timeline-item timestamp="2018/4/12" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/12 20:46</p>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="2018/4/3" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/3 20:46</p>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="2018/4/2" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/2 20:46</p>
-              </el-card>
-            </el-timeline-item>
-          </el-timeline>
-        </div>
-      </div>
-    </div>
+    </detail-page>
+    <detail-block v-if="title !== '新建' " title="审批流程">
+      <el-timeline>
+        <el-timeline-item timestamp="2018/4/12" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/12 20:46</p>
+          </el-card>
+        </el-timeline-item>
+        <el-timeline-item timestamp="2018/4/3" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/3 20:46</p>
+          </el-card>
+        </el-timeline-item>
+        <el-timeline-item timestamp="2018/4/2" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/2 20:46</p>
+          </el-card>
+        </el-timeline-item>
+      </el-timeline>
+    </detail-block>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .timeline {
   background-color: #fff;
 }
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index aa3963f..737568d 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -1,6 +1,6 @@
 <!-- 状态管理公共列表组件 -->
 <script lang="ts" setup>
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessageBox } from 'element-plus'
 import approve from './approvalActionDialog.vue'
 import addDialog from './templateAdd.vue'
 const props = defineProps({
@@ -142,7 +142,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: any) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     title: '详情',
@@ -150,7 +150,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: any) => {
   dialogVisible.value = true
   // addRef.value.initDialog({
   //   title: '编辑',
@@ -158,7 +158,7 @@
   // })
 }
 // 删除
-const remove = (row) => {
+const remove = (row: any) => {
   ElMessageBox.confirm(
     `确认删除${row.equipmentName}吗？`,
     '提示',
@@ -181,20 +181,20 @@
   // })
 }
 // 同意
-const agree = (row) => {
+const agree = (row: any) => {
   console.log(approveRef.value)
   approveRef.value.initDialog({
     radio: '1',
   })
 }
 // 驳回
-const reject = (row) => {
+const reject = (row: any) => {
   approveRef.value.initDialog({
     radio: '3',
   })
 }
 // 拒绝
-const refuse = (row) => {
+const refuse = (row: any) => {
   approveRef.value.initDialog(
     {
       radio: '2',
@@ -202,7 +202,7 @@
   )
 }
 // 取消
-const cancel = (row) => {
+const cancel = (rowrow: any) => {
   ElMessageBox.confirm(
     '确认取消吗？',
     '提示',
@@ -301,20 +301,20 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+          <el-input placeholder="申请编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="设备编号" clearable class="w-50 m-2" />
+          <el-input placeholder="设备编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.modelNo" placeholder="设备名称" clearable class="w-50 m-2" />
+          <el-input placeholder="设备名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请单位" clearable class="w-50 m-2" />
+          <el-input placeholder="申请单位" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.publisher" placeholder="申请状态" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" />
+          <el-select placeholder="申请状态" clearable>
+            <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" /> -->
           </el-select>
         </search-item>
       </search-area>
@@ -328,7 +328,10 @@
           <el-button type="primary" @click="templateDownload">
             模板下载
           </el-button> -->
-          <el-button type="primary" @click="add">
+          <icon-button icon="icon-add" title="新建" @click="add" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+          <!-- <el-button type="primary" @click="add">
             新建
           </el-button>
           <el-button type="primary" @click="exportExcelBtn">
@@ -336,7 +339,7 @@
           </el-button>
           <el-button v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
         </template>
         <!-- 表格区域 -->
         <normal-table
@@ -386,22 +389,3 @@
     </app-container>
   </div>
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 154px !important;
-}
-
-.normal-date {
-  width: 154px !important;
-}
-
-.normal-select {
-  width: 154px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
-

diff --git a/src/components.d.ts b/src/components.d.ts
index 6e85584..815d62f 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -16,14 +16,13 @@
     BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default']
     BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
-    Benchcol: typeof import('./components/benchcol/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/DetailPage/index copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
+    DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
diff --git a/src/components/DetailPage/DetailBlockSwitch.vue b/src/components/DetailPage/DetailBlockSwitch.vue
new file mode 100644
index 0000000..4d92074
--- /dev/null
+++ b/src/components/DetailPage/DetailBlockSwitch.vue
@@ -0,0 +1,71 @@
+<script lang="ts" setup name="DetailBlock">
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+})
+
+const slots = useSlots()
+</script>
+
+<template>
+  <div class="detail-main">
+    <div class="header">
+      <div class="menu">
+        <slot name="menu" />
+      </div>
+      <div class="title">
+        {{ title }}
+      </div>
+      <div class="btns">
+        <slot name="btns" />
+      </div>
+    </div>
+    <div v-if="slots.default" class="content">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-main {
+  background-color: #fff;
+  border-radius: 8px;
+  margin-top: 10px;
+  padding-top: 10px;
+
+  .header {
+    position: relative;
+    height: 40px;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+
+    .title {
+      font-weight: 500;
+    }
+
+    .btns {
+      position: absolute;
+      right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+
+    .menu {
+      position: absolute;
+      left: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+
+  .content {
+    background-color: #fff;
+    padding: 0 10px 20px;
+    margin-top: 10px;
+  }
+}
+</style>
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d6c1c91..1644a80 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -314,6 +314,39 @@
       },
     ],
   },
+  {
+    path: '/borrow',
+    component: Layout,
+    redirect: '/device/borrow/borrowapply',
+    name: 'Borrow',
+    meta: {
+      title: '设备领用',
+      icon: 'ep:key',
+      auth: '/device/borrow',
+    },
+    children: [
+      {
+        path: 'borrowapply',
+        name: 'borroWapply',
+        component: () => import('@/views/device/borrow/borrwoApply.vue'),
+        meta: {
+          title: '设备借用申请',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowapply',
+        },
+      },
+      {
+        path: 'borrowhandle',
+        name: 'borrowHandle',
+        component: () => import('@/views/device/borrow/borrowHandle.vue'),
+        meta: {
+          title: '设备借用处理',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowhandle',
+        },
+      },
+    ],
+  },
 
 ]
 
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
new file mode 100644
index 0000000..1c2405e
--- /dev/null
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="borrowHandle">
+// 逻辑代码
+</script>
+
+<template>
+  <app-container>
+    设备借用处理
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
new file mode 100644
index 0000000..03d414b
--- /dev/null
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="borrowApply">
+// 逻辑代码
+</script>
+
+<template>
+  <app-container>
+    设备借用申请
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index c2682fc..5f7b347 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -339,381 +339,374 @@
 
 <template>
   <div class="body-container">
-    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资产编号" prop="assetNo">
-            <el-input v-model.trim="ruleForm.assetNo" placeholder="系统自动生成" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="资产类型" prop="assetType">
-            <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备编号" prop="equipmentNo">
-            <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备名称" prop="equipmentName">
-            <el-input v-model.trim="ruleForm.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="生产厂家" prop="manufacturer">
-            <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="厂家国别" prop="manufacturerCountry">
-            <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="出厂编号" prop="manufacturingNo">
-            <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="出厂年月" prop="manufacturingDate">
-            <el-date-picker
-              v-model="ruleForm.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '出厂年月'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="型号" prop="modelNo">
-            <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="管理状态" prop="managerState">
-            <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="ABC" prop="abc">
-            <el-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'">
-              <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="标签绑定" prop="labelBind">
-            <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === '详情' ? '' : '标签'" :disabled="title === '详情'" clearable>
-              <template #append>
-                <el-button type="primary" size="small">
-                  扫描
-                </el-button>
-              </template>
-            </el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="立卡年月" prop="cardEstablishmentDate">
-            <el-date-picker
-              v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '立卡年月'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="启用日期" prop="enableDate">
-            <el-date-picker
-              v-model="ruleForm.enableDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '启用日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定方式" prop="mesureType">
-            <el-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'">
-              <el-option v-for="item in mesureTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定周期" prop="mesureCycle">
-            <el-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="12">
-          <el-form-item label="测量范围" prop="mesureRange">
-            <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === '详情' ? '' : '测量范围'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="不确定度" prop="uncertainty">
-            <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === '详情' ? '' : '不确定度'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="使用部门" prop="useDept">
-            <com-tree-select
-              v-if="title !== '详情'"
-              v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-              :tree-props="deptProps"
-            />
-            <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
-              <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="使用人" prop="usePerson">
-            <el-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'">
-              <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="专业分类" prop="majorCategory">
-            <el-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'">
-              <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="检定部门" prop="mesureDept">
-            <com-tree-select
-              v-if="title !== '详情'"
-              v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-              :tree-props="deptProps"
-            />
-            <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
-              <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定日期" prop="mesureDate">
-            <el-date-picker
-              v-model="ruleForm.mesureDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '检定日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="有效日期" prop="validDate">
-            <el-date-picker
-              v-model="ruleForm.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '有效日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定结果" prop="mesureResult">
-            <el-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'">
-              <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="8">
-          <el-form-item label="是否是技术指标需要校准/检定的设备" prop="isCalibrationTestEquipment" label-width="260px">
-            <el-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否是测量工装台账" prop="isMeasureAccount" label-width="260px">
-            <el-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否标准配套设备" prop="isStandardSupportEquipment" label-width="260px">
-            <el-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
+    <detail-block-switch title="基本信息">
+      <template #menu>
+        <slot name="menuswitch" />
+      </template>
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资产编号" prop="assetNo">
+              <el-input v-model.trim="ruleForm.assetNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="资产类型" prop="assetType">
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备编号" prop="equipmentNo">
+              <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="生产厂家" prop="manufacturer">
+              <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="厂家国别" prop="manufacturerCountry">
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号" prop="manufacturingNo">
+              <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂年月" prop="manufacturingDate">
+              <el-date-picker
+                v-model="ruleForm.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '出厂年月'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="型号" prop="modelNo">
+              <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="管理状态" prop="managerState">
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="ABC" prop="abc">
+              <el-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'">
+                <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标签绑定" prop="labelBind">
+              <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === '详情' ? '' : '标签'" :disabled="title === '详情'" clearable>
+                <template #append>
+                  <el-button type="primary" size="small">
+                    扫描
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="立卡年月" prop="cardEstablishmentDate">
+              <el-date-picker
+                v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '立卡年月'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="启用日期" prop="enableDate">
+              <el-date-picker
+                v-model="ruleForm.enableDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '启用日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定方式" prop="mesureType">
+              <el-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'">
+                <el-option v-for="item in mesureTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定周期" prop="mesureCycle">
+              <el-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="测量范围" prop="mesureRange">
+              <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === '详情' ? '' : '测量范围'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="不确定度" prop="uncertainty">
+              <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === '详情' ? '' : '不确定度'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="使用部门" prop="useDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
+                :tree-props="deptProps"
+              />
+              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="使用人" prop="usePerson">
+              <el-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'">
+                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="专业分类" prop="majorCategory">
+              <el-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'">
+                <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="检定部门" prop="mesureDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                :tree-props="deptProps"
+              />
+              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定日期" prop="mesureDate">
+              <el-date-picker
+                v-model="ruleForm.mesureDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '检定日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="有效日期" prop="validDate">
+              <el-date-picker
+                v-model="ruleForm.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '有效日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定结果" prop="mesureResult">
+              <el-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'">
+                <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="8">
+            <el-form-item label="是否是技术指标需要校准/检定的设备" prop="isCalibrationTestEquipment" label-width="260px">
+              <el-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否是测量工装台账" prop="isMeasureAccount" label-width="260px">
+              <el-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否标准配套设备" prop="isStandardSupportEquipment" label-width="260px">
+              <el-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资产来源" prop="assetSource">
-            <el-input v-model.trim="ruleForm.assetSource" :placeholder="title === '详情' ? '' : '资产来源'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备规格" prop="equipmentSpecifications">
-            <el-input v-model.trim="ruleForm.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备类别" prop="equipmentCategory">
-            <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
-              <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备类型" prop="equipmentType">
-            <el-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'">
-              <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资本来源" prop="capitalSource">
-            <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
-              <el-option v-for="item in capitalSourceList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="管理级别" prop="managerLevel">
-            <el-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'">
-              <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="用途" prop="purpose">
-            <el-input v-model.trim="ruleForm.purpose" :placeholder="title === '详情' ? '' : '用途'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="技术水平" prop="technicalLevel">
-            <el-input v-model.trim="ruleForm.technicalLevel" :placeholder="title === '详情' ? '' : '技术水平'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="完好状态" prop="intactState">
-            <el-input v-model.trim="ruleForm.intactState" :placeholder="title === '详情' ? '' : '完好状态'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="外形尺寸" prop="overallDimension">
-            <el-input v-model.trim="ruleForm.overallDimension" :placeholder="title === '详情' ? '' : '外形尺寸'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="重量(吨)" prop="weight">
-            <el-input v-model.trim="ruleForm.weight" :placeholder="title === '详情' ? '' : '重量'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="单价" prop="singlePrice">
-            <el-input v-model.trim="ruleForm.singlePrice" :placeholder="title === '详情' ? '' : '单价'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="安装及杂费" prop="installIncidentalExpenses">
-            <el-input v-model.trim="ruleForm.installIncidentalExpenses" :placeholder="title === '详情' ? '' : '安装及杂费'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="安装地点" prop="installPlace">
-            <el-input v-model.trim="ruleForm.installPlace" :placeholder="title === '详情' ? '' : '安装地点'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="原值" prop="originValue">
-            <el-input v-model.trim="ruleForm.originValue" :placeholder="title === '详情' ? '' : '原值'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="目前原值" prop="presentOriginValue">
-            <el-input v-model.trim="ruleForm.presentOriginValue" :placeholder="title === '详情' ? '' : '目前原值'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="折旧年限" prop="depreciationPeriod">
-            <el-input v-model.trim="ruleForm.depreciationPeriod" :placeholder="title === '详情' ? '' : '折旧年限'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="折旧方法" prop="depreciationMethod">
-            <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
-              <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="属性" prop="attribute">
-            <el-input v-model.trim="ruleForm.attribute" placeholder="属性" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="12">
-          <el-form-item label="说明书" prop="minioFileName">
-            <show-photo :minio-file-name="ruleForm.fileList[0]?.minioFileName || ''" />
-            <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
-            <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
-              {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
-            </el-button>
-            <span v-if="title === '详情' && !ruleForm.fileList[0]?.minioFileName">暂无</span>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="24">
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" placeholder="备注" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资产来源" prop="assetSource">
+              <el-input v-model.trim="ruleForm.assetSource" :placeholder="title === '详情' ? '' : '资产来源'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备规格" prop="equipmentSpecifications">
+              <el-input v-model.trim="ruleForm.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备类别" prop="equipmentCategory">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+                <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备类型" prop="equipmentType">
+              <el-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'">
+                <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资本来源" prop="capitalSource">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+                <el-option v-for="item in capitalSourceList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="管理级别" prop="managerLevel">
+              <el-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'">
+                <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="用途" prop="purpose">
+              <el-input v-model.trim="ruleForm.purpose" :placeholder="title === '详情' ? '' : '用途'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="技术水平" prop="technicalLevel">
+              <el-input v-model.trim="ruleForm.technicalLevel" :placeholder="title === '详情' ? '' : '技术水平'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="完好状态" prop="intactState">
+              <el-input v-model.trim="ruleForm.intactState" :placeholder="title === '详情' ? '' : '完好状态'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="外形尺寸" prop="overallDimension">
+              <el-input v-model.trim="ruleForm.overallDimension" :placeholder="title === '详情' ? '' : '外形尺寸'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="重量(吨)" prop="weight">
+              <el-input v-model.trim="ruleForm.weight" :placeholder="title === '详情' ? '' : '重量'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="单价" prop="singlePrice">
+              <el-input v-model.trim="ruleForm.singlePrice" :placeholder="title === '详情' ? '' : '单价'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="安装及杂费" prop="installIncidentalExpenses">
+              <el-input v-model.trim="ruleForm.installIncidentalExpenses" :placeholder="title === '详情' ? '' : '安装及杂费'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="安装地点" prop="installPlace">
+              <el-input v-model.trim="ruleForm.installPlace" :placeholder="title === '详情' ? '' : '安装地点'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="原值" prop="originValue">
+              <el-input v-model.trim="ruleForm.originValue" :placeholder="title === '详情' ? '' : '原值'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="目前原值" prop="presentOriginValue">
+              <el-input v-model.trim="ruleForm.presentOriginValue" :placeholder="title === '详情' ? '' : '目前原值'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="折旧年限" prop="depreciationPeriod">
+              <el-input v-model.trim="ruleForm.depreciationPeriod" :placeholder="title === '详情' ? '' : '折旧年限'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="折旧方法" prop="depreciationMethod">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+                <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="属性" prop="attribute">
+              <el-input v-model.trim="ruleForm.attribute" placeholder="属性" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="说明书" prop="minioFileName">
+              <show-photo :minio-file-name="ruleForm.fileList[0]?.minioFileName || ''" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
+                {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
+              </el-button>
+              <span v-if="title === '详情' && !ruleForm.fileList[0]?.minioFileName">暂无</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" placeholder="备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block-switch>
   </div>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    padding-top: 20px;
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index f46553a..fc3fd54 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -360,20 +360,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          固定资产-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`固定资产-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -763,44 +758,11 @@
           </el-row>
         </div> -->
       </el-form>
-    </div>
+    </detail-page>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index 0abbdb1..6e88e96 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -74,33 +74,29 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ name }} -{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm">
-            关闭
-          </el-button>
-        </span>
-      </div>
-      <div class="body">
-        <!-- 三级菜单 -->
-        <el-radio-group v-model="current">
-          <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
-            {{ item.name }}
-          </el-radio-button>
-        </el-radio-group>
-      </div>
-      <!-- 展示区域 -->
-      <keep-alive>
-        <component :is="currentComp" ref="currentCompRef" :name="current" :title="title" :row="row" />
-      </keep-alive>
-    </div>
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <!-- 展示区域 -->
+    <keep-alive>
+      <component :is="currentComp" ref="currentCompRef" :name="current" :title="title" :row="row">
+        <template #menuswitch>
+          <!-- 三级菜单 -->
+          <el-radio-group v-model="current">
+            <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+              {{ item.name }}
+            </el-radio-button>
+          </el-radio-group>
+        </template>
+      </component>
+    </keep-alive>
   </app-container>
 </template>
 
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f9cdcd0..f653095 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -256,7 +256,7 @@
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
-  // 原生上传图片
+  // 原生上传
   // console.log(event.target.files)
   // if (event.target.files[0].type === 'application/pdf') {
   if (event.target.files?.length !== 0) {
@@ -354,7 +354,7 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" type="primary" @click="identify">
+          <!-- <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" type="primary" @click="identify">
             标签识别
           </el-button>
           <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/import`)" type="primary" @click="batchImport">
@@ -371,7 +371,13 @@
           </el-button>
           <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/print`)" v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/device/standingBook/components/templateTable.vue b/src/views/device/standingBook/components/templateTable.vue
index 8a928f0..7aa563f 100644
--- a/src/views/device/standingBook/components/templateTable.vue
+++ b/src/views/device/standingBook/components/templateTable.vue
@@ -245,11 +245,11 @@
   <div>
     <!-- 添加证书信息组件 -->
     <add-row ref="addRowRef" @add="addRowData" />
-    <div class="header">
-      <div class="title">
-        <!-- {{ $props.name }} -->
-      </div>
-      <span class="btns">
+    <detail-block-switch :title="name">
+      <template #menu>
+        <slot name="menuswitch" />
+      </template>
+      <template #btns>
         <el-button v-if="title !== '详情'" type="info" @click="removeRow">
           删除行
         </el-button>
@@ -259,55 +259,33 @@
         <el-button v-if="title !== '详情'" type="primary" @click="editRow">
           编辑行
         </el-button>
-      </span>
-    </div>
-    <!-- 表格区域 -->
-    <normal-table
-      id="print"
-      :data="list" :total="total" :columns="columns as any"
-      :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-      :list-loading="loadingTable"
-      style="padding-top: 20px;background-color: #fff;"
-      @change="changePage"
-    >
-      <template #preColumns>
-        <el-table-column label="" width="55" align="center">
-          <template #default="scope">
-            <el-radio v-model="select" :label="scope.$index" class="radio" />
-          </template>
-        </el-table-column>
-        <el-table-column label="序号" width="55" align="center">
-          <template #default="scope">
-            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-          </template>
-        </el-table-column>
       </template>
-    </normal-table>
+      <!-- 表格区域 -->
+      <normal-table
+        id="print"
+        :data="list" :total="total" :columns="columns as any"
+        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+        :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </detail-block-switch>
   </div>
 </template>
 
 <style lang="scss" scoped>
-.header {
-  background-color: #fff;
-  // height: 40px;
-  border-radius: 8px;
-  display: flex;
-  align-items: center;
-  flex-direction: column;
-  justify-content: center;
-  position: relative;
-
-  .title {
-    // font-weight: 700;
-  }
-
-  .btns {
-    position: absolute;
-    right: 40px;
-    top: -22px;
-  }
-}
-
 :deep(.el-radio__label) {
   display: none;
 }
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 7538bc8..78a3800 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -272,24 +272,12 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/identify`)" type="primary" @click="identify">
-            标签识别
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/import`)" type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/mould`)" type="primary" @click="templateDownload">
-            模板下载
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/add`)" type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/export`)" type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/print`)" v-print="printObj" type="primary">
-            打印
-          </el-button>
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/identify`)" icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index fc364c8..e74d70e 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -361,20 +361,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ name }} - {{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -458,73 +453,33 @@
           </el-col>
         </el-row>
       </el-form>
-      <div v-if="title !== '新建' ">
-        <div class="header" style="margin-top: 10px;">
-          <div class="title">
-            审批流程
-          </div>
-        </div>
-        <div class="timeline">
-          <el-timeline>
-            <el-timeline-item timestamp="2018/4/12" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/12 20:46</p>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="2018/4/3" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/3 20:46</p>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="2018/4/2" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/2 20:46</p>
-              </el-card>
-            </el-timeline-item>
-          </el-timeline>
-        </div>
-      </div>
-    </div>
+    </detail-page>
+    <detail-block v-if="title !== '新建' " title="审批流程">
+      <el-timeline>
+        <el-timeline-item timestamp="2018/4/12" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/12 20:46</p>
+          </el-card>
+        </el-timeline-item>
+        <el-timeline-item timestamp="2018/4/3" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/3 20:46</p>
+          </el-card>
+        </el-timeline-item>
+        <el-timeline-item timestamp="2018/4/2" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/2 20:46</p>
+          </el-card>
+        </el-timeline-item>
+      </el-timeline>
+    </detail-block>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .timeline {
   background-color: #fff;
 }
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index aa3963f..737568d 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -1,6 +1,6 @@
 <!-- 状态管理公共列表组件 -->
 <script lang="ts" setup>
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessageBox } from 'element-plus'
 import approve from './approvalActionDialog.vue'
 import addDialog from './templateAdd.vue'
 const props = defineProps({
@@ -142,7 +142,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: any) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     title: '详情',
@@ -150,7 +150,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: any) => {
   dialogVisible.value = true
   // addRef.value.initDialog({
   //   title: '编辑',
@@ -158,7 +158,7 @@
   // })
 }
 // 删除
-const remove = (row) => {
+const remove = (row: any) => {
   ElMessageBox.confirm(
     `确认删除${row.equipmentName}吗？`,
     '提示',
@@ -181,20 +181,20 @@
   // })
 }
 // 同意
-const agree = (row) => {
+const agree = (row: any) => {
   console.log(approveRef.value)
   approveRef.value.initDialog({
     radio: '1',
   })
 }
 // 驳回
-const reject = (row) => {
+const reject = (row: any) => {
   approveRef.value.initDialog({
     radio: '3',
   })
 }
 // 拒绝
-const refuse = (row) => {
+const refuse = (row: any) => {
   approveRef.value.initDialog(
     {
       radio: '2',
@@ -202,7 +202,7 @@
   )
 }
 // 取消
-const cancel = (row) => {
+const cancel = (rowrow: any) => {
   ElMessageBox.confirm(
     '确认取消吗？',
     '提示',
@@ -301,20 +301,20 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+          <el-input placeholder="申请编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="设备编号" clearable class="w-50 m-2" />
+          <el-input placeholder="设备编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.modelNo" placeholder="设备名称" clearable class="w-50 m-2" />
+          <el-input placeholder="设备名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请单位" clearable class="w-50 m-2" />
+          <el-input placeholder="申请单位" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.publisher" placeholder="申请状态" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" />
+          <el-select placeholder="申请状态" clearable>
+            <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" /> -->
           </el-select>
         </search-item>
       </search-area>
@@ -328,7 +328,10 @@
           <el-button type="primary" @click="templateDownload">
             模板下载
           </el-button> -->
-          <el-button type="primary" @click="add">
+          <icon-button icon="icon-add" title="新建" @click="add" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+          <!-- <el-button type="primary" @click="add">
             新建
           </el-button>
           <el-button type="primary" @click="exportExcelBtn">
@@ -336,7 +339,7 @@
           </el-button>
           <el-button v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
         </template>
         <!-- 表格区域 -->
         <normal-table
@@ -386,22 +389,3 @@
     </app-container>
   </div>
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 154px !important;
-}
-
-.normal-date {
-  width: 154px !important;
-}
-
-.normal-select {
-  width: 154px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
-
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 0763c5a..9ef0b93 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -19,7 +19,6 @@
 const effectiveStatusName = ref('')
 const title = ref('')
 const fileList = ref<UploadUserFile[]>([])
-console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -80,10 +79,9 @@
   if (row.title === '新建') {
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
-    ruleForm.publisher = ''
+    ruleForm.publisher = userInfo.$state.deptName
     ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 判断有无存储
-    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
     if (sessionStorage.getItem(fileTypeName.value)) {
       const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
       ruleForm.fileType = session.fileType
@@ -117,6 +115,8 @@
     ruleForm.remark = row.remark
     ruleForm.publishTime = row.publishTime
     ruleForm.minioFileName = row.minioFileName
+    // ruleForm.publisher = '0'
+    // ruleForm.createUserId = '1'
   }
 }
 defineExpose({ initDialog })
@@ -148,6 +148,9 @@
       type: 'warning',
     },
       ).then((res) => {
+        if (ruleForm.publisher === userInfo.$state.deptName) {
+          ruleForm.publisher === userInfo.$state.deptId
+        }
         if (flag == '提交') {
           addApi(ruleForm).then((res) => {
             if (res.code == 200) {
@@ -193,7 +196,6 @@
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        console.log(res.data[0])
         ruleForm.minioFileName = res.data[0]
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
@@ -216,7 +218,6 @@
 // ])
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
-  console.log(diffDat)
   if (diffDat < 0) {
     // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '在使用'
@@ -237,7 +238,7 @@
 
 <template>
   <app-container v-if="dialogVisible" style="overflow: hidden;">
-    <detail-page :title="`${title}${fileTypeName}`">
+    <detail-page :title="`${fileTypeName}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
           提交
@@ -278,12 +279,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="发布单位" prop="publisher">
-              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'" class="fill-input">
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled>
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
               <com-tree-select
                 v-else
-                v-model="ruleForm.publisher" :options="PubListTree" placeholder="选择组织机构"
+                v-model="ruleForm.publisher" :options="PubListTree" placeholder="请选择发布单位"
                 :tree-props="deptProps"
               />
             </el-form-item>

diff --git a/src/components.d.ts b/src/components.d.ts
index 6e85584..815d62f 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -16,14 +16,13 @@
     BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default']
     BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
-    Benchcol: typeof import('./components/benchcol/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/DetailPage/index copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
+    DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
diff --git a/src/components/DetailPage/DetailBlockSwitch.vue b/src/components/DetailPage/DetailBlockSwitch.vue
new file mode 100644
index 0000000..4d92074
--- /dev/null
+++ b/src/components/DetailPage/DetailBlockSwitch.vue
@@ -0,0 +1,71 @@
+<script lang="ts" setup name="DetailBlock">
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+})
+
+const slots = useSlots()
+</script>
+
+<template>
+  <div class="detail-main">
+    <div class="header">
+      <div class="menu">
+        <slot name="menu" />
+      </div>
+      <div class="title">
+        {{ title }}
+      </div>
+      <div class="btns">
+        <slot name="btns" />
+      </div>
+    </div>
+    <div v-if="slots.default" class="content">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-main {
+  background-color: #fff;
+  border-radius: 8px;
+  margin-top: 10px;
+  padding-top: 10px;
+
+  .header {
+    position: relative;
+    height: 40px;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+
+    .title {
+      font-weight: 500;
+    }
+
+    .btns {
+      position: absolute;
+      right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+
+    .menu {
+      position: absolute;
+      left: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+
+  .content {
+    background-color: #fff;
+    padding: 0 10px 20px;
+    margin-top: 10px;
+  }
+}
+</style>
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d6c1c91..1644a80 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -314,6 +314,39 @@
       },
     ],
   },
+  {
+    path: '/borrow',
+    component: Layout,
+    redirect: '/device/borrow/borrowapply',
+    name: 'Borrow',
+    meta: {
+      title: '设备领用',
+      icon: 'ep:key',
+      auth: '/device/borrow',
+    },
+    children: [
+      {
+        path: 'borrowapply',
+        name: 'borroWapply',
+        component: () => import('@/views/device/borrow/borrwoApply.vue'),
+        meta: {
+          title: '设备借用申请',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowapply',
+        },
+      },
+      {
+        path: 'borrowhandle',
+        name: 'borrowHandle',
+        component: () => import('@/views/device/borrow/borrowHandle.vue'),
+        meta: {
+          title: '设备借用处理',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowhandle',
+        },
+      },
+    ],
+  },
 
 ]
 
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
new file mode 100644
index 0000000..1c2405e
--- /dev/null
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="borrowHandle">
+// 逻辑代码
+</script>
+
+<template>
+  <app-container>
+    设备借用处理
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
new file mode 100644
index 0000000..03d414b
--- /dev/null
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="borrowApply">
+// 逻辑代码
+</script>
+
+<template>
+  <app-container>
+    设备借用申请
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index c2682fc..5f7b347 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -339,381 +339,374 @@
 
 <template>
   <div class="body-container">
-    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资产编号" prop="assetNo">
-            <el-input v-model.trim="ruleForm.assetNo" placeholder="系统自动生成" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="资产类型" prop="assetType">
-            <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备编号" prop="equipmentNo">
-            <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备名称" prop="equipmentName">
-            <el-input v-model.trim="ruleForm.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="生产厂家" prop="manufacturer">
-            <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="厂家国别" prop="manufacturerCountry">
-            <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="出厂编号" prop="manufacturingNo">
-            <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="出厂年月" prop="manufacturingDate">
-            <el-date-picker
-              v-model="ruleForm.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '出厂年月'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="型号" prop="modelNo">
-            <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="管理状态" prop="managerState">
-            <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="ABC" prop="abc">
-            <el-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'">
-              <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="标签绑定" prop="labelBind">
-            <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === '详情' ? '' : '标签'" :disabled="title === '详情'" clearable>
-              <template #append>
-                <el-button type="primary" size="small">
-                  扫描
-                </el-button>
-              </template>
-            </el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="立卡年月" prop="cardEstablishmentDate">
-            <el-date-picker
-              v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '立卡年月'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="启用日期" prop="enableDate">
-            <el-date-picker
-              v-model="ruleForm.enableDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '启用日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定方式" prop="mesureType">
-            <el-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'">
-              <el-option v-for="item in mesureTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定周期" prop="mesureCycle">
-            <el-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="12">
-          <el-form-item label="测量范围" prop="mesureRange">
-            <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === '详情' ? '' : '测量范围'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="不确定度" prop="uncertainty">
-            <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === '详情' ? '' : '不确定度'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="使用部门" prop="useDept">
-            <com-tree-select
-              v-if="title !== '详情'"
-              v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-              :tree-props="deptProps"
-            />
-            <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
-              <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="使用人" prop="usePerson">
-            <el-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'">
-              <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="专业分类" prop="majorCategory">
-            <el-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'">
-              <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="检定部门" prop="mesureDept">
-            <com-tree-select
-              v-if="title !== '详情'"
-              v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-              :tree-props="deptProps"
-            />
-            <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
-              <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定日期" prop="mesureDate">
-            <el-date-picker
-              v-model="ruleForm.mesureDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '检定日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="有效日期" prop="validDate">
-            <el-date-picker
-              v-model="ruleForm.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '有效日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定结果" prop="mesureResult">
-            <el-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'">
-              <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="8">
-          <el-form-item label="是否是技术指标需要校准/检定的设备" prop="isCalibrationTestEquipment" label-width="260px">
-            <el-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否是测量工装台账" prop="isMeasureAccount" label-width="260px">
-            <el-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否标准配套设备" prop="isStandardSupportEquipment" label-width="260px">
-            <el-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
+    <detail-block-switch title="基本信息">
+      <template #menu>
+        <slot name="menuswitch" />
+      </template>
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资产编号" prop="assetNo">
+              <el-input v-model.trim="ruleForm.assetNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="资产类型" prop="assetType">
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备编号" prop="equipmentNo">
+              <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="生产厂家" prop="manufacturer">
+              <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="厂家国别" prop="manufacturerCountry">
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号" prop="manufacturingNo">
+              <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂年月" prop="manufacturingDate">
+              <el-date-picker
+                v-model="ruleForm.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '出厂年月'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="型号" prop="modelNo">
+              <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="管理状态" prop="managerState">
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="ABC" prop="abc">
+              <el-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'">
+                <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标签绑定" prop="labelBind">
+              <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === '详情' ? '' : '标签'" :disabled="title === '详情'" clearable>
+                <template #append>
+                  <el-button type="primary" size="small">
+                    扫描
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="立卡年月" prop="cardEstablishmentDate">
+              <el-date-picker
+                v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '立卡年月'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="启用日期" prop="enableDate">
+              <el-date-picker
+                v-model="ruleForm.enableDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '启用日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定方式" prop="mesureType">
+              <el-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'">
+                <el-option v-for="item in mesureTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定周期" prop="mesureCycle">
+              <el-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="测量范围" prop="mesureRange">
+              <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === '详情' ? '' : '测量范围'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="不确定度" prop="uncertainty">
+              <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === '详情' ? '' : '不确定度'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="使用部门" prop="useDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
+                :tree-props="deptProps"
+              />
+              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="使用人" prop="usePerson">
+              <el-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'">
+                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="专业分类" prop="majorCategory">
+              <el-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'">
+                <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="检定部门" prop="mesureDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                :tree-props="deptProps"
+              />
+              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定日期" prop="mesureDate">
+              <el-date-picker
+                v-model="ruleForm.mesureDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '检定日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="有效日期" prop="validDate">
+              <el-date-picker
+                v-model="ruleForm.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '有效日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定结果" prop="mesureResult">
+              <el-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'">
+                <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="8">
+            <el-form-item label="是否是技术指标需要校准/检定的设备" prop="isCalibrationTestEquipment" label-width="260px">
+              <el-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否是测量工装台账" prop="isMeasureAccount" label-width="260px">
+              <el-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否标准配套设备" prop="isStandardSupportEquipment" label-width="260px">
+              <el-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资产来源" prop="assetSource">
-            <el-input v-model.trim="ruleForm.assetSource" :placeholder="title === '详情' ? '' : '资产来源'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备规格" prop="equipmentSpecifications">
-            <el-input v-model.trim="ruleForm.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备类别" prop="equipmentCategory">
-            <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
-              <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备类型" prop="equipmentType">
-            <el-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'">
-              <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资本来源" prop="capitalSource">
-            <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
-              <el-option v-for="item in capitalSourceList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="管理级别" prop="managerLevel">
-            <el-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'">
-              <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="用途" prop="purpose">
-            <el-input v-model.trim="ruleForm.purpose" :placeholder="title === '详情' ? '' : '用途'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="技术水平" prop="technicalLevel">
-            <el-input v-model.trim="ruleForm.technicalLevel" :placeholder="title === '详情' ? '' : '技术水平'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="完好状态" prop="intactState">
-            <el-input v-model.trim="ruleForm.intactState" :placeholder="title === '详情' ? '' : '完好状态'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="外形尺寸" prop="overallDimension">
-            <el-input v-model.trim="ruleForm.overallDimension" :placeholder="title === '详情' ? '' : '外形尺寸'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="重量(吨)" prop="weight">
-            <el-input v-model.trim="ruleForm.weight" :placeholder="title === '详情' ? '' : '重量'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="单价" prop="singlePrice">
-            <el-input v-model.trim="ruleForm.singlePrice" :placeholder="title === '详情' ? '' : '单价'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="安装及杂费" prop="installIncidentalExpenses">
-            <el-input v-model.trim="ruleForm.installIncidentalExpenses" :placeholder="title === '详情' ? '' : '安装及杂费'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="安装地点" prop="installPlace">
-            <el-input v-model.trim="ruleForm.installPlace" :placeholder="title === '详情' ? '' : '安装地点'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="原值" prop="originValue">
-            <el-input v-model.trim="ruleForm.originValue" :placeholder="title === '详情' ? '' : '原值'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="目前原值" prop="presentOriginValue">
-            <el-input v-model.trim="ruleForm.presentOriginValue" :placeholder="title === '详情' ? '' : '目前原值'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="折旧年限" prop="depreciationPeriod">
-            <el-input v-model.trim="ruleForm.depreciationPeriod" :placeholder="title === '详情' ? '' : '折旧年限'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="折旧方法" prop="depreciationMethod">
-            <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
-              <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="属性" prop="attribute">
-            <el-input v-model.trim="ruleForm.attribute" placeholder="属性" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="12">
-          <el-form-item label="说明书" prop="minioFileName">
-            <show-photo :minio-file-name="ruleForm.fileList[0]?.minioFileName || ''" />
-            <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
-            <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
-              {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
-            </el-button>
-            <span v-if="title === '详情' && !ruleForm.fileList[0]?.minioFileName">暂无</span>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="24">
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" placeholder="备注" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资产来源" prop="assetSource">
+              <el-input v-model.trim="ruleForm.assetSource" :placeholder="title === '详情' ? '' : '资产来源'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备规格" prop="equipmentSpecifications">
+              <el-input v-model.trim="ruleForm.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备类别" prop="equipmentCategory">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+                <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备类型" prop="equipmentType">
+              <el-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'">
+                <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资本来源" prop="capitalSource">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+                <el-option v-for="item in capitalSourceList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="管理级别" prop="managerLevel">
+              <el-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'">
+                <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="用途" prop="purpose">
+              <el-input v-model.trim="ruleForm.purpose" :placeholder="title === '详情' ? '' : '用途'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="技术水平" prop="technicalLevel">
+              <el-input v-model.trim="ruleForm.technicalLevel" :placeholder="title === '详情' ? '' : '技术水平'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="完好状态" prop="intactState">
+              <el-input v-model.trim="ruleForm.intactState" :placeholder="title === '详情' ? '' : '完好状态'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="外形尺寸" prop="overallDimension">
+              <el-input v-model.trim="ruleForm.overallDimension" :placeholder="title === '详情' ? '' : '外形尺寸'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="重量(吨)" prop="weight">
+              <el-input v-model.trim="ruleForm.weight" :placeholder="title === '详情' ? '' : '重量'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="单价" prop="singlePrice">
+              <el-input v-model.trim="ruleForm.singlePrice" :placeholder="title === '详情' ? '' : '单价'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="安装及杂费" prop="installIncidentalExpenses">
+              <el-input v-model.trim="ruleForm.installIncidentalExpenses" :placeholder="title === '详情' ? '' : '安装及杂费'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="安装地点" prop="installPlace">
+              <el-input v-model.trim="ruleForm.installPlace" :placeholder="title === '详情' ? '' : '安装地点'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="原值" prop="originValue">
+              <el-input v-model.trim="ruleForm.originValue" :placeholder="title === '详情' ? '' : '原值'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="目前原值" prop="presentOriginValue">
+              <el-input v-model.trim="ruleForm.presentOriginValue" :placeholder="title === '详情' ? '' : '目前原值'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="折旧年限" prop="depreciationPeriod">
+              <el-input v-model.trim="ruleForm.depreciationPeriod" :placeholder="title === '详情' ? '' : '折旧年限'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="折旧方法" prop="depreciationMethod">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+                <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="属性" prop="attribute">
+              <el-input v-model.trim="ruleForm.attribute" placeholder="属性" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="说明书" prop="minioFileName">
+              <show-photo :minio-file-name="ruleForm.fileList[0]?.minioFileName || ''" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
+                {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
+              </el-button>
+              <span v-if="title === '详情' && !ruleForm.fileList[0]?.minioFileName">暂无</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" placeholder="备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block-switch>
   </div>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    padding-top: 20px;
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index f46553a..fc3fd54 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -360,20 +360,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          固定资产-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`固定资产-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -763,44 +758,11 @@
           </el-row>
         </div> -->
       </el-form>
-    </div>
+    </detail-page>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index 0abbdb1..6e88e96 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -74,33 +74,29 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ name }} -{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm">
-            关闭
-          </el-button>
-        </span>
-      </div>
-      <div class="body">
-        <!-- 三级菜单 -->
-        <el-radio-group v-model="current">
-          <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
-            {{ item.name }}
-          </el-radio-button>
-        </el-radio-group>
-      </div>
-      <!-- 展示区域 -->
-      <keep-alive>
-        <component :is="currentComp" ref="currentCompRef" :name="current" :title="title" :row="row" />
-      </keep-alive>
-    </div>
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <!-- 展示区域 -->
+    <keep-alive>
+      <component :is="currentComp" ref="currentCompRef" :name="current" :title="title" :row="row">
+        <template #menuswitch>
+          <!-- 三级菜单 -->
+          <el-radio-group v-model="current">
+            <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+              {{ item.name }}
+            </el-radio-button>
+          </el-radio-group>
+        </template>
+      </component>
+    </keep-alive>
   </app-container>
 </template>
 
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f9cdcd0..f653095 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -256,7 +256,7 @@
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
-  // 原生上传图片
+  // 原生上传
   // console.log(event.target.files)
   // if (event.target.files[0].type === 'application/pdf') {
   if (event.target.files?.length !== 0) {
@@ -354,7 +354,7 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" type="primary" @click="identify">
+          <!-- <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" type="primary" @click="identify">
             标签识别
           </el-button>
           <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/import`)" type="primary" @click="batchImport">
@@ -371,7 +371,13 @@
           </el-button>
           <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/print`)" v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/device/standingBook/components/templateTable.vue b/src/views/device/standingBook/components/templateTable.vue
index 8a928f0..7aa563f 100644
--- a/src/views/device/standingBook/components/templateTable.vue
+++ b/src/views/device/standingBook/components/templateTable.vue
@@ -245,11 +245,11 @@
   <div>
     <!-- 添加证书信息组件 -->
     <add-row ref="addRowRef" @add="addRowData" />
-    <div class="header">
-      <div class="title">
-        <!-- {{ $props.name }} -->
-      </div>
-      <span class="btns">
+    <detail-block-switch :title="name">
+      <template #menu>
+        <slot name="menuswitch" />
+      </template>
+      <template #btns>
         <el-button v-if="title !== '详情'" type="info" @click="removeRow">
           删除行
         </el-button>
@@ -259,55 +259,33 @@
         <el-button v-if="title !== '详情'" type="primary" @click="editRow">
           编辑行
         </el-button>
-      </span>
-    </div>
-    <!-- 表格区域 -->
-    <normal-table
-      id="print"
-      :data="list" :total="total" :columns="columns as any"
-      :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-      :list-loading="loadingTable"
-      style="padding-top: 20px;background-color: #fff;"
-      @change="changePage"
-    >
-      <template #preColumns>
-        <el-table-column label="" width="55" align="center">
-          <template #default="scope">
-            <el-radio v-model="select" :label="scope.$index" class="radio" />
-          </template>
-        </el-table-column>
-        <el-table-column label="序号" width="55" align="center">
-          <template #default="scope">
-            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-          </template>
-        </el-table-column>
       </template>
-    </normal-table>
+      <!-- 表格区域 -->
+      <normal-table
+        id="print"
+        :data="list" :total="total" :columns="columns as any"
+        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+        :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </detail-block-switch>
   </div>
 </template>
 
 <style lang="scss" scoped>
-.header {
-  background-color: #fff;
-  // height: 40px;
-  border-radius: 8px;
-  display: flex;
-  align-items: center;
-  flex-direction: column;
-  justify-content: center;
-  position: relative;
-
-  .title {
-    // font-weight: 700;
-  }
-
-  .btns {
-    position: absolute;
-    right: 40px;
-    top: -22px;
-  }
-}
-
 :deep(.el-radio__label) {
   display: none;
 }
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 7538bc8..78a3800 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -272,24 +272,12 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/identify`)" type="primary" @click="identify">
-            标签识别
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/import`)" type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/mould`)" type="primary" @click="templateDownload">
-            模板下载
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/add`)" type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/export`)" type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/print`)" v-print="printObj" type="primary">
-            打印
-          </el-button>
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/identify`)" icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index fc364c8..e74d70e 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -361,20 +361,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ name }} - {{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -458,73 +453,33 @@
           </el-col>
         </el-row>
       </el-form>
-      <div v-if="title !== '新建' ">
-        <div class="header" style="margin-top: 10px;">
-          <div class="title">
-            审批流程
-          </div>
-        </div>
-        <div class="timeline">
-          <el-timeline>
-            <el-timeline-item timestamp="2018/4/12" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/12 20:46</p>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="2018/4/3" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/3 20:46</p>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="2018/4/2" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/2 20:46</p>
-              </el-card>
-            </el-timeline-item>
-          </el-timeline>
-        </div>
-      </div>
-    </div>
+    </detail-page>
+    <detail-block v-if="title !== '新建' " title="审批流程">
+      <el-timeline>
+        <el-timeline-item timestamp="2018/4/12" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/12 20:46</p>
+          </el-card>
+        </el-timeline-item>
+        <el-timeline-item timestamp="2018/4/3" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/3 20:46</p>
+          </el-card>
+        </el-timeline-item>
+        <el-timeline-item timestamp="2018/4/2" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/2 20:46</p>
+          </el-card>
+        </el-timeline-item>
+      </el-timeline>
+    </detail-block>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .timeline {
   background-color: #fff;
 }
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index aa3963f..737568d 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -1,6 +1,6 @@
 <!-- 状态管理公共列表组件 -->
 <script lang="ts" setup>
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessageBox } from 'element-plus'
 import approve from './approvalActionDialog.vue'
 import addDialog from './templateAdd.vue'
 const props = defineProps({
@@ -142,7 +142,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: any) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     title: '详情',
@@ -150,7 +150,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: any) => {
   dialogVisible.value = true
   // addRef.value.initDialog({
   //   title: '编辑',
@@ -158,7 +158,7 @@
   // })
 }
 // 删除
-const remove = (row) => {
+const remove = (row: any) => {
   ElMessageBox.confirm(
     `确认删除${row.equipmentName}吗？`,
     '提示',
@@ -181,20 +181,20 @@
   // })
 }
 // 同意
-const agree = (row) => {
+const agree = (row: any) => {
   console.log(approveRef.value)
   approveRef.value.initDialog({
     radio: '1',
   })
 }
 // 驳回
-const reject = (row) => {
+const reject = (row: any) => {
   approveRef.value.initDialog({
     radio: '3',
   })
 }
 // 拒绝
-const refuse = (row) => {
+const refuse = (row: any) => {
   approveRef.value.initDialog(
     {
       radio: '2',
@@ -202,7 +202,7 @@
   )
 }
 // 取消
-const cancel = (row) => {
+const cancel = (rowrow: any) => {
   ElMessageBox.confirm(
     '确认取消吗？',
     '提示',
@@ -301,20 +301,20 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+          <el-input placeholder="申请编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="设备编号" clearable class="w-50 m-2" />
+          <el-input placeholder="设备编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.modelNo" placeholder="设备名称" clearable class="w-50 m-2" />
+          <el-input placeholder="设备名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请单位" clearable class="w-50 m-2" />
+          <el-input placeholder="申请单位" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.publisher" placeholder="申请状态" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" />
+          <el-select placeholder="申请状态" clearable>
+            <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" /> -->
           </el-select>
         </search-item>
       </search-area>
@@ -328,7 +328,10 @@
           <el-button type="primary" @click="templateDownload">
             模板下载
           </el-button> -->
-          <el-button type="primary" @click="add">
+          <icon-button icon="icon-add" title="新建" @click="add" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+          <!-- <el-button type="primary" @click="add">
             新建
           </el-button>
           <el-button type="primary" @click="exportExcelBtn">
@@ -336,7 +339,7 @@
           </el-button>
           <el-button v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
         </template>
         <!-- 表格区域 -->
         <normal-table
@@ -386,22 +389,3 @@
     </app-container>
   </div>
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 154px !important;
-}
-
-.normal-date {
-  width: 154px !important;
-}
-
-.normal-select {
-  width: 154px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
-
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 0763c5a..9ef0b93 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -19,7 +19,6 @@
 const effectiveStatusName = ref('')
 const title = ref('')
 const fileList = ref<UploadUserFile[]>([])
-console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -80,10 +79,9 @@
   if (row.title === '新建') {
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
-    ruleForm.publisher = ''
+    ruleForm.publisher = userInfo.$state.deptName
     ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 判断有无存储
-    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
     if (sessionStorage.getItem(fileTypeName.value)) {
       const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
       ruleForm.fileType = session.fileType
@@ -117,6 +115,8 @@
     ruleForm.remark = row.remark
     ruleForm.publishTime = row.publishTime
     ruleForm.minioFileName = row.minioFileName
+    // ruleForm.publisher = '0'
+    // ruleForm.createUserId = '1'
   }
 }
 defineExpose({ initDialog })
@@ -148,6 +148,9 @@
       type: 'warning',
     },
       ).then((res) => {
+        if (ruleForm.publisher === userInfo.$state.deptName) {
+          ruleForm.publisher === userInfo.$state.deptId
+        }
         if (flag == '提交') {
           addApi(ruleForm).then((res) => {
             if (res.code == 200) {
@@ -193,7 +196,6 @@
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        console.log(res.data[0])
         ruleForm.minioFileName = res.data[0]
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
@@ -216,7 +218,6 @@
 // ])
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
-  console.log(diffDat)
   if (diffDat < 0) {
     // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '在使用'
@@ -237,7 +238,7 @@
 
 <template>
   <app-container v-if="dialogVisible" style="overflow: hidden;">
-    <detail-page :title="`${title}${fileTypeName}`">
+    <detail-page :title="`${fileTypeName}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
           提交
@@ -278,12 +279,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="发布单位" prop="publisher">
-              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'" class="fill-input">
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled>
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
               <com-tree-select
                 v-else
-                v-model="ruleForm.publisher" :options="PubListTree" placeholder="选择组织机构"
+                v-model="ruleForm.publisher" :options="PubListTree" placeholder="请选择发布单位"
                 :tree-props="deptProps"
               />
             </el-form-item>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 44e3e4d..b45fbc3 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -324,22 +324,9 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <!-- <el-button type="primary" @click="batchImport">
-            批量导入
-          </el-button> -->
-          <!-- <el-button type="primary" @click="templateDownload">
-            模板下载
-          </el-button> -->
-          <!-- <el-button type="primary" @click="add">
-            新建
-          </el-button> -->
-          <el-button type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-print="printObj" type="primary">
-            打印
-          </el-button>
+          <!-- <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange"> -->
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table

diff --git a/src/components.d.ts b/src/components.d.ts
index 6e85584..815d62f 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -16,14 +16,13 @@
     BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default']
     BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
-    Benchcol: typeof import('./components/benchcol/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/DetailPage/index copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
+    DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
diff --git a/src/components/DetailPage/DetailBlockSwitch.vue b/src/components/DetailPage/DetailBlockSwitch.vue
new file mode 100644
index 0000000..4d92074
--- /dev/null
+++ b/src/components/DetailPage/DetailBlockSwitch.vue
@@ -0,0 +1,71 @@
+<script lang="ts" setup name="DetailBlock">
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+})
+
+const slots = useSlots()
+</script>
+
+<template>
+  <div class="detail-main">
+    <div class="header">
+      <div class="menu">
+        <slot name="menu" />
+      </div>
+      <div class="title">
+        {{ title }}
+      </div>
+      <div class="btns">
+        <slot name="btns" />
+      </div>
+    </div>
+    <div v-if="slots.default" class="content">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-main {
+  background-color: #fff;
+  border-radius: 8px;
+  margin-top: 10px;
+  padding-top: 10px;
+
+  .header {
+    position: relative;
+    height: 40px;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+
+    .title {
+      font-weight: 500;
+    }
+
+    .btns {
+      position: absolute;
+      right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+
+    .menu {
+      position: absolute;
+      left: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+
+  .content {
+    background-color: #fff;
+    padding: 0 10px 20px;
+    margin-top: 10px;
+  }
+}
+</style>
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d6c1c91..1644a80 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -314,6 +314,39 @@
       },
     ],
   },
+  {
+    path: '/borrow',
+    component: Layout,
+    redirect: '/device/borrow/borrowapply',
+    name: 'Borrow',
+    meta: {
+      title: '设备领用',
+      icon: 'ep:key',
+      auth: '/device/borrow',
+    },
+    children: [
+      {
+        path: 'borrowapply',
+        name: 'borroWapply',
+        component: () => import('@/views/device/borrow/borrwoApply.vue'),
+        meta: {
+          title: '设备借用申请',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowapply',
+        },
+      },
+      {
+        path: 'borrowhandle',
+        name: 'borrowHandle',
+        component: () => import('@/views/device/borrow/borrowHandle.vue'),
+        meta: {
+          title: '设备借用处理',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowhandle',
+        },
+      },
+    ],
+  },
 
 ]
 
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
new file mode 100644
index 0000000..1c2405e
--- /dev/null
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="borrowHandle">
+// 逻辑代码
+</script>
+
+<template>
+  <app-container>
+    设备借用处理
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
new file mode 100644
index 0000000..03d414b
--- /dev/null
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="borrowApply">
+// 逻辑代码
+</script>
+
+<template>
+  <app-container>
+    设备借用申请
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index c2682fc..5f7b347 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -339,381 +339,374 @@
 
 <template>
   <div class="body-container">
-    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资产编号" prop="assetNo">
-            <el-input v-model.trim="ruleForm.assetNo" placeholder="系统自动生成" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="资产类型" prop="assetType">
-            <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备编号" prop="equipmentNo">
-            <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备名称" prop="equipmentName">
-            <el-input v-model.trim="ruleForm.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="生产厂家" prop="manufacturer">
-            <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="厂家国别" prop="manufacturerCountry">
-            <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="出厂编号" prop="manufacturingNo">
-            <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="出厂年月" prop="manufacturingDate">
-            <el-date-picker
-              v-model="ruleForm.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '出厂年月'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="型号" prop="modelNo">
-            <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="管理状态" prop="managerState">
-            <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="ABC" prop="abc">
-            <el-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'">
-              <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="标签绑定" prop="labelBind">
-            <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === '详情' ? '' : '标签'" :disabled="title === '详情'" clearable>
-              <template #append>
-                <el-button type="primary" size="small">
-                  扫描
-                </el-button>
-              </template>
-            </el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="立卡年月" prop="cardEstablishmentDate">
-            <el-date-picker
-              v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '立卡年月'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="启用日期" prop="enableDate">
-            <el-date-picker
-              v-model="ruleForm.enableDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '启用日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定方式" prop="mesureType">
-            <el-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'">
-              <el-option v-for="item in mesureTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定周期" prop="mesureCycle">
-            <el-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="12">
-          <el-form-item label="测量范围" prop="mesureRange">
-            <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === '详情' ? '' : '测量范围'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="不确定度" prop="uncertainty">
-            <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === '详情' ? '' : '不确定度'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="使用部门" prop="useDept">
-            <com-tree-select
-              v-if="title !== '详情'"
-              v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-              :tree-props="deptProps"
-            />
-            <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
-              <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="使用人" prop="usePerson">
-            <el-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'">
-              <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="专业分类" prop="majorCategory">
-            <el-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'">
-              <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="检定部门" prop="mesureDept">
-            <com-tree-select
-              v-if="title !== '详情'"
-              v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-              :tree-props="deptProps"
-            />
-            <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
-              <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定日期" prop="mesureDate">
-            <el-date-picker
-              v-model="ruleForm.mesureDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '检定日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="有效日期" prop="validDate">
-            <el-date-picker
-              v-model="ruleForm.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '有效日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定结果" prop="mesureResult">
-            <el-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'">
-              <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="8">
-          <el-form-item label="是否是技术指标需要校准/检定的设备" prop="isCalibrationTestEquipment" label-width="260px">
-            <el-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否是测量工装台账" prop="isMeasureAccount" label-width="260px">
-            <el-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否标准配套设备" prop="isStandardSupportEquipment" label-width="260px">
-            <el-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
+    <detail-block-switch title="基本信息">
+      <template #menu>
+        <slot name="menuswitch" />
+      </template>
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资产编号" prop="assetNo">
+              <el-input v-model.trim="ruleForm.assetNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="资产类型" prop="assetType">
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备编号" prop="equipmentNo">
+              <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="生产厂家" prop="manufacturer">
+              <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="厂家国别" prop="manufacturerCountry">
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号" prop="manufacturingNo">
+              <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂年月" prop="manufacturingDate">
+              <el-date-picker
+                v-model="ruleForm.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '出厂年月'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="型号" prop="modelNo">
+              <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="管理状态" prop="managerState">
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="ABC" prop="abc">
+              <el-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'">
+                <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标签绑定" prop="labelBind">
+              <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === '详情' ? '' : '标签'" :disabled="title === '详情'" clearable>
+                <template #append>
+                  <el-button type="primary" size="small">
+                    扫描
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="立卡年月" prop="cardEstablishmentDate">
+              <el-date-picker
+                v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '立卡年月'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="启用日期" prop="enableDate">
+              <el-date-picker
+                v-model="ruleForm.enableDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '启用日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定方式" prop="mesureType">
+              <el-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'">
+                <el-option v-for="item in mesureTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定周期" prop="mesureCycle">
+              <el-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="测量范围" prop="mesureRange">
+              <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === '详情' ? '' : '测量范围'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="不确定度" prop="uncertainty">
+              <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === '详情' ? '' : '不确定度'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="使用部门" prop="useDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
+                :tree-props="deptProps"
+              />
+              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="使用人" prop="usePerson">
+              <el-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'">
+                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="专业分类" prop="majorCategory">
+              <el-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'">
+                <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="检定部门" prop="mesureDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                :tree-props="deptProps"
+              />
+              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定日期" prop="mesureDate">
+              <el-date-picker
+                v-model="ruleForm.mesureDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '检定日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="有效日期" prop="validDate">
+              <el-date-picker
+                v-model="ruleForm.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '有效日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定结果" prop="mesureResult">
+              <el-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'">
+                <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="8">
+            <el-form-item label="是否是技术指标需要校准/检定的设备" prop="isCalibrationTestEquipment" label-width="260px">
+              <el-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否是测量工装台账" prop="isMeasureAccount" label-width="260px">
+              <el-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否标准配套设备" prop="isStandardSupportEquipment" label-width="260px">
+              <el-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资产来源" prop="assetSource">
-            <el-input v-model.trim="ruleForm.assetSource" :placeholder="title === '详情' ? '' : '资产来源'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备规格" prop="equipmentSpecifications">
-            <el-input v-model.trim="ruleForm.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备类别" prop="equipmentCategory">
-            <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
-              <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备类型" prop="equipmentType">
-            <el-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'">
-              <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资本来源" prop="capitalSource">
-            <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
-              <el-option v-for="item in capitalSourceList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="管理级别" prop="managerLevel">
-            <el-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'">
-              <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="用途" prop="purpose">
-            <el-input v-model.trim="ruleForm.purpose" :placeholder="title === '详情' ? '' : '用途'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="技术水平" prop="technicalLevel">
-            <el-input v-model.trim="ruleForm.technicalLevel" :placeholder="title === '详情' ? '' : '技术水平'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="完好状态" prop="intactState">
-            <el-input v-model.trim="ruleForm.intactState" :placeholder="title === '详情' ? '' : '完好状态'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="外形尺寸" prop="overallDimension">
-            <el-input v-model.trim="ruleForm.overallDimension" :placeholder="title === '详情' ? '' : '外形尺寸'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="重量(吨)" prop="weight">
-            <el-input v-model.trim="ruleForm.weight" :placeholder="title === '详情' ? '' : '重量'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="单价" prop="singlePrice">
-            <el-input v-model.trim="ruleForm.singlePrice" :placeholder="title === '详情' ? '' : '单价'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="安装及杂费" prop="installIncidentalExpenses">
-            <el-input v-model.trim="ruleForm.installIncidentalExpenses" :placeholder="title === '详情' ? '' : '安装及杂费'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="安装地点" prop="installPlace">
-            <el-input v-model.trim="ruleForm.installPlace" :placeholder="title === '详情' ? '' : '安装地点'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="原值" prop="originValue">
-            <el-input v-model.trim="ruleForm.originValue" :placeholder="title === '详情' ? '' : '原值'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="目前原值" prop="presentOriginValue">
-            <el-input v-model.trim="ruleForm.presentOriginValue" :placeholder="title === '详情' ? '' : '目前原值'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="折旧年限" prop="depreciationPeriod">
-            <el-input v-model.trim="ruleForm.depreciationPeriod" :placeholder="title === '详情' ? '' : '折旧年限'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="折旧方法" prop="depreciationMethod">
-            <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
-              <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="属性" prop="attribute">
-            <el-input v-model.trim="ruleForm.attribute" placeholder="属性" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="12">
-          <el-form-item label="说明书" prop="minioFileName">
-            <show-photo :minio-file-name="ruleForm.fileList[0]?.minioFileName || ''" />
-            <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
-            <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
-              {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
-            </el-button>
-            <span v-if="title === '详情' && !ruleForm.fileList[0]?.minioFileName">暂无</span>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="24">
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" placeholder="备注" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资产来源" prop="assetSource">
+              <el-input v-model.trim="ruleForm.assetSource" :placeholder="title === '详情' ? '' : '资产来源'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备规格" prop="equipmentSpecifications">
+              <el-input v-model.trim="ruleForm.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备类别" prop="equipmentCategory">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+                <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备类型" prop="equipmentType">
+              <el-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'">
+                <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资本来源" prop="capitalSource">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+                <el-option v-for="item in capitalSourceList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="管理级别" prop="managerLevel">
+              <el-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'">
+                <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="用途" prop="purpose">
+              <el-input v-model.trim="ruleForm.purpose" :placeholder="title === '详情' ? '' : '用途'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="技术水平" prop="technicalLevel">
+              <el-input v-model.trim="ruleForm.technicalLevel" :placeholder="title === '详情' ? '' : '技术水平'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="完好状态" prop="intactState">
+              <el-input v-model.trim="ruleForm.intactState" :placeholder="title === '详情' ? '' : '完好状态'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="外形尺寸" prop="overallDimension">
+              <el-input v-model.trim="ruleForm.overallDimension" :placeholder="title === '详情' ? '' : '外形尺寸'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="重量(吨)" prop="weight">
+              <el-input v-model.trim="ruleForm.weight" :placeholder="title === '详情' ? '' : '重量'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="单价" prop="singlePrice">
+              <el-input v-model.trim="ruleForm.singlePrice" :placeholder="title === '详情' ? '' : '单价'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="安装及杂费" prop="installIncidentalExpenses">
+              <el-input v-model.trim="ruleForm.installIncidentalExpenses" :placeholder="title === '详情' ? '' : '安装及杂费'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="安装地点" prop="installPlace">
+              <el-input v-model.trim="ruleForm.installPlace" :placeholder="title === '详情' ? '' : '安装地点'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="原值" prop="originValue">
+              <el-input v-model.trim="ruleForm.originValue" :placeholder="title === '详情' ? '' : '原值'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="目前原值" prop="presentOriginValue">
+              <el-input v-model.trim="ruleForm.presentOriginValue" :placeholder="title === '详情' ? '' : '目前原值'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="折旧年限" prop="depreciationPeriod">
+              <el-input v-model.trim="ruleForm.depreciationPeriod" :placeholder="title === '详情' ? '' : '折旧年限'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="折旧方法" prop="depreciationMethod">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+                <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="属性" prop="attribute">
+              <el-input v-model.trim="ruleForm.attribute" placeholder="属性" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="说明书" prop="minioFileName">
+              <show-photo :minio-file-name="ruleForm.fileList[0]?.minioFileName || ''" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
+                {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
+              </el-button>
+              <span v-if="title === '详情' && !ruleForm.fileList[0]?.minioFileName">暂无</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" placeholder="备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block-switch>
   </div>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    padding-top: 20px;
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index f46553a..fc3fd54 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -360,20 +360,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          固定资产-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`固定资产-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -763,44 +758,11 @@
           </el-row>
         </div> -->
       </el-form>
-    </div>
+    </detail-page>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index 0abbdb1..6e88e96 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -74,33 +74,29 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ name }} -{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm">
-            关闭
-          </el-button>
-        </span>
-      </div>
-      <div class="body">
-        <!-- 三级菜单 -->
-        <el-radio-group v-model="current">
-          <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
-            {{ item.name }}
-          </el-radio-button>
-        </el-radio-group>
-      </div>
-      <!-- 展示区域 -->
-      <keep-alive>
-        <component :is="currentComp" ref="currentCompRef" :name="current" :title="title" :row="row" />
-      </keep-alive>
-    </div>
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <!-- 展示区域 -->
+    <keep-alive>
+      <component :is="currentComp" ref="currentCompRef" :name="current" :title="title" :row="row">
+        <template #menuswitch>
+          <!-- 三级菜单 -->
+          <el-radio-group v-model="current">
+            <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+              {{ item.name }}
+            </el-radio-button>
+          </el-radio-group>
+        </template>
+      </component>
+    </keep-alive>
   </app-container>
 </template>
 
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f9cdcd0..f653095 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -256,7 +256,7 @@
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
-  // 原生上传图片
+  // 原生上传
   // console.log(event.target.files)
   // if (event.target.files[0].type === 'application/pdf') {
   if (event.target.files?.length !== 0) {
@@ -354,7 +354,7 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" type="primary" @click="identify">
+          <!-- <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" type="primary" @click="identify">
             标签识别
           </el-button>
           <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/import`)" type="primary" @click="batchImport">
@@ -371,7 +371,13 @@
           </el-button>
           <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/print`)" v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/device/standingBook/components/templateTable.vue b/src/views/device/standingBook/components/templateTable.vue
index 8a928f0..7aa563f 100644
--- a/src/views/device/standingBook/components/templateTable.vue
+++ b/src/views/device/standingBook/components/templateTable.vue
@@ -245,11 +245,11 @@
   <div>
     <!-- 添加证书信息组件 -->
     <add-row ref="addRowRef" @add="addRowData" />
-    <div class="header">
-      <div class="title">
-        <!-- {{ $props.name }} -->
-      </div>
-      <span class="btns">
+    <detail-block-switch :title="name">
+      <template #menu>
+        <slot name="menuswitch" />
+      </template>
+      <template #btns>
         <el-button v-if="title !== '详情'" type="info" @click="removeRow">
           删除行
         </el-button>
@@ -259,55 +259,33 @@
         <el-button v-if="title !== '详情'" type="primary" @click="editRow">
           编辑行
         </el-button>
-      </span>
-    </div>
-    <!-- 表格区域 -->
-    <normal-table
-      id="print"
-      :data="list" :total="total" :columns="columns as any"
-      :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-      :list-loading="loadingTable"
-      style="padding-top: 20px;background-color: #fff;"
-      @change="changePage"
-    >
-      <template #preColumns>
-        <el-table-column label="" width="55" align="center">
-          <template #default="scope">
-            <el-radio v-model="select" :label="scope.$index" class="radio" />
-          </template>
-        </el-table-column>
-        <el-table-column label="序号" width="55" align="center">
-          <template #default="scope">
-            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-          </template>
-        </el-table-column>
       </template>
-    </normal-table>
+      <!-- 表格区域 -->
+      <normal-table
+        id="print"
+        :data="list" :total="total" :columns="columns as any"
+        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+        :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </detail-block-switch>
   </div>
 </template>
 
 <style lang="scss" scoped>
-.header {
-  background-color: #fff;
-  // height: 40px;
-  border-radius: 8px;
-  display: flex;
-  align-items: center;
-  flex-direction: column;
-  justify-content: center;
-  position: relative;
-
-  .title {
-    // font-weight: 700;
-  }
-
-  .btns {
-    position: absolute;
-    right: 40px;
-    top: -22px;
-  }
-}
-
 :deep(.el-radio__label) {
   display: none;
 }
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 7538bc8..78a3800 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -272,24 +272,12 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/identify`)" type="primary" @click="identify">
-            标签识别
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/import`)" type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/mould`)" type="primary" @click="templateDownload">
-            模板下载
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/add`)" type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/export`)" type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/print`)" v-print="printObj" type="primary">
-            打印
-          </el-button>
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/identify`)" icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index fc364c8..e74d70e 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -361,20 +361,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ name }} - {{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -458,73 +453,33 @@
           </el-col>
         </el-row>
       </el-form>
-      <div v-if="title !== '新建' ">
-        <div class="header" style="margin-top: 10px;">
-          <div class="title">
-            审批流程
-          </div>
-        </div>
-        <div class="timeline">
-          <el-timeline>
-            <el-timeline-item timestamp="2018/4/12" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/12 20:46</p>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="2018/4/3" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/3 20:46</p>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="2018/4/2" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/2 20:46</p>
-              </el-card>
-            </el-timeline-item>
-          </el-timeline>
-        </div>
-      </div>
-    </div>
+    </detail-page>
+    <detail-block v-if="title !== '新建' " title="审批流程">
+      <el-timeline>
+        <el-timeline-item timestamp="2018/4/12" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/12 20:46</p>
+          </el-card>
+        </el-timeline-item>
+        <el-timeline-item timestamp="2018/4/3" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/3 20:46</p>
+          </el-card>
+        </el-timeline-item>
+        <el-timeline-item timestamp="2018/4/2" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/2 20:46</p>
+          </el-card>
+        </el-timeline-item>
+      </el-timeline>
+    </detail-block>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .timeline {
   background-color: #fff;
 }
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index aa3963f..737568d 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -1,6 +1,6 @@
 <!-- 状态管理公共列表组件 -->
 <script lang="ts" setup>
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessageBox } from 'element-plus'
 import approve from './approvalActionDialog.vue'
 import addDialog from './templateAdd.vue'
 const props = defineProps({
@@ -142,7 +142,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: any) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     title: '详情',
@@ -150,7 +150,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: any) => {
   dialogVisible.value = true
   // addRef.value.initDialog({
   //   title: '编辑',
@@ -158,7 +158,7 @@
   // })
 }
 // 删除
-const remove = (row) => {
+const remove = (row: any) => {
   ElMessageBox.confirm(
     `确认删除${row.equipmentName}吗？`,
     '提示',
@@ -181,20 +181,20 @@
   // })
 }
 // 同意
-const agree = (row) => {
+const agree = (row: any) => {
   console.log(approveRef.value)
   approveRef.value.initDialog({
     radio: '1',
   })
 }
 // 驳回
-const reject = (row) => {
+const reject = (row: any) => {
   approveRef.value.initDialog({
     radio: '3',
   })
 }
 // 拒绝
-const refuse = (row) => {
+const refuse = (row: any) => {
   approveRef.value.initDialog(
     {
       radio: '2',
@@ -202,7 +202,7 @@
   )
 }
 // 取消
-const cancel = (row) => {
+const cancel = (rowrow: any) => {
   ElMessageBox.confirm(
     '确认取消吗？',
     '提示',
@@ -301,20 +301,20 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+          <el-input placeholder="申请编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="设备编号" clearable class="w-50 m-2" />
+          <el-input placeholder="设备编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.modelNo" placeholder="设备名称" clearable class="w-50 m-2" />
+          <el-input placeholder="设备名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请单位" clearable class="w-50 m-2" />
+          <el-input placeholder="申请单位" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.publisher" placeholder="申请状态" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" />
+          <el-select placeholder="申请状态" clearable>
+            <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" /> -->
           </el-select>
         </search-item>
       </search-area>
@@ -328,7 +328,10 @@
           <el-button type="primary" @click="templateDownload">
             模板下载
           </el-button> -->
-          <el-button type="primary" @click="add">
+          <icon-button icon="icon-add" title="新建" @click="add" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+          <!-- <el-button type="primary" @click="add">
             新建
           </el-button>
           <el-button type="primary" @click="exportExcelBtn">
@@ -336,7 +339,7 @@
           </el-button>
           <el-button v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
         </template>
         <!-- 表格区域 -->
         <normal-table
@@ -386,22 +389,3 @@
     </app-container>
   </div>
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 154px !important;
-}
-
-.normal-date {
-  width: 154px !important;
-}
-
-.normal-select {
-  width: 154px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
-
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 0763c5a..9ef0b93 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -19,7 +19,6 @@
 const effectiveStatusName = ref('')
 const title = ref('')
 const fileList = ref<UploadUserFile[]>([])
-console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -80,10 +79,9 @@
   if (row.title === '新建') {
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
-    ruleForm.publisher = ''
+    ruleForm.publisher = userInfo.$state.deptName
     ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 判断有无存储
-    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
     if (sessionStorage.getItem(fileTypeName.value)) {
       const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
       ruleForm.fileType = session.fileType
@@ -117,6 +115,8 @@
     ruleForm.remark = row.remark
     ruleForm.publishTime = row.publishTime
     ruleForm.minioFileName = row.minioFileName
+    // ruleForm.publisher = '0'
+    // ruleForm.createUserId = '1'
   }
 }
 defineExpose({ initDialog })
@@ -148,6 +148,9 @@
       type: 'warning',
     },
       ).then((res) => {
+        if (ruleForm.publisher === userInfo.$state.deptName) {
+          ruleForm.publisher === userInfo.$state.deptId
+        }
         if (flag == '提交') {
           addApi(ruleForm).then((res) => {
             if (res.code == 200) {
@@ -193,7 +196,6 @@
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        console.log(res.data[0])
         ruleForm.minioFileName = res.data[0]
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
@@ -216,7 +218,6 @@
 // ])
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
-  console.log(diffDat)
   if (diffDat < 0) {
     // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '在使用'
@@ -237,7 +238,7 @@
 
 <template>
   <app-container v-if="dialogVisible" style="overflow: hidden;">
-    <detail-page :title="`${title}${fileTypeName}`">
+    <detail-page :title="`${fileTypeName}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
           提交
@@ -278,12 +279,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="发布单位" prop="publisher">
-              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'" class="fill-input">
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled>
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
               <com-tree-select
                 v-else
-                v-model="ruleForm.publisher" :options="PubListTree" placeholder="选择组织机构"
+                v-model="ruleForm.publisher" :options="PubListTree" placeholder="请选择发布单位"
                 :tree-props="deptProps"
               />
             </el-form-item>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 44e3e4d..b45fbc3 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -324,22 +324,9 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <!-- <el-button type="primary" @click="batchImport">
-            批量导入
-          </el-button> -->
-          <!-- <el-button type="primary" @click="templateDownload">
-            模板下载
-          </el-button> -->
-          <!-- <el-button type="primary" @click="add">
-            新建
-          </el-button> -->
-          <el-button type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-print="printObj" type="primary">
-            打印
-          </el-button>
+          <!-- <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange"> -->
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 4677e48..7d4724b 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -204,13 +204,9 @@
     loading.close()
   })
 }
-// 打印
-const print = () => {
-
-}
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
-  // 原生上传图片
+  // 原生上传
   // console.log(event.target.files)
   // if (event.target.files[0].type === 'application/pdf') {
   if (event.target.files?.length !== 0) {
@@ -264,7 +260,7 @@
         <search-item>
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
-        <search-item>
+        <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
@@ -273,13 +269,13 @@
               :value="item.value"
             />
           </el-select>
-        </search-item>
+        </search-item> -->
         <search-item>
           <el-date-picker
             v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 155px;"
+            style="width: 185px;"
           />
         </search-item>
         <search-item>
@@ -287,19 +283,19 @@
             v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 155px;"
+            style="width: 185px;"
           />
         </search-item>
         <search-item>
-          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select> -->
-          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
+          </el-select>
+          <!-- <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" /> -->
         </search-item>
       </search-area>
       <table-container>
@@ -310,7 +306,7 @@
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
-          <icon-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" @click="print" />
+          <icon-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table

diff --git a/src/components.d.ts b/src/components.d.ts
index 6e85584..815d62f 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -16,14 +16,13 @@
     BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default']
     BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
-    Benchcol: typeof import('./components/benchcol/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/DetailPage/index copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
+    DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
diff --git a/src/components/DetailPage/DetailBlockSwitch.vue b/src/components/DetailPage/DetailBlockSwitch.vue
new file mode 100644
index 0000000..4d92074
--- /dev/null
+++ b/src/components/DetailPage/DetailBlockSwitch.vue
@@ -0,0 +1,71 @@
+<script lang="ts" setup name="DetailBlock">
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+})
+
+const slots = useSlots()
+</script>
+
+<template>
+  <div class="detail-main">
+    <div class="header">
+      <div class="menu">
+        <slot name="menu" />
+      </div>
+      <div class="title">
+        {{ title }}
+      </div>
+      <div class="btns">
+        <slot name="btns" />
+      </div>
+    </div>
+    <div v-if="slots.default" class="content">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-main {
+  background-color: #fff;
+  border-radius: 8px;
+  margin-top: 10px;
+  padding-top: 10px;
+
+  .header {
+    position: relative;
+    height: 40px;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+
+    .title {
+      font-weight: 500;
+    }
+
+    .btns {
+      position: absolute;
+      right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+
+    .menu {
+      position: absolute;
+      left: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+
+  .content {
+    background-color: #fff;
+    padding: 0 10px 20px;
+    margin-top: 10px;
+  }
+}
+</style>
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d6c1c91..1644a80 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -314,6 +314,39 @@
       },
     ],
   },
+  {
+    path: '/borrow',
+    component: Layout,
+    redirect: '/device/borrow/borrowapply',
+    name: 'Borrow',
+    meta: {
+      title: '设备领用',
+      icon: 'ep:key',
+      auth: '/device/borrow',
+    },
+    children: [
+      {
+        path: 'borrowapply',
+        name: 'borroWapply',
+        component: () => import('@/views/device/borrow/borrwoApply.vue'),
+        meta: {
+          title: '设备借用申请',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowapply',
+        },
+      },
+      {
+        path: 'borrowhandle',
+        name: 'borrowHandle',
+        component: () => import('@/views/device/borrow/borrowHandle.vue'),
+        meta: {
+          title: '设备借用处理',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowhandle',
+        },
+      },
+    ],
+  },
 
 ]
 
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
new file mode 100644
index 0000000..1c2405e
--- /dev/null
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="borrowHandle">
+// 逻辑代码
+</script>
+
+<template>
+  <app-container>
+    设备借用处理
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
new file mode 100644
index 0000000..03d414b
--- /dev/null
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="borrowApply">
+// 逻辑代码
+</script>
+
+<template>
+  <app-container>
+    设备借用申请
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index c2682fc..5f7b347 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -339,381 +339,374 @@
 
 <template>
   <div class="body-container">
-    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资产编号" prop="assetNo">
-            <el-input v-model.trim="ruleForm.assetNo" placeholder="系统自动生成" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="资产类型" prop="assetType">
-            <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备编号" prop="equipmentNo">
-            <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备名称" prop="equipmentName">
-            <el-input v-model.trim="ruleForm.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="生产厂家" prop="manufacturer">
-            <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="厂家国别" prop="manufacturerCountry">
-            <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="出厂编号" prop="manufacturingNo">
-            <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="出厂年月" prop="manufacturingDate">
-            <el-date-picker
-              v-model="ruleForm.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '出厂年月'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="型号" prop="modelNo">
-            <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="管理状态" prop="managerState">
-            <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="ABC" prop="abc">
-            <el-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'">
-              <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="标签绑定" prop="labelBind">
-            <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === '详情' ? '' : '标签'" :disabled="title === '详情'" clearable>
-              <template #append>
-                <el-button type="primary" size="small">
-                  扫描
-                </el-button>
-              </template>
-            </el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="立卡年月" prop="cardEstablishmentDate">
-            <el-date-picker
-              v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '立卡年月'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="启用日期" prop="enableDate">
-            <el-date-picker
-              v-model="ruleForm.enableDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '启用日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定方式" prop="mesureType">
-            <el-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'">
-              <el-option v-for="item in mesureTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定周期" prop="mesureCycle">
-            <el-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="12">
-          <el-form-item label="测量范围" prop="mesureRange">
-            <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === '详情' ? '' : '测量范围'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="不确定度" prop="uncertainty">
-            <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === '详情' ? '' : '不确定度'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="使用部门" prop="useDept">
-            <com-tree-select
-              v-if="title !== '详情'"
-              v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-              :tree-props="deptProps"
-            />
-            <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
-              <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="使用人" prop="usePerson">
-            <el-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'">
-              <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="专业分类" prop="majorCategory">
-            <el-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'">
-              <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="检定部门" prop="mesureDept">
-            <com-tree-select
-              v-if="title !== '详情'"
-              v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-              :tree-props="deptProps"
-            />
-            <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
-              <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定日期" prop="mesureDate">
-            <el-date-picker
-              v-model="ruleForm.mesureDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '检定日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="有效日期" prop="validDate">
-            <el-date-picker
-              v-model="ruleForm.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '有效日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定结果" prop="mesureResult">
-            <el-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'">
-              <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="8">
-          <el-form-item label="是否是技术指标需要校准/检定的设备" prop="isCalibrationTestEquipment" label-width="260px">
-            <el-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否是测量工装台账" prop="isMeasureAccount" label-width="260px">
-            <el-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否标准配套设备" prop="isStandardSupportEquipment" label-width="260px">
-            <el-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
+    <detail-block-switch title="基本信息">
+      <template #menu>
+        <slot name="menuswitch" />
+      </template>
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资产编号" prop="assetNo">
+              <el-input v-model.trim="ruleForm.assetNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="资产类型" prop="assetType">
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备编号" prop="equipmentNo">
+              <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="生产厂家" prop="manufacturer">
+              <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="厂家国别" prop="manufacturerCountry">
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号" prop="manufacturingNo">
+              <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂年月" prop="manufacturingDate">
+              <el-date-picker
+                v-model="ruleForm.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '出厂年月'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="型号" prop="modelNo">
+              <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="管理状态" prop="managerState">
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="ABC" prop="abc">
+              <el-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'">
+                <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标签绑定" prop="labelBind">
+              <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === '详情' ? '' : '标签'" :disabled="title === '详情'" clearable>
+                <template #append>
+                  <el-button type="primary" size="small">
+                    扫描
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="立卡年月" prop="cardEstablishmentDate">
+              <el-date-picker
+                v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '立卡年月'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="启用日期" prop="enableDate">
+              <el-date-picker
+                v-model="ruleForm.enableDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '启用日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定方式" prop="mesureType">
+              <el-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'">
+                <el-option v-for="item in mesureTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定周期" prop="mesureCycle">
+              <el-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="测量范围" prop="mesureRange">
+              <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === '详情' ? '' : '测量范围'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="不确定度" prop="uncertainty">
+              <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === '详情' ? '' : '不确定度'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="使用部门" prop="useDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
+                :tree-props="deptProps"
+              />
+              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="使用人" prop="usePerson">
+              <el-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'">
+                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="专业分类" prop="majorCategory">
+              <el-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'">
+                <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="检定部门" prop="mesureDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                :tree-props="deptProps"
+              />
+              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定日期" prop="mesureDate">
+              <el-date-picker
+                v-model="ruleForm.mesureDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '检定日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="有效日期" prop="validDate">
+              <el-date-picker
+                v-model="ruleForm.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '有效日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定结果" prop="mesureResult">
+              <el-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'">
+                <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="8">
+            <el-form-item label="是否是技术指标需要校准/检定的设备" prop="isCalibrationTestEquipment" label-width="260px">
+              <el-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否是测量工装台账" prop="isMeasureAccount" label-width="260px">
+              <el-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否标准配套设备" prop="isStandardSupportEquipment" label-width="260px">
+              <el-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资产来源" prop="assetSource">
-            <el-input v-model.trim="ruleForm.assetSource" :placeholder="title === '详情' ? '' : '资产来源'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备规格" prop="equipmentSpecifications">
-            <el-input v-model.trim="ruleForm.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备类别" prop="equipmentCategory">
-            <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
-              <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备类型" prop="equipmentType">
-            <el-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'">
-              <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资本来源" prop="capitalSource">
-            <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
-              <el-option v-for="item in capitalSourceList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="管理级别" prop="managerLevel">
-            <el-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'">
-              <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="用途" prop="purpose">
-            <el-input v-model.trim="ruleForm.purpose" :placeholder="title === '详情' ? '' : '用途'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="技术水平" prop="technicalLevel">
-            <el-input v-model.trim="ruleForm.technicalLevel" :placeholder="title === '详情' ? '' : '技术水平'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="完好状态" prop="intactState">
-            <el-input v-model.trim="ruleForm.intactState" :placeholder="title === '详情' ? '' : '完好状态'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="外形尺寸" prop="overallDimension">
-            <el-input v-model.trim="ruleForm.overallDimension" :placeholder="title === '详情' ? '' : '外形尺寸'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="重量(吨)" prop="weight">
-            <el-input v-model.trim="ruleForm.weight" :placeholder="title === '详情' ? '' : '重量'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="单价" prop="singlePrice">
-            <el-input v-model.trim="ruleForm.singlePrice" :placeholder="title === '详情' ? '' : '单价'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="安装及杂费" prop="installIncidentalExpenses">
-            <el-input v-model.trim="ruleForm.installIncidentalExpenses" :placeholder="title === '详情' ? '' : '安装及杂费'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="安装地点" prop="installPlace">
-            <el-input v-model.trim="ruleForm.installPlace" :placeholder="title === '详情' ? '' : '安装地点'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="原值" prop="originValue">
-            <el-input v-model.trim="ruleForm.originValue" :placeholder="title === '详情' ? '' : '原值'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="目前原值" prop="presentOriginValue">
-            <el-input v-model.trim="ruleForm.presentOriginValue" :placeholder="title === '详情' ? '' : '目前原值'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="折旧年限" prop="depreciationPeriod">
-            <el-input v-model.trim="ruleForm.depreciationPeriod" :placeholder="title === '详情' ? '' : '折旧年限'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="折旧方法" prop="depreciationMethod">
-            <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
-              <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="属性" prop="attribute">
-            <el-input v-model.trim="ruleForm.attribute" placeholder="属性" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="12">
-          <el-form-item label="说明书" prop="minioFileName">
-            <show-photo :minio-file-name="ruleForm.fileList[0]?.minioFileName || ''" />
-            <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
-            <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
-              {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
-            </el-button>
-            <span v-if="title === '详情' && !ruleForm.fileList[0]?.minioFileName">暂无</span>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="24">
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" placeholder="备注" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资产来源" prop="assetSource">
+              <el-input v-model.trim="ruleForm.assetSource" :placeholder="title === '详情' ? '' : '资产来源'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备规格" prop="equipmentSpecifications">
+              <el-input v-model.trim="ruleForm.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备类别" prop="equipmentCategory">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+                <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备类型" prop="equipmentType">
+              <el-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'">
+                <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资本来源" prop="capitalSource">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+                <el-option v-for="item in capitalSourceList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="管理级别" prop="managerLevel">
+              <el-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'">
+                <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="用途" prop="purpose">
+              <el-input v-model.trim="ruleForm.purpose" :placeholder="title === '详情' ? '' : '用途'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="技术水平" prop="technicalLevel">
+              <el-input v-model.trim="ruleForm.technicalLevel" :placeholder="title === '详情' ? '' : '技术水平'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="完好状态" prop="intactState">
+              <el-input v-model.trim="ruleForm.intactState" :placeholder="title === '详情' ? '' : '完好状态'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="外形尺寸" prop="overallDimension">
+              <el-input v-model.trim="ruleForm.overallDimension" :placeholder="title === '详情' ? '' : '外形尺寸'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="重量(吨)" prop="weight">
+              <el-input v-model.trim="ruleForm.weight" :placeholder="title === '详情' ? '' : '重量'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="单价" prop="singlePrice">
+              <el-input v-model.trim="ruleForm.singlePrice" :placeholder="title === '详情' ? '' : '单价'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="安装及杂费" prop="installIncidentalExpenses">
+              <el-input v-model.trim="ruleForm.installIncidentalExpenses" :placeholder="title === '详情' ? '' : '安装及杂费'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="安装地点" prop="installPlace">
+              <el-input v-model.trim="ruleForm.installPlace" :placeholder="title === '详情' ? '' : '安装地点'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="原值" prop="originValue">
+              <el-input v-model.trim="ruleForm.originValue" :placeholder="title === '详情' ? '' : '原值'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="目前原值" prop="presentOriginValue">
+              <el-input v-model.trim="ruleForm.presentOriginValue" :placeholder="title === '详情' ? '' : '目前原值'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="折旧年限" prop="depreciationPeriod">
+              <el-input v-model.trim="ruleForm.depreciationPeriod" :placeholder="title === '详情' ? '' : '折旧年限'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="折旧方法" prop="depreciationMethod">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+                <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="属性" prop="attribute">
+              <el-input v-model.trim="ruleForm.attribute" placeholder="属性" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="说明书" prop="minioFileName">
+              <show-photo :minio-file-name="ruleForm.fileList[0]?.minioFileName || ''" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
+                {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
+              </el-button>
+              <span v-if="title === '详情' && !ruleForm.fileList[0]?.minioFileName">暂无</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" placeholder="备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block-switch>
   </div>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    padding-top: 20px;
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index f46553a..fc3fd54 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -360,20 +360,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          固定资产-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`固定资产-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -763,44 +758,11 @@
           </el-row>
         </div> -->
       </el-form>
-    </div>
+    </detail-page>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index 0abbdb1..6e88e96 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -74,33 +74,29 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ name }} -{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm">
-            关闭
-          </el-button>
-        </span>
-      </div>
-      <div class="body">
-        <!-- 三级菜单 -->
-        <el-radio-group v-model="current">
-          <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
-            {{ item.name }}
-          </el-radio-button>
-        </el-radio-group>
-      </div>
-      <!-- 展示区域 -->
-      <keep-alive>
-        <component :is="currentComp" ref="currentCompRef" :name="current" :title="title" :row="row" />
-      </keep-alive>
-    </div>
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <!-- 展示区域 -->
+    <keep-alive>
+      <component :is="currentComp" ref="currentCompRef" :name="current" :title="title" :row="row">
+        <template #menuswitch>
+          <!-- 三级菜单 -->
+          <el-radio-group v-model="current">
+            <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+              {{ item.name }}
+            </el-radio-button>
+          </el-radio-group>
+        </template>
+      </component>
+    </keep-alive>
   </app-container>
 </template>
 
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f9cdcd0..f653095 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -256,7 +256,7 @@
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
-  // 原生上传图片
+  // 原生上传
   // console.log(event.target.files)
   // if (event.target.files[0].type === 'application/pdf') {
   if (event.target.files?.length !== 0) {
@@ -354,7 +354,7 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" type="primary" @click="identify">
+          <!-- <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" type="primary" @click="identify">
             标签识别
           </el-button>
           <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/import`)" type="primary" @click="batchImport">
@@ -371,7 +371,13 @@
           </el-button>
           <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/print`)" v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/device/standingBook/components/templateTable.vue b/src/views/device/standingBook/components/templateTable.vue
index 8a928f0..7aa563f 100644
--- a/src/views/device/standingBook/components/templateTable.vue
+++ b/src/views/device/standingBook/components/templateTable.vue
@@ -245,11 +245,11 @@
   <div>
     <!-- 添加证书信息组件 -->
     <add-row ref="addRowRef" @add="addRowData" />
-    <div class="header">
-      <div class="title">
-        <!-- {{ $props.name }} -->
-      </div>
-      <span class="btns">
+    <detail-block-switch :title="name">
+      <template #menu>
+        <slot name="menuswitch" />
+      </template>
+      <template #btns>
         <el-button v-if="title !== '详情'" type="info" @click="removeRow">
           删除行
         </el-button>
@@ -259,55 +259,33 @@
         <el-button v-if="title !== '详情'" type="primary" @click="editRow">
           编辑行
         </el-button>
-      </span>
-    </div>
-    <!-- 表格区域 -->
-    <normal-table
-      id="print"
-      :data="list" :total="total" :columns="columns as any"
-      :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-      :list-loading="loadingTable"
-      style="padding-top: 20px;background-color: #fff;"
-      @change="changePage"
-    >
-      <template #preColumns>
-        <el-table-column label="" width="55" align="center">
-          <template #default="scope">
-            <el-radio v-model="select" :label="scope.$index" class="radio" />
-          </template>
-        </el-table-column>
-        <el-table-column label="序号" width="55" align="center">
-          <template #default="scope">
-            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-          </template>
-        </el-table-column>
       </template>
-    </normal-table>
+      <!-- 表格区域 -->
+      <normal-table
+        id="print"
+        :data="list" :total="total" :columns="columns as any"
+        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+        :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </detail-block-switch>
   </div>
 </template>
 
 <style lang="scss" scoped>
-.header {
-  background-color: #fff;
-  // height: 40px;
-  border-radius: 8px;
-  display: flex;
-  align-items: center;
-  flex-direction: column;
-  justify-content: center;
-  position: relative;
-
-  .title {
-    // font-weight: 700;
-  }
-
-  .btns {
-    position: absolute;
-    right: 40px;
-    top: -22px;
-  }
-}
-
 :deep(.el-radio__label) {
   display: none;
 }
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 7538bc8..78a3800 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -272,24 +272,12 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/identify`)" type="primary" @click="identify">
-            标签识别
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/import`)" type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/mould`)" type="primary" @click="templateDownload">
-            模板下载
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/add`)" type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/export`)" type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/print`)" v-print="printObj" type="primary">
-            打印
-          </el-button>
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/identify`)" icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index fc364c8..e74d70e 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -361,20 +361,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ name }} - {{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -458,73 +453,33 @@
           </el-col>
         </el-row>
       </el-form>
-      <div v-if="title !== '新建' ">
-        <div class="header" style="margin-top: 10px;">
-          <div class="title">
-            审批流程
-          </div>
-        </div>
-        <div class="timeline">
-          <el-timeline>
-            <el-timeline-item timestamp="2018/4/12" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/12 20:46</p>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="2018/4/3" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/3 20:46</p>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="2018/4/2" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/2 20:46</p>
-              </el-card>
-            </el-timeline-item>
-          </el-timeline>
-        </div>
-      </div>
-    </div>
+    </detail-page>
+    <detail-block v-if="title !== '新建' " title="审批流程">
+      <el-timeline>
+        <el-timeline-item timestamp="2018/4/12" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/12 20:46</p>
+          </el-card>
+        </el-timeline-item>
+        <el-timeline-item timestamp="2018/4/3" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/3 20:46</p>
+          </el-card>
+        </el-timeline-item>
+        <el-timeline-item timestamp="2018/4/2" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/2 20:46</p>
+          </el-card>
+        </el-timeline-item>
+      </el-timeline>
+    </detail-block>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .timeline {
   background-color: #fff;
 }
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index aa3963f..737568d 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -1,6 +1,6 @@
 <!-- 状态管理公共列表组件 -->
 <script lang="ts" setup>
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessageBox } from 'element-plus'
 import approve from './approvalActionDialog.vue'
 import addDialog from './templateAdd.vue'
 const props = defineProps({
@@ -142,7 +142,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: any) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     title: '详情',
@@ -150,7 +150,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: any) => {
   dialogVisible.value = true
   // addRef.value.initDialog({
   //   title: '编辑',
@@ -158,7 +158,7 @@
   // })
 }
 // 删除
-const remove = (row) => {
+const remove = (row: any) => {
   ElMessageBox.confirm(
     `确认删除${row.equipmentName}吗？`,
     '提示',
@@ -181,20 +181,20 @@
   // })
 }
 // 同意
-const agree = (row) => {
+const agree = (row: any) => {
   console.log(approveRef.value)
   approveRef.value.initDialog({
     radio: '1',
   })
 }
 // 驳回
-const reject = (row) => {
+const reject = (row: any) => {
   approveRef.value.initDialog({
     radio: '3',
   })
 }
 // 拒绝
-const refuse = (row) => {
+const refuse = (row: any) => {
   approveRef.value.initDialog(
     {
       radio: '2',
@@ -202,7 +202,7 @@
   )
 }
 // 取消
-const cancel = (row) => {
+const cancel = (rowrow: any) => {
   ElMessageBox.confirm(
     '确认取消吗？',
     '提示',
@@ -301,20 +301,20 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+          <el-input placeholder="申请编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="设备编号" clearable class="w-50 m-2" />
+          <el-input placeholder="设备编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.modelNo" placeholder="设备名称" clearable class="w-50 m-2" />
+          <el-input placeholder="设备名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请单位" clearable class="w-50 m-2" />
+          <el-input placeholder="申请单位" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.publisher" placeholder="申请状态" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" />
+          <el-select placeholder="申请状态" clearable>
+            <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" /> -->
           </el-select>
         </search-item>
       </search-area>
@@ -328,7 +328,10 @@
           <el-button type="primary" @click="templateDownload">
             模板下载
           </el-button> -->
-          <el-button type="primary" @click="add">
+          <icon-button icon="icon-add" title="新建" @click="add" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+          <!-- <el-button type="primary" @click="add">
             新建
           </el-button>
           <el-button type="primary" @click="exportExcelBtn">
@@ -336,7 +339,7 @@
           </el-button>
           <el-button v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
         </template>
         <!-- 表格区域 -->
         <normal-table
@@ -386,22 +389,3 @@
     </app-container>
   </div>
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 154px !important;
-}
-
-.normal-date {
-  width: 154px !important;
-}
-
-.normal-select {
-  width: 154px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
-
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 0763c5a..9ef0b93 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -19,7 +19,6 @@
 const effectiveStatusName = ref('')
 const title = ref('')
 const fileList = ref<UploadUserFile[]>([])
-console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -80,10 +79,9 @@
   if (row.title === '新建') {
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
-    ruleForm.publisher = ''
+    ruleForm.publisher = userInfo.$state.deptName
     ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 判断有无存储
-    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
     if (sessionStorage.getItem(fileTypeName.value)) {
       const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
       ruleForm.fileType = session.fileType
@@ -117,6 +115,8 @@
     ruleForm.remark = row.remark
     ruleForm.publishTime = row.publishTime
     ruleForm.minioFileName = row.minioFileName
+    // ruleForm.publisher = '0'
+    // ruleForm.createUserId = '1'
   }
 }
 defineExpose({ initDialog })
@@ -148,6 +148,9 @@
       type: 'warning',
     },
       ).then((res) => {
+        if (ruleForm.publisher === userInfo.$state.deptName) {
+          ruleForm.publisher === userInfo.$state.deptId
+        }
         if (flag == '提交') {
           addApi(ruleForm).then((res) => {
             if (res.code == 200) {
@@ -193,7 +196,6 @@
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        console.log(res.data[0])
         ruleForm.minioFileName = res.data[0]
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
@@ -216,7 +218,6 @@
 // ])
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
-  console.log(diffDat)
   if (diffDat < 0) {
     // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '在使用'
@@ -237,7 +238,7 @@
 
 <template>
   <app-container v-if="dialogVisible" style="overflow: hidden;">
-    <detail-page :title="`${title}${fileTypeName}`">
+    <detail-page :title="`${fileTypeName}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
           提交
@@ -278,12 +279,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="发布单位" prop="publisher">
-              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'" class="fill-input">
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled>
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
               <com-tree-select
                 v-else
-                v-model="ruleForm.publisher" :options="PubListTree" placeholder="选择组织机构"
+                v-model="ruleForm.publisher" :options="PubListTree" placeholder="请选择发布单位"
                 :tree-props="deptProps"
               />
             </el-form-item>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 44e3e4d..b45fbc3 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -324,22 +324,9 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <!-- <el-button type="primary" @click="batchImport">
-            批量导入
-          </el-button> -->
-          <!-- <el-button type="primary" @click="templateDownload">
-            模板下载
-          </el-button> -->
-          <!-- <el-button type="primary" @click="add">
-            新建
-          </el-button> -->
-          <el-button type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-print="printObj" type="primary">
-            打印
-          </el-button>
+          <!-- <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange"> -->
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 4677e48..7d4724b 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -204,13 +204,9 @@
     loading.close()
   })
 }
-// 打印
-const print = () => {
-
-}
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
-  // 原生上传图片
+  // 原生上传
   // console.log(event.target.files)
   // if (event.target.files[0].type === 'application/pdf') {
   if (event.target.files?.length !== 0) {
@@ -264,7 +260,7 @@
         <search-item>
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
-        <search-item>
+        <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
@@ -273,13 +269,13 @@
               :value="item.value"
             />
           </el-select>
-        </search-item>
+        </search-item> -->
         <search-item>
           <el-date-picker
             v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 155px;"
+            style="width: 185px;"
           />
         </search-item>
         <search-item>
@@ -287,19 +283,19 @@
             v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 155px;"
+            style="width: 185px;"
           />
         </search-item>
         <search-item>
-          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select> -->
-          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
+          </el-select>
+          <!-- <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" /> -->
         </search-item>
       </search-area>
       <table-container>
@@ -310,7 +306,7 @@
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
-          <icon-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" @click="print" />
+          <icon-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index cf0dd4f..5ca3275 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -3,11 +3,11 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { detailType } from '../measureDept-interface'
-import { getUserList } from '@/api/system/user'
+// import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
+import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import type { userType } from '@/views/system/user/user-interface'
 import { listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
-import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
 const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -31,11 +31,20 @@
   technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
+// 获取计量人员列表
 const getuser = () => {
-  getUserList({ offset: 1, limit: 99999 }).then((res) => {
-    userList.value = res.data.rows
+  getStaffList({
+    staffNo: '', // 人员编号
+    name: '', // 姓名
+    deptId: ruleForm.value.deptId, // 所在部门
+    limit: 999999,
+    offset: 1,
+  }).then((res) => {
+    if (res.code === 200) {
+      userList.value = res.data.records
+    }
   })
-} // 获取用户列表
+}
 const technologyJobList = ref<{ id: string;name: string;value: string }[]>([])
 // 获取技术职务列表
 const getTechnologyJobList = () => {
@@ -50,7 +59,16 @@
     administrationJobList.value = response.data
   })
 }
-
+// 选择负责人自动填充职务信息
+const directorChange = (val: string) => {
+  const selectUser = userList.value.filter(item => item.name === val)[0]
+  getStaffDetail(selectUser).then((res) => {
+    if (res.code === 200) {
+      ruleForm.value.administrationJob = res.data.administrationJob
+      ruleForm.value.technologyJob = res.data.technologyJob
+    }
+  })
+}
 // 提交
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
@@ -95,12 +113,6 @@
 const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
-// const searchQuery = ref({
-//   limit: 10,
-//   offset: 1,
-//   total: 0,
-//   pageSizes: [10, 20, 30],
-// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -410,20 +422,6 @@
     }
   })
 }
-// const handleSizeChange = (val: number) => {
-//   searchQuery.value.limit = val
-//   getDepartmentList()
-//   getuserInfoList()
-//   getInstrumentInfo()
-//   getDeviceInfo()
-// }
-// const handleCurrentChange = (val: number) => {
-//   searchQuery.value.offset = val
-//   getDepartmentList()
-//   getuserInfoList()
-//   getInstrumentInfo()
-//   getDeviceInfo()
-// }
 // 弹窗初始化
 const initDialog = (row: any) => {
   reset()
@@ -460,22 +458,17 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title.split('-')[2] === '编辑'" type="primary" @click="submitForm(ruleFormRef)">
-            提交
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="title">
+      <template #btns>
+        <el-button v-if="title.split('-')[2] === '编辑'" type="primary" @click="submitForm(ruleFormRef)">
+          提交
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title.split('-')[2] === '详情' ? 'isDetail' : '']">
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item :label=" `${title.split('-')[1]}编号`" prop="organizeNo">
               <el-input v-model.trim="ruleForm.organizeNo" placeholder="系统自动生成" disabled />
@@ -487,7 +480,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="title.split('-')[1] === '工程组'" :gutter="24" class="marg">
+        <el-row v-if="title.split('-')[1] === '工程组'" :gutter="24">
           <el-col :span="6">
             <el-form-item label="科室编号">
               <el-input v-model.trim="ruleForm.pDeptId" disabled />
@@ -509,10 +502,10 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
-              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" @change="directorChange">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.name" />
               </el-select>
             </el-form-item>
@@ -532,7 +525,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="24">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
               <el-input v-model.trim="ruleForm.remark" :placeholder="title.split('-')[2] === '详情' ? '' : '备注'" :disabled="title.split('-')[2] === '详情'" />
@@ -540,85 +533,24 @@
           </el-col>
         </el-row>
       </el-form>
-      <!-- 科室信息-人员信息等列表切换 -->
-      <div>
-        <div class="header" style="margin-top: 10px;">
-          <!-- 切换 -->
-          <el-radio-group v-model="current" class="change-btn">
-            <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
-              {{ item.name }}
-            </el-radio-button>
-          </el-radio-group>
-          <div class="title">
-            {{ current }}
-          </div>
-          <span class="btns">
-          <!-- <el-button type="info" :disabled="title === '详情'" @click="removeRow">
-            删除行
-          </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
-            添加行
-          </el-button> -->
-          </span>
-        </div>
-        <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <el-table-column type="index" label="序号" width="55" align="center" />
-          <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
-        </el-table>
-        <!-- <div style="width: 100%;margin-top: 10px;">
-          <el-pagination
-            :current-page="searchQuery.offset"
-            :page-sizes="searchQuery.pageSizes"
-            :page-size="searchQuery.limit"
-            :total="searchQuery.total"
-            layout="total, sizes, prev, pager, next"
-            hide-on-single-page
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-          />
-        </div> -->
-      </div>
-    </div>
+    </detail-page>
+    <detail-block-switch :title="current">
+      <template #menu>
+        <el-radio-group v-model="current" class="change-btn">
+          <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
+            {{ item.name }}
+          </el-radio-button>
+        </el-radio-group>
+      </template>
+      <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
+        <el-table-column type="index" label="序号" width="55" align="center" />
+        <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </detail-block-switch>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-    position: relative;
-
-    .change-btn {
-      position: absolute;
-      left: 40px;
-      top: 4px;
-    }
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 4px;
-    }
-  }
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
@@ -628,8 +560,4 @@
     }
   }
 }
-
-.marg {
-  margin-top: 10px;
-}
 </style>

diff --git a/src/components.d.ts b/src/components.d.ts
index 6e85584..815d62f 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -16,14 +16,13 @@
     BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default']
     BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
-    Benchcol: typeof import('./components/benchcol/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/DetailPage/index copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
+    DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
diff --git a/src/components/DetailPage/DetailBlockSwitch.vue b/src/components/DetailPage/DetailBlockSwitch.vue
new file mode 100644
index 0000000..4d92074
--- /dev/null
+++ b/src/components/DetailPage/DetailBlockSwitch.vue
@@ -0,0 +1,71 @@
+<script lang="ts" setup name="DetailBlock">
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+})
+
+const slots = useSlots()
+</script>
+
+<template>
+  <div class="detail-main">
+    <div class="header">
+      <div class="menu">
+        <slot name="menu" />
+      </div>
+      <div class="title">
+        {{ title }}
+      </div>
+      <div class="btns">
+        <slot name="btns" />
+      </div>
+    </div>
+    <div v-if="slots.default" class="content">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-main {
+  background-color: #fff;
+  border-radius: 8px;
+  margin-top: 10px;
+  padding-top: 10px;
+
+  .header {
+    position: relative;
+    height: 40px;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+
+    .title {
+      font-weight: 500;
+    }
+
+    .btns {
+      position: absolute;
+      right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+
+    .menu {
+      position: absolute;
+      left: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+
+  .content {
+    background-color: #fff;
+    padding: 0 10px 20px;
+    margin-top: 10px;
+  }
+}
+</style>
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d6c1c91..1644a80 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -314,6 +314,39 @@
       },
     ],
   },
+  {
+    path: '/borrow',
+    component: Layout,
+    redirect: '/device/borrow/borrowapply',
+    name: 'Borrow',
+    meta: {
+      title: '设备领用',
+      icon: 'ep:key',
+      auth: '/device/borrow',
+    },
+    children: [
+      {
+        path: 'borrowapply',
+        name: 'borroWapply',
+        component: () => import('@/views/device/borrow/borrwoApply.vue'),
+        meta: {
+          title: '设备借用申请',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowapply',
+        },
+      },
+      {
+        path: 'borrowhandle',
+        name: 'borrowHandle',
+        component: () => import('@/views/device/borrow/borrowHandle.vue'),
+        meta: {
+          title: '设备借用处理',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowhandle',
+        },
+      },
+    ],
+  },
 
 ]
 
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
new file mode 100644
index 0000000..1c2405e
--- /dev/null
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="borrowHandle">
+// 逻辑代码
+</script>
+
+<template>
+  <app-container>
+    设备借用处理
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
new file mode 100644
index 0000000..03d414b
--- /dev/null
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="borrowApply">
+// 逻辑代码
+</script>
+
+<template>
+  <app-container>
+    设备借用申请
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index c2682fc..5f7b347 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -339,381 +339,374 @@
 
 <template>
   <div class="body-container">
-    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资产编号" prop="assetNo">
-            <el-input v-model.trim="ruleForm.assetNo" placeholder="系统自动生成" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="资产类型" prop="assetType">
-            <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备编号" prop="equipmentNo">
-            <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备名称" prop="equipmentName">
-            <el-input v-model.trim="ruleForm.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="生产厂家" prop="manufacturer">
-            <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="厂家国别" prop="manufacturerCountry">
-            <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="出厂编号" prop="manufacturingNo">
-            <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="出厂年月" prop="manufacturingDate">
-            <el-date-picker
-              v-model="ruleForm.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '出厂年月'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="型号" prop="modelNo">
-            <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="管理状态" prop="managerState">
-            <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="ABC" prop="abc">
-            <el-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'">
-              <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="标签绑定" prop="labelBind">
-            <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === '详情' ? '' : '标签'" :disabled="title === '详情'" clearable>
-              <template #append>
-                <el-button type="primary" size="small">
-                  扫描
-                </el-button>
-              </template>
-            </el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="立卡年月" prop="cardEstablishmentDate">
-            <el-date-picker
-              v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '立卡年月'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="启用日期" prop="enableDate">
-            <el-date-picker
-              v-model="ruleForm.enableDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '启用日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定方式" prop="mesureType">
-            <el-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'">
-              <el-option v-for="item in mesureTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定周期" prop="mesureCycle">
-            <el-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="12">
-          <el-form-item label="测量范围" prop="mesureRange">
-            <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === '详情' ? '' : '测量范围'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="不确定度" prop="uncertainty">
-            <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === '详情' ? '' : '不确定度'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="使用部门" prop="useDept">
-            <com-tree-select
-              v-if="title !== '详情'"
-              v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-              :tree-props="deptProps"
-            />
-            <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
-              <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="使用人" prop="usePerson">
-            <el-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'">
-              <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="专业分类" prop="majorCategory">
-            <el-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'">
-              <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="检定部门" prop="mesureDept">
-            <com-tree-select
-              v-if="title !== '详情'"
-              v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-              :tree-props="deptProps"
-            />
-            <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
-              <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定日期" prop="mesureDate">
-            <el-date-picker
-              v-model="ruleForm.mesureDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '检定日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="有效日期" prop="validDate">
-            <el-date-picker
-              v-model="ruleForm.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '有效日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定结果" prop="mesureResult">
-            <el-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'">
-              <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="8">
-          <el-form-item label="是否是技术指标需要校准/检定的设备" prop="isCalibrationTestEquipment" label-width="260px">
-            <el-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否是测量工装台账" prop="isMeasureAccount" label-width="260px">
-            <el-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否标准配套设备" prop="isStandardSupportEquipment" label-width="260px">
-            <el-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
+    <detail-block-switch title="基本信息">
+      <template #menu>
+        <slot name="menuswitch" />
+      </template>
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资产编号" prop="assetNo">
+              <el-input v-model.trim="ruleForm.assetNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="资产类型" prop="assetType">
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备编号" prop="equipmentNo">
+              <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="生产厂家" prop="manufacturer">
+              <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="厂家国别" prop="manufacturerCountry">
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号" prop="manufacturingNo">
+              <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂年月" prop="manufacturingDate">
+              <el-date-picker
+                v-model="ruleForm.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '出厂年月'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="型号" prop="modelNo">
+              <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="管理状态" prop="managerState">
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="ABC" prop="abc">
+              <el-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'">
+                <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标签绑定" prop="labelBind">
+              <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === '详情' ? '' : '标签'" :disabled="title === '详情'" clearable>
+                <template #append>
+                  <el-button type="primary" size="small">
+                    扫描
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="立卡年月" prop="cardEstablishmentDate">
+              <el-date-picker
+                v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '立卡年月'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="启用日期" prop="enableDate">
+              <el-date-picker
+                v-model="ruleForm.enableDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '启用日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定方式" prop="mesureType">
+              <el-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'">
+                <el-option v-for="item in mesureTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定周期" prop="mesureCycle">
+              <el-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="测量范围" prop="mesureRange">
+              <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === '详情' ? '' : '测量范围'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="不确定度" prop="uncertainty">
+              <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === '详情' ? '' : '不确定度'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="使用部门" prop="useDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
+                :tree-props="deptProps"
+              />
+              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="使用人" prop="usePerson">
+              <el-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'">
+                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="专业分类" prop="majorCategory">
+              <el-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'">
+                <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="检定部门" prop="mesureDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                :tree-props="deptProps"
+              />
+              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定日期" prop="mesureDate">
+              <el-date-picker
+                v-model="ruleForm.mesureDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '检定日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="有效日期" prop="validDate">
+              <el-date-picker
+                v-model="ruleForm.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '有效日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定结果" prop="mesureResult">
+              <el-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'">
+                <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="8">
+            <el-form-item label="是否是技术指标需要校准/检定的设备" prop="isCalibrationTestEquipment" label-width="260px">
+              <el-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否是测量工装台账" prop="isMeasureAccount" label-width="260px">
+              <el-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否标准配套设备" prop="isStandardSupportEquipment" label-width="260px">
+              <el-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资产来源" prop="assetSource">
-            <el-input v-model.trim="ruleForm.assetSource" :placeholder="title === '详情' ? '' : '资产来源'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备规格" prop="equipmentSpecifications">
-            <el-input v-model.trim="ruleForm.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备类别" prop="equipmentCategory">
-            <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
-              <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备类型" prop="equipmentType">
-            <el-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'">
-              <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资本来源" prop="capitalSource">
-            <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
-              <el-option v-for="item in capitalSourceList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="管理级别" prop="managerLevel">
-            <el-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'">
-              <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="用途" prop="purpose">
-            <el-input v-model.trim="ruleForm.purpose" :placeholder="title === '详情' ? '' : '用途'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="技术水平" prop="technicalLevel">
-            <el-input v-model.trim="ruleForm.technicalLevel" :placeholder="title === '详情' ? '' : '技术水平'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="完好状态" prop="intactState">
-            <el-input v-model.trim="ruleForm.intactState" :placeholder="title === '详情' ? '' : '完好状态'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="外形尺寸" prop="overallDimension">
-            <el-input v-model.trim="ruleForm.overallDimension" :placeholder="title === '详情' ? '' : '外形尺寸'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="重量(吨)" prop="weight">
-            <el-input v-model.trim="ruleForm.weight" :placeholder="title === '详情' ? '' : '重量'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="单价" prop="singlePrice">
-            <el-input v-model.trim="ruleForm.singlePrice" :placeholder="title === '详情' ? '' : '单价'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="安装及杂费" prop="installIncidentalExpenses">
-            <el-input v-model.trim="ruleForm.installIncidentalExpenses" :placeholder="title === '详情' ? '' : '安装及杂费'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="安装地点" prop="installPlace">
-            <el-input v-model.trim="ruleForm.installPlace" :placeholder="title === '详情' ? '' : '安装地点'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="原值" prop="originValue">
-            <el-input v-model.trim="ruleForm.originValue" :placeholder="title === '详情' ? '' : '原值'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="目前原值" prop="presentOriginValue">
-            <el-input v-model.trim="ruleForm.presentOriginValue" :placeholder="title === '详情' ? '' : '目前原值'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="折旧年限" prop="depreciationPeriod">
-            <el-input v-model.trim="ruleForm.depreciationPeriod" :placeholder="title === '详情' ? '' : '折旧年限'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="折旧方法" prop="depreciationMethod">
-            <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
-              <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="属性" prop="attribute">
-            <el-input v-model.trim="ruleForm.attribute" placeholder="属性" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="12">
-          <el-form-item label="说明书" prop="minioFileName">
-            <show-photo :minio-file-name="ruleForm.fileList[0]?.minioFileName || ''" />
-            <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
-            <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
-              {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
-            </el-button>
-            <span v-if="title === '详情' && !ruleForm.fileList[0]?.minioFileName">暂无</span>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="24">
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" placeholder="备注" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资产来源" prop="assetSource">
+              <el-input v-model.trim="ruleForm.assetSource" :placeholder="title === '详情' ? '' : '资产来源'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备规格" prop="equipmentSpecifications">
+              <el-input v-model.trim="ruleForm.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备类别" prop="equipmentCategory">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+                <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备类型" prop="equipmentType">
+              <el-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'">
+                <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资本来源" prop="capitalSource">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+                <el-option v-for="item in capitalSourceList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="管理级别" prop="managerLevel">
+              <el-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'">
+                <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="用途" prop="purpose">
+              <el-input v-model.trim="ruleForm.purpose" :placeholder="title === '详情' ? '' : '用途'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="技术水平" prop="technicalLevel">
+              <el-input v-model.trim="ruleForm.technicalLevel" :placeholder="title === '详情' ? '' : '技术水平'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="完好状态" prop="intactState">
+              <el-input v-model.trim="ruleForm.intactState" :placeholder="title === '详情' ? '' : '完好状态'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="外形尺寸" prop="overallDimension">
+              <el-input v-model.trim="ruleForm.overallDimension" :placeholder="title === '详情' ? '' : '外形尺寸'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="重量(吨)" prop="weight">
+              <el-input v-model.trim="ruleForm.weight" :placeholder="title === '详情' ? '' : '重量'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="单价" prop="singlePrice">
+              <el-input v-model.trim="ruleForm.singlePrice" :placeholder="title === '详情' ? '' : '单价'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="安装及杂费" prop="installIncidentalExpenses">
+              <el-input v-model.trim="ruleForm.installIncidentalExpenses" :placeholder="title === '详情' ? '' : '安装及杂费'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="安装地点" prop="installPlace">
+              <el-input v-model.trim="ruleForm.installPlace" :placeholder="title === '详情' ? '' : '安装地点'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="原值" prop="originValue">
+              <el-input v-model.trim="ruleForm.originValue" :placeholder="title === '详情' ? '' : '原值'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="目前原值" prop="presentOriginValue">
+              <el-input v-model.trim="ruleForm.presentOriginValue" :placeholder="title === '详情' ? '' : '目前原值'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="折旧年限" prop="depreciationPeriod">
+              <el-input v-model.trim="ruleForm.depreciationPeriod" :placeholder="title === '详情' ? '' : '折旧年限'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="折旧方法" prop="depreciationMethod">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+                <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="属性" prop="attribute">
+              <el-input v-model.trim="ruleForm.attribute" placeholder="属性" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="说明书" prop="minioFileName">
+              <show-photo :minio-file-name="ruleForm.fileList[0]?.minioFileName || ''" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
+                {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
+              </el-button>
+              <span v-if="title === '详情' && !ruleForm.fileList[0]?.minioFileName">暂无</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" placeholder="备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block-switch>
   </div>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    padding-top: 20px;
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index f46553a..fc3fd54 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -360,20 +360,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          固定资产-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`固定资产-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -763,44 +758,11 @@
           </el-row>
         </div> -->
       </el-form>
-    </div>
+    </detail-page>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index 0abbdb1..6e88e96 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -74,33 +74,29 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ name }} -{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm">
-            关闭
-          </el-button>
-        </span>
-      </div>
-      <div class="body">
-        <!-- 三级菜单 -->
-        <el-radio-group v-model="current">
-          <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
-            {{ item.name }}
-          </el-radio-button>
-        </el-radio-group>
-      </div>
-      <!-- 展示区域 -->
-      <keep-alive>
-        <component :is="currentComp" ref="currentCompRef" :name="current" :title="title" :row="row" />
-      </keep-alive>
-    </div>
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <!-- 展示区域 -->
+    <keep-alive>
+      <component :is="currentComp" ref="currentCompRef" :name="current" :title="title" :row="row">
+        <template #menuswitch>
+          <!-- 三级菜单 -->
+          <el-radio-group v-model="current">
+            <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+              {{ item.name }}
+            </el-radio-button>
+          </el-radio-group>
+        </template>
+      </component>
+    </keep-alive>
   </app-container>
 </template>
 
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f9cdcd0..f653095 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -256,7 +256,7 @@
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
-  // 原生上传图片
+  // 原生上传
   // console.log(event.target.files)
   // if (event.target.files[0].type === 'application/pdf') {
   if (event.target.files?.length !== 0) {
@@ -354,7 +354,7 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" type="primary" @click="identify">
+          <!-- <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" type="primary" @click="identify">
             标签识别
           </el-button>
           <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/import`)" type="primary" @click="batchImport">
@@ -371,7 +371,13 @@
           </el-button>
           <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/print`)" v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/device/standingBook/components/templateTable.vue b/src/views/device/standingBook/components/templateTable.vue
index 8a928f0..7aa563f 100644
--- a/src/views/device/standingBook/components/templateTable.vue
+++ b/src/views/device/standingBook/components/templateTable.vue
@@ -245,11 +245,11 @@
   <div>
     <!-- 添加证书信息组件 -->
     <add-row ref="addRowRef" @add="addRowData" />
-    <div class="header">
-      <div class="title">
-        <!-- {{ $props.name }} -->
-      </div>
-      <span class="btns">
+    <detail-block-switch :title="name">
+      <template #menu>
+        <slot name="menuswitch" />
+      </template>
+      <template #btns>
         <el-button v-if="title !== '详情'" type="info" @click="removeRow">
           删除行
         </el-button>
@@ -259,55 +259,33 @@
         <el-button v-if="title !== '详情'" type="primary" @click="editRow">
           编辑行
         </el-button>
-      </span>
-    </div>
-    <!-- 表格区域 -->
-    <normal-table
-      id="print"
-      :data="list" :total="total" :columns="columns as any"
-      :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-      :list-loading="loadingTable"
-      style="padding-top: 20px;background-color: #fff;"
-      @change="changePage"
-    >
-      <template #preColumns>
-        <el-table-column label="" width="55" align="center">
-          <template #default="scope">
-            <el-radio v-model="select" :label="scope.$index" class="radio" />
-          </template>
-        </el-table-column>
-        <el-table-column label="序号" width="55" align="center">
-          <template #default="scope">
-            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-          </template>
-        </el-table-column>
       </template>
-    </normal-table>
+      <!-- 表格区域 -->
+      <normal-table
+        id="print"
+        :data="list" :total="total" :columns="columns as any"
+        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+        :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </detail-block-switch>
   </div>
 </template>
 
 <style lang="scss" scoped>
-.header {
-  background-color: #fff;
-  // height: 40px;
-  border-radius: 8px;
-  display: flex;
-  align-items: center;
-  flex-direction: column;
-  justify-content: center;
-  position: relative;
-
-  .title {
-    // font-weight: 700;
-  }
-
-  .btns {
-    position: absolute;
-    right: 40px;
-    top: -22px;
-  }
-}
-
 :deep(.el-radio__label) {
   display: none;
 }
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 7538bc8..78a3800 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -272,24 +272,12 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/identify`)" type="primary" @click="identify">
-            标签识别
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/import`)" type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/mould`)" type="primary" @click="templateDownload">
-            模板下载
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/add`)" type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/export`)" type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/print`)" v-print="printObj" type="primary">
-            打印
-          </el-button>
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/identify`)" icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index fc364c8..e74d70e 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -361,20 +361,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ name }} - {{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -458,73 +453,33 @@
           </el-col>
         </el-row>
       </el-form>
-      <div v-if="title !== '新建' ">
-        <div class="header" style="margin-top: 10px;">
-          <div class="title">
-            审批流程
-          </div>
-        </div>
-        <div class="timeline">
-          <el-timeline>
-            <el-timeline-item timestamp="2018/4/12" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/12 20:46</p>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="2018/4/3" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/3 20:46</p>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="2018/4/2" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/2 20:46</p>
-              </el-card>
-            </el-timeline-item>
-          </el-timeline>
-        </div>
-      </div>
-    </div>
+    </detail-page>
+    <detail-block v-if="title !== '新建' " title="审批流程">
+      <el-timeline>
+        <el-timeline-item timestamp="2018/4/12" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/12 20:46</p>
+          </el-card>
+        </el-timeline-item>
+        <el-timeline-item timestamp="2018/4/3" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/3 20:46</p>
+          </el-card>
+        </el-timeline-item>
+        <el-timeline-item timestamp="2018/4/2" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/2 20:46</p>
+          </el-card>
+        </el-timeline-item>
+      </el-timeline>
+    </detail-block>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .timeline {
   background-color: #fff;
 }
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index aa3963f..737568d 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -1,6 +1,6 @@
 <!-- 状态管理公共列表组件 -->
 <script lang="ts" setup>
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessageBox } from 'element-plus'
 import approve from './approvalActionDialog.vue'
 import addDialog from './templateAdd.vue'
 const props = defineProps({
@@ -142,7 +142,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: any) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     title: '详情',
@@ -150,7 +150,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: any) => {
   dialogVisible.value = true
   // addRef.value.initDialog({
   //   title: '编辑',
@@ -158,7 +158,7 @@
   // })
 }
 // 删除
-const remove = (row) => {
+const remove = (row: any) => {
   ElMessageBox.confirm(
     `确认删除${row.equipmentName}吗？`,
     '提示',
@@ -181,20 +181,20 @@
   // })
 }
 // 同意
-const agree = (row) => {
+const agree = (row: any) => {
   console.log(approveRef.value)
   approveRef.value.initDialog({
     radio: '1',
   })
 }
 // 驳回
-const reject = (row) => {
+const reject = (row: any) => {
   approveRef.value.initDialog({
     radio: '3',
   })
 }
 // 拒绝
-const refuse = (row) => {
+const refuse = (row: any) => {
   approveRef.value.initDialog(
     {
       radio: '2',
@@ -202,7 +202,7 @@
   )
 }
 // 取消
-const cancel = (row) => {
+const cancel = (rowrow: any) => {
   ElMessageBox.confirm(
     '确认取消吗？',
     '提示',
@@ -301,20 +301,20 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+          <el-input placeholder="申请编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="设备编号" clearable class="w-50 m-2" />
+          <el-input placeholder="设备编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.modelNo" placeholder="设备名称" clearable class="w-50 m-2" />
+          <el-input placeholder="设备名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请单位" clearable class="w-50 m-2" />
+          <el-input placeholder="申请单位" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.publisher" placeholder="申请状态" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" />
+          <el-select placeholder="申请状态" clearable>
+            <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" /> -->
           </el-select>
         </search-item>
       </search-area>
@@ -328,7 +328,10 @@
           <el-button type="primary" @click="templateDownload">
             模板下载
           </el-button> -->
-          <el-button type="primary" @click="add">
+          <icon-button icon="icon-add" title="新建" @click="add" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+          <!-- <el-button type="primary" @click="add">
             新建
           </el-button>
           <el-button type="primary" @click="exportExcelBtn">
@@ -336,7 +339,7 @@
           </el-button>
           <el-button v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
         </template>
         <!-- 表格区域 -->
         <normal-table
@@ -386,22 +389,3 @@
     </app-container>
   </div>
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 154px !important;
-}
-
-.normal-date {
-  width: 154px !important;
-}
-
-.normal-select {
-  width: 154px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
-
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 0763c5a..9ef0b93 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -19,7 +19,6 @@
 const effectiveStatusName = ref('')
 const title = ref('')
 const fileList = ref<UploadUserFile[]>([])
-console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -80,10 +79,9 @@
   if (row.title === '新建') {
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
-    ruleForm.publisher = ''
+    ruleForm.publisher = userInfo.$state.deptName
     ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 判断有无存储
-    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
     if (sessionStorage.getItem(fileTypeName.value)) {
       const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
       ruleForm.fileType = session.fileType
@@ -117,6 +115,8 @@
     ruleForm.remark = row.remark
     ruleForm.publishTime = row.publishTime
     ruleForm.minioFileName = row.minioFileName
+    // ruleForm.publisher = '0'
+    // ruleForm.createUserId = '1'
   }
 }
 defineExpose({ initDialog })
@@ -148,6 +148,9 @@
       type: 'warning',
     },
       ).then((res) => {
+        if (ruleForm.publisher === userInfo.$state.deptName) {
+          ruleForm.publisher === userInfo.$state.deptId
+        }
         if (flag == '提交') {
           addApi(ruleForm).then((res) => {
             if (res.code == 200) {
@@ -193,7 +196,6 @@
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        console.log(res.data[0])
         ruleForm.minioFileName = res.data[0]
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
@@ -216,7 +218,6 @@
 // ])
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
-  console.log(diffDat)
   if (diffDat < 0) {
     // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '在使用'
@@ -237,7 +238,7 @@
 
 <template>
   <app-container v-if="dialogVisible" style="overflow: hidden;">
-    <detail-page :title="`${title}${fileTypeName}`">
+    <detail-page :title="`${fileTypeName}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
           提交
@@ -278,12 +279,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="发布单位" prop="publisher">
-              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'" class="fill-input">
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled>
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
               <com-tree-select
                 v-else
-                v-model="ruleForm.publisher" :options="PubListTree" placeholder="选择组织机构"
+                v-model="ruleForm.publisher" :options="PubListTree" placeholder="请选择发布单位"
                 :tree-props="deptProps"
               />
             </el-form-item>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 44e3e4d..b45fbc3 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -324,22 +324,9 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <!-- <el-button type="primary" @click="batchImport">
-            批量导入
-          </el-button> -->
-          <!-- <el-button type="primary" @click="templateDownload">
-            模板下载
-          </el-button> -->
-          <!-- <el-button type="primary" @click="add">
-            新建
-          </el-button> -->
-          <el-button type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-print="printObj" type="primary">
-            打印
-          </el-button>
+          <!-- <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange"> -->
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 4677e48..7d4724b 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -204,13 +204,9 @@
     loading.close()
   })
 }
-// 打印
-const print = () => {
-
-}
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
-  // 原生上传图片
+  // 原生上传
   // console.log(event.target.files)
   // if (event.target.files[0].type === 'application/pdf') {
   if (event.target.files?.length !== 0) {
@@ -264,7 +260,7 @@
         <search-item>
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
-        <search-item>
+        <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
@@ -273,13 +269,13 @@
               :value="item.value"
             />
           </el-select>
-        </search-item>
+        </search-item> -->
         <search-item>
           <el-date-picker
             v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 155px;"
+            style="width: 185px;"
           />
         </search-item>
         <search-item>
@@ -287,19 +283,19 @@
             v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 155px;"
+            style="width: 185px;"
           />
         </search-item>
         <search-item>
-          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select> -->
-          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
+          </el-select>
+          <!-- <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" /> -->
         </search-item>
       </search-area>
       <table-container>
@@ -310,7 +306,7 @@
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
-          <icon-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" @click="print" />
+          <icon-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index cf0dd4f..5ca3275 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -3,11 +3,11 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { detailType } from '../measureDept-interface'
-import { getUserList } from '@/api/system/user'
+// import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
+import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import type { userType } from '@/views/system/user/user-interface'
 import { listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
-import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
 const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -31,11 +31,20 @@
   technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
+// 获取计量人员列表
 const getuser = () => {
-  getUserList({ offset: 1, limit: 99999 }).then((res) => {
-    userList.value = res.data.rows
+  getStaffList({
+    staffNo: '', // 人员编号
+    name: '', // 姓名
+    deptId: ruleForm.value.deptId, // 所在部门
+    limit: 999999,
+    offset: 1,
+  }).then((res) => {
+    if (res.code === 200) {
+      userList.value = res.data.records
+    }
   })
-} // 获取用户列表
+}
 const technologyJobList = ref<{ id: string;name: string;value: string }[]>([])
 // 获取技术职务列表
 const getTechnologyJobList = () => {
@@ -50,7 +59,16 @@
     administrationJobList.value = response.data
   })
 }
-
+// 选择负责人自动填充职务信息
+const directorChange = (val: string) => {
+  const selectUser = userList.value.filter(item => item.name === val)[0]
+  getStaffDetail(selectUser).then((res) => {
+    if (res.code === 200) {
+      ruleForm.value.administrationJob = res.data.administrationJob
+      ruleForm.value.technologyJob = res.data.technologyJob
+    }
+  })
+}
 // 提交
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
@@ -95,12 +113,6 @@
 const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
-// const searchQuery = ref({
-//   limit: 10,
-//   offset: 1,
-//   total: 0,
-//   pageSizes: [10, 20, 30],
-// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -410,20 +422,6 @@
     }
   })
 }
-// const handleSizeChange = (val: number) => {
-//   searchQuery.value.limit = val
-//   getDepartmentList()
-//   getuserInfoList()
-//   getInstrumentInfo()
-//   getDeviceInfo()
-// }
-// const handleCurrentChange = (val: number) => {
-//   searchQuery.value.offset = val
-//   getDepartmentList()
-//   getuserInfoList()
-//   getInstrumentInfo()
-//   getDeviceInfo()
-// }
 // 弹窗初始化
 const initDialog = (row: any) => {
   reset()
@@ -460,22 +458,17 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title.split('-')[2] === '编辑'" type="primary" @click="submitForm(ruleFormRef)">
-            提交
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="title">
+      <template #btns>
+        <el-button v-if="title.split('-')[2] === '编辑'" type="primary" @click="submitForm(ruleFormRef)">
+          提交
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title.split('-')[2] === '详情' ? 'isDetail' : '']">
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item :label=" `${title.split('-')[1]}编号`" prop="organizeNo">
               <el-input v-model.trim="ruleForm.organizeNo" placeholder="系统自动生成" disabled />
@@ -487,7 +480,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="title.split('-')[1] === '工程组'" :gutter="24" class="marg">
+        <el-row v-if="title.split('-')[1] === '工程组'" :gutter="24">
           <el-col :span="6">
             <el-form-item label="科室编号">
               <el-input v-model.trim="ruleForm.pDeptId" disabled />
@@ -509,10 +502,10 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
-              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" @change="directorChange">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.name" />
               </el-select>
             </el-form-item>
@@ -532,7 +525,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="24">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
               <el-input v-model.trim="ruleForm.remark" :placeholder="title.split('-')[2] === '详情' ? '' : '备注'" :disabled="title.split('-')[2] === '详情'" />
@@ -540,85 +533,24 @@
           </el-col>
         </el-row>
       </el-form>
-      <!-- 科室信息-人员信息等列表切换 -->
-      <div>
-        <div class="header" style="margin-top: 10px;">
-          <!-- 切换 -->
-          <el-radio-group v-model="current" class="change-btn">
-            <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
-              {{ item.name }}
-            </el-radio-button>
-          </el-radio-group>
-          <div class="title">
-            {{ current }}
-          </div>
-          <span class="btns">
-          <!-- <el-button type="info" :disabled="title === '详情'" @click="removeRow">
-            删除行
-          </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
-            添加行
-          </el-button> -->
-          </span>
-        </div>
-        <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <el-table-column type="index" label="序号" width="55" align="center" />
-          <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
-        </el-table>
-        <!-- <div style="width: 100%;margin-top: 10px;">
-          <el-pagination
-            :current-page="searchQuery.offset"
-            :page-sizes="searchQuery.pageSizes"
-            :page-size="searchQuery.limit"
-            :total="searchQuery.total"
-            layout="total, sizes, prev, pager, next"
-            hide-on-single-page
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-          />
-        </div> -->
-      </div>
-    </div>
+    </detail-page>
+    <detail-block-switch :title="current">
+      <template #menu>
+        <el-radio-group v-model="current" class="change-btn">
+          <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
+            {{ item.name }}
+          </el-radio-button>
+        </el-radio-group>
+      </template>
+      <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
+        <el-table-column type="index" label="序号" width="55" align="center" />
+        <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </detail-block-switch>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-    position: relative;
-
-    .change-btn {
-      position: absolute;
-      left: 40px;
-      top: 4px;
-    }
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 4px;
-    }
-  }
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
@@ -628,8 +560,4 @@
     }
   }
 }
-
-.marg {
-  margin-top: 10px;
-}
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 9ad87af..aac1ef2 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -231,12 +231,14 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
+          <!-- <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
           <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
+          <icon-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table

diff --git a/src/components.d.ts b/src/components.d.ts
index 6e85584..815d62f 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -16,14 +16,13 @@
     BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default']
     BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
-    Benchcol: typeof import('./components/benchcol/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/DetailPage/index copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
+    DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
diff --git a/src/components/DetailPage/DetailBlockSwitch.vue b/src/components/DetailPage/DetailBlockSwitch.vue
new file mode 100644
index 0000000..4d92074
--- /dev/null
+++ b/src/components/DetailPage/DetailBlockSwitch.vue
@@ -0,0 +1,71 @@
+<script lang="ts" setup name="DetailBlock">
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+})
+
+const slots = useSlots()
+</script>
+
+<template>
+  <div class="detail-main">
+    <div class="header">
+      <div class="menu">
+        <slot name="menu" />
+      </div>
+      <div class="title">
+        {{ title }}
+      </div>
+      <div class="btns">
+        <slot name="btns" />
+      </div>
+    </div>
+    <div v-if="slots.default" class="content">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-main {
+  background-color: #fff;
+  border-radius: 8px;
+  margin-top: 10px;
+  padding-top: 10px;
+
+  .header {
+    position: relative;
+    height: 40px;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+
+    .title {
+      font-weight: 500;
+    }
+
+    .btns {
+      position: absolute;
+      right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+
+    .menu {
+      position: absolute;
+      left: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+
+  .content {
+    background-color: #fff;
+    padding: 0 10px 20px;
+    margin-top: 10px;
+  }
+}
+</style>
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d6c1c91..1644a80 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -314,6 +314,39 @@
       },
     ],
   },
+  {
+    path: '/borrow',
+    component: Layout,
+    redirect: '/device/borrow/borrowapply',
+    name: 'Borrow',
+    meta: {
+      title: '设备领用',
+      icon: 'ep:key',
+      auth: '/device/borrow',
+    },
+    children: [
+      {
+        path: 'borrowapply',
+        name: 'borroWapply',
+        component: () => import('@/views/device/borrow/borrwoApply.vue'),
+        meta: {
+          title: '设备借用申请',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowapply',
+        },
+      },
+      {
+        path: 'borrowhandle',
+        name: 'borrowHandle',
+        component: () => import('@/views/device/borrow/borrowHandle.vue'),
+        meta: {
+          title: '设备借用处理',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowhandle',
+        },
+      },
+    ],
+  },
 
 ]
 
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
new file mode 100644
index 0000000..1c2405e
--- /dev/null
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="borrowHandle">
+// 逻辑代码
+</script>
+
+<template>
+  <app-container>
+    设备借用处理
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
new file mode 100644
index 0000000..03d414b
--- /dev/null
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="borrowApply">
+// 逻辑代码
+</script>
+
+<template>
+  <app-container>
+    设备借用申请
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index c2682fc..5f7b347 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -339,381 +339,374 @@
 
 <template>
   <div class="body-container">
-    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资产编号" prop="assetNo">
-            <el-input v-model.trim="ruleForm.assetNo" placeholder="系统自动生成" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="资产类型" prop="assetType">
-            <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备编号" prop="equipmentNo">
-            <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备名称" prop="equipmentName">
-            <el-input v-model.trim="ruleForm.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="生产厂家" prop="manufacturer">
-            <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="厂家国别" prop="manufacturerCountry">
-            <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="出厂编号" prop="manufacturingNo">
-            <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="出厂年月" prop="manufacturingDate">
-            <el-date-picker
-              v-model="ruleForm.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '出厂年月'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="型号" prop="modelNo">
-            <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="管理状态" prop="managerState">
-            <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="ABC" prop="abc">
-            <el-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'">
-              <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="标签绑定" prop="labelBind">
-            <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === '详情' ? '' : '标签'" :disabled="title === '详情'" clearable>
-              <template #append>
-                <el-button type="primary" size="small">
-                  扫描
-                </el-button>
-              </template>
-            </el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="立卡年月" prop="cardEstablishmentDate">
-            <el-date-picker
-              v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '立卡年月'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="启用日期" prop="enableDate">
-            <el-date-picker
-              v-model="ruleForm.enableDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '启用日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定方式" prop="mesureType">
-            <el-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'">
-              <el-option v-for="item in mesureTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定周期" prop="mesureCycle">
-            <el-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="12">
-          <el-form-item label="测量范围" prop="mesureRange">
-            <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === '详情' ? '' : '测量范围'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="不确定度" prop="uncertainty">
-            <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === '详情' ? '' : '不确定度'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="使用部门" prop="useDept">
-            <com-tree-select
-              v-if="title !== '详情'"
-              v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-              :tree-props="deptProps"
-            />
-            <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
-              <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="使用人" prop="usePerson">
-            <el-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'">
-              <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="专业分类" prop="majorCategory">
-            <el-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'">
-              <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="检定部门" prop="mesureDept">
-            <com-tree-select
-              v-if="title !== '详情'"
-              v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-              :tree-props="deptProps"
-            />
-            <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
-              <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定日期" prop="mesureDate">
-            <el-date-picker
-              v-model="ruleForm.mesureDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '检定日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="有效日期" prop="validDate">
-            <el-date-picker
-              v-model="ruleForm.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '有效日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定结果" prop="mesureResult">
-            <el-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'">
-              <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="8">
-          <el-form-item label="是否是技术指标需要校准/检定的设备" prop="isCalibrationTestEquipment" label-width="260px">
-            <el-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否是测量工装台账" prop="isMeasureAccount" label-width="260px">
-            <el-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否标准配套设备" prop="isStandardSupportEquipment" label-width="260px">
-            <el-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
+    <detail-block-switch title="基本信息">
+      <template #menu>
+        <slot name="menuswitch" />
+      </template>
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资产编号" prop="assetNo">
+              <el-input v-model.trim="ruleForm.assetNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="资产类型" prop="assetType">
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备编号" prop="equipmentNo">
+              <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="生产厂家" prop="manufacturer">
+              <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="厂家国别" prop="manufacturerCountry">
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号" prop="manufacturingNo">
+              <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂年月" prop="manufacturingDate">
+              <el-date-picker
+                v-model="ruleForm.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '出厂年月'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="型号" prop="modelNo">
+              <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="管理状态" prop="managerState">
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="ABC" prop="abc">
+              <el-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'">
+                <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标签绑定" prop="labelBind">
+              <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === '详情' ? '' : '标签'" :disabled="title === '详情'" clearable>
+                <template #append>
+                  <el-button type="primary" size="small">
+                    扫描
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="立卡年月" prop="cardEstablishmentDate">
+              <el-date-picker
+                v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '立卡年月'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="启用日期" prop="enableDate">
+              <el-date-picker
+                v-model="ruleForm.enableDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '启用日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定方式" prop="mesureType">
+              <el-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'">
+                <el-option v-for="item in mesureTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定周期" prop="mesureCycle">
+              <el-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="测量范围" prop="mesureRange">
+              <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === '详情' ? '' : '测量范围'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="不确定度" prop="uncertainty">
+              <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === '详情' ? '' : '不确定度'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="使用部门" prop="useDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
+                :tree-props="deptProps"
+              />
+              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="使用人" prop="usePerson">
+              <el-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'">
+                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="专业分类" prop="majorCategory">
+              <el-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'">
+                <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="检定部门" prop="mesureDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                :tree-props="deptProps"
+              />
+              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定日期" prop="mesureDate">
+              <el-date-picker
+                v-model="ruleForm.mesureDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '检定日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="有效日期" prop="validDate">
+              <el-date-picker
+                v-model="ruleForm.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '有效日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定结果" prop="mesureResult">
+              <el-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'">
+                <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="8">
+            <el-form-item label="是否是技术指标需要校准/检定的设备" prop="isCalibrationTestEquipment" label-width="260px">
+              <el-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否是测量工装台账" prop="isMeasureAccount" label-width="260px">
+              <el-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否标准配套设备" prop="isStandardSupportEquipment" label-width="260px">
+              <el-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资产来源" prop="assetSource">
-            <el-input v-model.trim="ruleForm.assetSource" :placeholder="title === '详情' ? '' : '资产来源'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备规格" prop="equipmentSpecifications">
-            <el-input v-model.trim="ruleForm.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备类别" prop="equipmentCategory">
-            <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
-              <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备类型" prop="equipmentType">
-            <el-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'">
-              <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资本来源" prop="capitalSource">
-            <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
-              <el-option v-for="item in capitalSourceList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="管理级别" prop="managerLevel">
-            <el-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'">
-              <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="用途" prop="purpose">
-            <el-input v-model.trim="ruleForm.purpose" :placeholder="title === '详情' ? '' : '用途'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="技术水平" prop="technicalLevel">
-            <el-input v-model.trim="ruleForm.technicalLevel" :placeholder="title === '详情' ? '' : '技术水平'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="完好状态" prop="intactState">
-            <el-input v-model.trim="ruleForm.intactState" :placeholder="title === '详情' ? '' : '完好状态'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="外形尺寸" prop="overallDimension">
-            <el-input v-model.trim="ruleForm.overallDimension" :placeholder="title === '详情' ? '' : '外形尺寸'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="重量(吨)" prop="weight">
-            <el-input v-model.trim="ruleForm.weight" :placeholder="title === '详情' ? '' : '重量'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="单价" prop="singlePrice">
-            <el-input v-model.trim="ruleForm.singlePrice" :placeholder="title === '详情' ? '' : '单价'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="安装及杂费" prop="installIncidentalExpenses">
-            <el-input v-model.trim="ruleForm.installIncidentalExpenses" :placeholder="title === '详情' ? '' : '安装及杂费'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="安装地点" prop="installPlace">
-            <el-input v-model.trim="ruleForm.installPlace" :placeholder="title === '详情' ? '' : '安装地点'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="原值" prop="originValue">
-            <el-input v-model.trim="ruleForm.originValue" :placeholder="title === '详情' ? '' : '原值'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="目前原值" prop="presentOriginValue">
-            <el-input v-model.trim="ruleForm.presentOriginValue" :placeholder="title === '详情' ? '' : '目前原值'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="折旧年限" prop="depreciationPeriod">
-            <el-input v-model.trim="ruleForm.depreciationPeriod" :placeholder="title === '详情' ? '' : '折旧年限'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="折旧方法" prop="depreciationMethod">
-            <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
-              <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="属性" prop="attribute">
-            <el-input v-model.trim="ruleForm.attribute" placeholder="属性" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="12">
-          <el-form-item label="说明书" prop="minioFileName">
-            <show-photo :minio-file-name="ruleForm.fileList[0]?.minioFileName || ''" />
-            <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
-            <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
-              {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
-            </el-button>
-            <span v-if="title === '详情' && !ruleForm.fileList[0]?.minioFileName">暂无</span>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="24">
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" placeholder="备注" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资产来源" prop="assetSource">
+              <el-input v-model.trim="ruleForm.assetSource" :placeholder="title === '详情' ? '' : '资产来源'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备规格" prop="equipmentSpecifications">
+              <el-input v-model.trim="ruleForm.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备类别" prop="equipmentCategory">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+                <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备类型" prop="equipmentType">
+              <el-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'">
+                <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资本来源" prop="capitalSource">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+                <el-option v-for="item in capitalSourceList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="管理级别" prop="managerLevel">
+              <el-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'">
+                <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="用途" prop="purpose">
+              <el-input v-model.trim="ruleForm.purpose" :placeholder="title === '详情' ? '' : '用途'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="技术水平" prop="technicalLevel">
+              <el-input v-model.trim="ruleForm.technicalLevel" :placeholder="title === '详情' ? '' : '技术水平'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="完好状态" prop="intactState">
+              <el-input v-model.trim="ruleForm.intactState" :placeholder="title === '详情' ? '' : '完好状态'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="外形尺寸" prop="overallDimension">
+              <el-input v-model.trim="ruleForm.overallDimension" :placeholder="title === '详情' ? '' : '外形尺寸'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="重量(吨)" prop="weight">
+              <el-input v-model.trim="ruleForm.weight" :placeholder="title === '详情' ? '' : '重量'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="单价" prop="singlePrice">
+              <el-input v-model.trim="ruleForm.singlePrice" :placeholder="title === '详情' ? '' : '单价'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="安装及杂费" prop="installIncidentalExpenses">
+              <el-input v-model.trim="ruleForm.installIncidentalExpenses" :placeholder="title === '详情' ? '' : '安装及杂费'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="安装地点" prop="installPlace">
+              <el-input v-model.trim="ruleForm.installPlace" :placeholder="title === '详情' ? '' : '安装地点'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="原值" prop="originValue">
+              <el-input v-model.trim="ruleForm.originValue" :placeholder="title === '详情' ? '' : '原值'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="目前原值" prop="presentOriginValue">
+              <el-input v-model.trim="ruleForm.presentOriginValue" :placeholder="title === '详情' ? '' : '目前原值'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="折旧年限" prop="depreciationPeriod">
+              <el-input v-model.trim="ruleForm.depreciationPeriod" :placeholder="title === '详情' ? '' : '折旧年限'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="折旧方法" prop="depreciationMethod">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+                <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="属性" prop="attribute">
+              <el-input v-model.trim="ruleForm.attribute" placeholder="属性" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="说明书" prop="minioFileName">
+              <show-photo :minio-file-name="ruleForm.fileList[0]?.minioFileName || ''" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
+                {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
+              </el-button>
+              <span v-if="title === '详情' && !ruleForm.fileList[0]?.minioFileName">暂无</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" placeholder="备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block-switch>
   </div>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    padding-top: 20px;
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index f46553a..fc3fd54 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -360,20 +360,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          固定资产-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`固定资产-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -763,44 +758,11 @@
           </el-row>
         </div> -->
       </el-form>
-    </div>
+    </detail-page>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index 0abbdb1..6e88e96 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -74,33 +74,29 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ name }} -{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm">
-            关闭
-          </el-button>
-        </span>
-      </div>
-      <div class="body">
-        <!-- 三级菜单 -->
-        <el-radio-group v-model="current">
-          <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
-            {{ item.name }}
-          </el-radio-button>
-        </el-radio-group>
-      </div>
-      <!-- 展示区域 -->
-      <keep-alive>
-        <component :is="currentComp" ref="currentCompRef" :name="current" :title="title" :row="row" />
-      </keep-alive>
-    </div>
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <!-- 展示区域 -->
+    <keep-alive>
+      <component :is="currentComp" ref="currentCompRef" :name="current" :title="title" :row="row">
+        <template #menuswitch>
+          <!-- 三级菜单 -->
+          <el-radio-group v-model="current">
+            <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+              {{ item.name }}
+            </el-radio-button>
+          </el-radio-group>
+        </template>
+      </component>
+    </keep-alive>
   </app-container>
 </template>
 
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f9cdcd0..f653095 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -256,7 +256,7 @@
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
-  // 原生上传图片
+  // 原生上传
   // console.log(event.target.files)
   // if (event.target.files[0].type === 'application/pdf') {
   if (event.target.files?.length !== 0) {
@@ -354,7 +354,7 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" type="primary" @click="identify">
+          <!-- <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" type="primary" @click="identify">
             标签识别
           </el-button>
           <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/import`)" type="primary" @click="batchImport">
@@ -371,7 +371,13 @@
           </el-button>
           <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/print`)" v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/device/standingBook/components/templateTable.vue b/src/views/device/standingBook/components/templateTable.vue
index 8a928f0..7aa563f 100644
--- a/src/views/device/standingBook/components/templateTable.vue
+++ b/src/views/device/standingBook/components/templateTable.vue
@@ -245,11 +245,11 @@
   <div>
     <!-- 添加证书信息组件 -->
     <add-row ref="addRowRef" @add="addRowData" />
-    <div class="header">
-      <div class="title">
-        <!-- {{ $props.name }} -->
-      </div>
-      <span class="btns">
+    <detail-block-switch :title="name">
+      <template #menu>
+        <slot name="menuswitch" />
+      </template>
+      <template #btns>
         <el-button v-if="title !== '详情'" type="info" @click="removeRow">
           删除行
         </el-button>
@@ -259,55 +259,33 @@
         <el-button v-if="title !== '详情'" type="primary" @click="editRow">
           编辑行
         </el-button>
-      </span>
-    </div>
-    <!-- 表格区域 -->
-    <normal-table
-      id="print"
-      :data="list" :total="total" :columns="columns as any"
-      :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-      :list-loading="loadingTable"
-      style="padding-top: 20px;background-color: #fff;"
-      @change="changePage"
-    >
-      <template #preColumns>
-        <el-table-column label="" width="55" align="center">
-          <template #default="scope">
-            <el-radio v-model="select" :label="scope.$index" class="radio" />
-          </template>
-        </el-table-column>
-        <el-table-column label="序号" width="55" align="center">
-          <template #default="scope">
-            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-          </template>
-        </el-table-column>
       </template>
-    </normal-table>
+      <!-- 表格区域 -->
+      <normal-table
+        id="print"
+        :data="list" :total="total" :columns="columns as any"
+        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+        :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </detail-block-switch>
   </div>
 </template>
 
 <style lang="scss" scoped>
-.header {
-  background-color: #fff;
-  // height: 40px;
-  border-radius: 8px;
-  display: flex;
-  align-items: center;
-  flex-direction: column;
-  justify-content: center;
-  position: relative;
-
-  .title {
-    // font-weight: 700;
-  }
-
-  .btns {
-    position: absolute;
-    right: 40px;
-    top: -22px;
-  }
-}
-
 :deep(.el-radio__label) {
   display: none;
 }
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 7538bc8..78a3800 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -272,24 +272,12 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/identify`)" type="primary" @click="identify">
-            标签识别
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/import`)" type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/mould`)" type="primary" @click="templateDownload">
-            模板下载
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/add`)" type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/export`)" type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/print`)" v-print="printObj" type="primary">
-            打印
-          </el-button>
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/identify`)" icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index fc364c8..e74d70e 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -361,20 +361,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ name }} - {{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -458,73 +453,33 @@
           </el-col>
         </el-row>
       </el-form>
-      <div v-if="title !== '新建' ">
-        <div class="header" style="margin-top: 10px;">
-          <div class="title">
-            审批流程
-          </div>
-        </div>
-        <div class="timeline">
-          <el-timeline>
-            <el-timeline-item timestamp="2018/4/12" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/12 20:46</p>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="2018/4/3" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/3 20:46</p>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="2018/4/2" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/2 20:46</p>
-              </el-card>
-            </el-timeline-item>
-          </el-timeline>
-        </div>
-      </div>
-    </div>
+    </detail-page>
+    <detail-block v-if="title !== '新建' " title="审批流程">
+      <el-timeline>
+        <el-timeline-item timestamp="2018/4/12" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/12 20:46</p>
+          </el-card>
+        </el-timeline-item>
+        <el-timeline-item timestamp="2018/4/3" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/3 20:46</p>
+          </el-card>
+        </el-timeline-item>
+        <el-timeline-item timestamp="2018/4/2" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/2 20:46</p>
+          </el-card>
+        </el-timeline-item>
+      </el-timeline>
+    </detail-block>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .timeline {
   background-color: #fff;
 }
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index aa3963f..737568d 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -1,6 +1,6 @@
 <!-- 状态管理公共列表组件 -->
 <script lang="ts" setup>
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessageBox } from 'element-plus'
 import approve from './approvalActionDialog.vue'
 import addDialog from './templateAdd.vue'
 const props = defineProps({
@@ -142,7 +142,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: any) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     title: '详情',
@@ -150,7 +150,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: any) => {
   dialogVisible.value = true
   // addRef.value.initDialog({
   //   title: '编辑',
@@ -158,7 +158,7 @@
   // })
 }
 // 删除
-const remove = (row) => {
+const remove = (row: any) => {
   ElMessageBox.confirm(
     `确认删除${row.equipmentName}吗？`,
     '提示',
@@ -181,20 +181,20 @@
   // })
 }
 // 同意
-const agree = (row) => {
+const agree = (row: any) => {
   console.log(approveRef.value)
   approveRef.value.initDialog({
     radio: '1',
   })
 }
 // 驳回
-const reject = (row) => {
+const reject = (row: any) => {
   approveRef.value.initDialog({
     radio: '3',
   })
 }
 // 拒绝
-const refuse = (row) => {
+const refuse = (row: any) => {
   approveRef.value.initDialog(
     {
       radio: '2',
@@ -202,7 +202,7 @@
   )
 }
 // 取消
-const cancel = (row) => {
+const cancel = (rowrow: any) => {
   ElMessageBox.confirm(
     '确认取消吗？',
     '提示',
@@ -301,20 +301,20 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+          <el-input placeholder="申请编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="设备编号" clearable class="w-50 m-2" />
+          <el-input placeholder="设备编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.modelNo" placeholder="设备名称" clearable class="w-50 m-2" />
+          <el-input placeholder="设备名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请单位" clearable class="w-50 m-2" />
+          <el-input placeholder="申请单位" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.publisher" placeholder="申请状态" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" />
+          <el-select placeholder="申请状态" clearable>
+            <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" /> -->
           </el-select>
         </search-item>
       </search-area>
@@ -328,7 +328,10 @@
           <el-button type="primary" @click="templateDownload">
             模板下载
           </el-button> -->
-          <el-button type="primary" @click="add">
+          <icon-button icon="icon-add" title="新建" @click="add" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+          <!-- <el-button type="primary" @click="add">
             新建
           </el-button>
           <el-button type="primary" @click="exportExcelBtn">
@@ -336,7 +339,7 @@
           </el-button>
           <el-button v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
         </template>
         <!-- 表格区域 -->
         <normal-table
@@ -386,22 +389,3 @@
     </app-container>
   </div>
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 154px !important;
-}
-
-.normal-date {
-  width: 154px !important;
-}
-
-.normal-select {
-  width: 154px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
-
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 0763c5a..9ef0b93 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -19,7 +19,6 @@
 const effectiveStatusName = ref('')
 const title = ref('')
 const fileList = ref<UploadUserFile[]>([])
-console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -80,10 +79,9 @@
   if (row.title === '新建') {
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
-    ruleForm.publisher = ''
+    ruleForm.publisher = userInfo.$state.deptName
     ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 判断有无存储
-    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
     if (sessionStorage.getItem(fileTypeName.value)) {
       const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
       ruleForm.fileType = session.fileType
@@ -117,6 +115,8 @@
     ruleForm.remark = row.remark
     ruleForm.publishTime = row.publishTime
     ruleForm.minioFileName = row.minioFileName
+    // ruleForm.publisher = '0'
+    // ruleForm.createUserId = '1'
   }
 }
 defineExpose({ initDialog })
@@ -148,6 +148,9 @@
       type: 'warning',
     },
       ).then((res) => {
+        if (ruleForm.publisher === userInfo.$state.deptName) {
+          ruleForm.publisher === userInfo.$state.deptId
+        }
         if (flag == '提交') {
           addApi(ruleForm).then((res) => {
             if (res.code == 200) {
@@ -193,7 +196,6 @@
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        console.log(res.data[0])
         ruleForm.minioFileName = res.data[0]
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
@@ -216,7 +218,6 @@
 // ])
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
-  console.log(diffDat)
   if (diffDat < 0) {
     // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '在使用'
@@ -237,7 +238,7 @@
 
 <template>
   <app-container v-if="dialogVisible" style="overflow: hidden;">
-    <detail-page :title="`${title}${fileTypeName}`">
+    <detail-page :title="`${fileTypeName}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
           提交
@@ -278,12 +279,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="发布单位" prop="publisher">
-              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'" class="fill-input">
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled>
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
               <com-tree-select
                 v-else
-                v-model="ruleForm.publisher" :options="PubListTree" placeholder="选择组织机构"
+                v-model="ruleForm.publisher" :options="PubListTree" placeholder="请选择发布单位"
                 :tree-props="deptProps"
               />
             </el-form-item>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 44e3e4d..b45fbc3 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -324,22 +324,9 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <!-- <el-button type="primary" @click="batchImport">
-            批量导入
-          </el-button> -->
-          <!-- <el-button type="primary" @click="templateDownload">
-            模板下载
-          </el-button> -->
-          <!-- <el-button type="primary" @click="add">
-            新建
-          </el-button> -->
-          <el-button type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-print="printObj" type="primary">
-            打印
-          </el-button>
+          <!-- <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange"> -->
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 4677e48..7d4724b 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -204,13 +204,9 @@
     loading.close()
   })
 }
-// 打印
-const print = () => {
-
-}
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
-  // 原生上传图片
+  // 原生上传
   // console.log(event.target.files)
   // if (event.target.files[0].type === 'application/pdf') {
   if (event.target.files?.length !== 0) {
@@ -264,7 +260,7 @@
         <search-item>
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
-        <search-item>
+        <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
@@ -273,13 +269,13 @@
               :value="item.value"
             />
           </el-select>
-        </search-item>
+        </search-item> -->
         <search-item>
           <el-date-picker
             v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 155px;"
+            style="width: 185px;"
           />
         </search-item>
         <search-item>
@@ -287,19 +283,19 @@
             v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 155px;"
+            style="width: 185px;"
           />
         </search-item>
         <search-item>
-          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select> -->
-          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
+          </el-select>
+          <!-- <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" /> -->
         </search-item>
       </search-area>
       <table-container>
@@ -310,7 +306,7 @@
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
-          <icon-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" @click="print" />
+          <icon-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index cf0dd4f..5ca3275 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -3,11 +3,11 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { detailType } from '../measureDept-interface'
-import { getUserList } from '@/api/system/user'
+// import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
+import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import type { userType } from '@/views/system/user/user-interface'
 import { listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
-import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
 const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -31,11 +31,20 @@
   technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
+// 获取计量人员列表
 const getuser = () => {
-  getUserList({ offset: 1, limit: 99999 }).then((res) => {
-    userList.value = res.data.rows
+  getStaffList({
+    staffNo: '', // 人员编号
+    name: '', // 姓名
+    deptId: ruleForm.value.deptId, // 所在部门
+    limit: 999999,
+    offset: 1,
+  }).then((res) => {
+    if (res.code === 200) {
+      userList.value = res.data.records
+    }
   })
-} // 获取用户列表
+}
 const technologyJobList = ref<{ id: string;name: string;value: string }[]>([])
 // 获取技术职务列表
 const getTechnologyJobList = () => {
@@ -50,7 +59,16 @@
     administrationJobList.value = response.data
   })
 }
-
+// 选择负责人自动填充职务信息
+const directorChange = (val: string) => {
+  const selectUser = userList.value.filter(item => item.name === val)[0]
+  getStaffDetail(selectUser).then((res) => {
+    if (res.code === 200) {
+      ruleForm.value.administrationJob = res.data.administrationJob
+      ruleForm.value.technologyJob = res.data.technologyJob
+    }
+  })
+}
 // 提交
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
@@ -95,12 +113,6 @@
 const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
-// const searchQuery = ref({
-//   limit: 10,
-//   offset: 1,
-//   total: 0,
-//   pageSizes: [10, 20, 30],
-// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -410,20 +422,6 @@
     }
   })
 }
-// const handleSizeChange = (val: number) => {
-//   searchQuery.value.limit = val
-//   getDepartmentList()
-//   getuserInfoList()
-//   getInstrumentInfo()
-//   getDeviceInfo()
-// }
-// const handleCurrentChange = (val: number) => {
-//   searchQuery.value.offset = val
-//   getDepartmentList()
-//   getuserInfoList()
-//   getInstrumentInfo()
-//   getDeviceInfo()
-// }
 // 弹窗初始化
 const initDialog = (row: any) => {
   reset()
@@ -460,22 +458,17 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title.split('-')[2] === '编辑'" type="primary" @click="submitForm(ruleFormRef)">
-            提交
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="title">
+      <template #btns>
+        <el-button v-if="title.split('-')[2] === '编辑'" type="primary" @click="submitForm(ruleFormRef)">
+          提交
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title.split('-')[2] === '详情' ? 'isDetail' : '']">
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item :label=" `${title.split('-')[1]}编号`" prop="organizeNo">
               <el-input v-model.trim="ruleForm.organizeNo" placeholder="系统自动生成" disabled />
@@ -487,7 +480,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="title.split('-')[1] === '工程组'" :gutter="24" class="marg">
+        <el-row v-if="title.split('-')[1] === '工程组'" :gutter="24">
           <el-col :span="6">
             <el-form-item label="科室编号">
               <el-input v-model.trim="ruleForm.pDeptId" disabled />
@@ -509,10 +502,10 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
-              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" @change="directorChange">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.name" />
               </el-select>
             </el-form-item>
@@ -532,7 +525,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="24">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
               <el-input v-model.trim="ruleForm.remark" :placeholder="title.split('-')[2] === '详情' ? '' : '备注'" :disabled="title.split('-')[2] === '详情'" />
@@ -540,85 +533,24 @@
           </el-col>
         </el-row>
       </el-form>
-      <!-- 科室信息-人员信息等列表切换 -->
-      <div>
-        <div class="header" style="margin-top: 10px;">
-          <!-- 切换 -->
-          <el-radio-group v-model="current" class="change-btn">
-            <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
-              {{ item.name }}
-            </el-radio-button>
-          </el-radio-group>
-          <div class="title">
-            {{ current }}
-          </div>
-          <span class="btns">
-          <!-- <el-button type="info" :disabled="title === '详情'" @click="removeRow">
-            删除行
-          </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
-            添加行
-          </el-button> -->
-          </span>
-        </div>
-        <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <el-table-column type="index" label="序号" width="55" align="center" />
-          <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
-        </el-table>
-        <!-- <div style="width: 100%;margin-top: 10px;">
-          <el-pagination
-            :current-page="searchQuery.offset"
-            :page-sizes="searchQuery.pageSizes"
-            :page-size="searchQuery.limit"
-            :total="searchQuery.total"
-            layout="total, sizes, prev, pager, next"
-            hide-on-single-page
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-          />
-        </div> -->
-      </div>
-    </div>
+    </detail-page>
+    <detail-block-switch :title="current">
+      <template #menu>
+        <el-radio-group v-model="current" class="change-btn">
+          <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
+            {{ item.name }}
+          </el-radio-button>
+        </el-radio-group>
+      </template>
+      <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
+        <el-table-column type="index" label="序号" width="55" align="center" />
+        <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </detail-block-switch>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-    position: relative;
-
-    .change-btn {
-      position: absolute;
-      left: 40px;
-      top: 4px;
-    }
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 4px;
-    }
-  }
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
@@ -628,8 +560,4 @@
     }
   }
 }
-
-.marg {
-  margin-top: 10px;
-}
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 9ad87af..aac1ef2 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -231,12 +231,14 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
+          <!-- <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
           <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
+          <icon-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 2e3322a..3f472eb 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -41,7 +41,7 @@
   { text: '证书号', value: 'certificateNo', align: 'center' },
   { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
   { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'validDate', align: 'center', width: '200' },
   { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
 ]) // 表格
 const certificateStatusList = ref([
@@ -90,7 +90,7 @@
   loadingTable.value = true
   getCertificateList(searchQuery).then((res) => {
     if (res.code === 200) {
-      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效' }))
+      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效', validDate: item.validDate.split(' ')[0], certificateDate: item.certificateDate.split(' ')[0] }))
       list.value = res.data.records
       total.value = Number(res.data.total)
     }
@@ -115,6 +115,7 @@
   addRef.value.initDialog({
     ...row,
     title: '详情',
+    name: props.isRemind ? '证书状况' : '证书记录',
   })
 }
 // 编辑
@@ -123,6 +124,7 @@
   addRef.value.initDialog({
     ...row,
     title: '编辑',
+    name: props.isRemind ? '证书状况' : '证书记录',
   })
 }
 
@@ -193,6 +195,7 @@
   dialogVisible.value = true
   addRef.value.initDialog({
     title: '新建',
+    name: props.isRemind ? '证书状况' : '证书记录',
   })
 }
 // 导出
@@ -292,21 +295,11 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
-            模板下载
-          </el-button>
-          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
-            打印
-          </el-button>
+          <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
@@ -325,7 +318,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column fixed="right" label="操作" align="center" width="150">
+            <el-table-column fixed="right" label="操作" align="center" width="180">
               <template #default="{ row }">
                 <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
                   提醒
@@ -336,7 +329,7 @@
                 <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>

diff --git a/src/components.d.ts b/src/components.d.ts
index 6e85584..815d62f 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -16,14 +16,13 @@
     BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default']
     BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
-    Benchcol: typeof import('./components/benchcol/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/DetailPage/index copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
+    DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
diff --git a/src/components/DetailPage/DetailBlockSwitch.vue b/src/components/DetailPage/DetailBlockSwitch.vue
new file mode 100644
index 0000000..4d92074
--- /dev/null
+++ b/src/components/DetailPage/DetailBlockSwitch.vue
@@ -0,0 +1,71 @@
+<script lang="ts" setup name="DetailBlock">
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+})
+
+const slots = useSlots()
+</script>
+
+<template>
+  <div class="detail-main">
+    <div class="header">
+      <div class="menu">
+        <slot name="menu" />
+      </div>
+      <div class="title">
+        {{ title }}
+      </div>
+      <div class="btns">
+        <slot name="btns" />
+      </div>
+    </div>
+    <div v-if="slots.default" class="content">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-main {
+  background-color: #fff;
+  border-radius: 8px;
+  margin-top: 10px;
+  padding-top: 10px;
+
+  .header {
+    position: relative;
+    height: 40px;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+
+    .title {
+      font-weight: 500;
+    }
+
+    .btns {
+      position: absolute;
+      right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+
+    .menu {
+      position: absolute;
+      left: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+
+  .content {
+    background-color: #fff;
+    padding: 0 10px 20px;
+    margin-top: 10px;
+  }
+}
+</style>
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d6c1c91..1644a80 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -314,6 +314,39 @@
       },
     ],
   },
+  {
+    path: '/borrow',
+    component: Layout,
+    redirect: '/device/borrow/borrowapply',
+    name: 'Borrow',
+    meta: {
+      title: '设备领用',
+      icon: 'ep:key',
+      auth: '/device/borrow',
+    },
+    children: [
+      {
+        path: 'borrowapply',
+        name: 'borroWapply',
+        component: () => import('@/views/device/borrow/borrwoApply.vue'),
+        meta: {
+          title: '设备借用申请',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowapply',
+        },
+      },
+      {
+        path: 'borrowhandle',
+        name: 'borrowHandle',
+        component: () => import('@/views/device/borrow/borrowHandle.vue'),
+        meta: {
+          title: '设备借用处理',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowhandle',
+        },
+      },
+    ],
+  },
 
 ]
 
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
new file mode 100644
index 0000000..1c2405e
--- /dev/null
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="borrowHandle">
+// 逻辑代码
+</script>
+
+<template>
+  <app-container>
+    设备借用处理
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
new file mode 100644
index 0000000..03d414b
--- /dev/null
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="borrowApply">
+// 逻辑代码
+</script>
+
+<template>
+  <app-container>
+    设备借用申请
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index c2682fc..5f7b347 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -339,381 +339,374 @@
 
 <template>
   <div class="body-container">
-    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资产编号" prop="assetNo">
-            <el-input v-model.trim="ruleForm.assetNo" placeholder="系统自动生成" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="资产类型" prop="assetType">
-            <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备编号" prop="equipmentNo">
-            <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备名称" prop="equipmentName">
-            <el-input v-model.trim="ruleForm.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="生产厂家" prop="manufacturer">
-            <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="厂家国别" prop="manufacturerCountry">
-            <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="出厂编号" prop="manufacturingNo">
-            <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="出厂年月" prop="manufacturingDate">
-            <el-date-picker
-              v-model="ruleForm.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '出厂年月'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="型号" prop="modelNo">
-            <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="管理状态" prop="managerState">
-            <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="ABC" prop="abc">
-            <el-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'">
-              <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="标签绑定" prop="labelBind">
-            <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === '详情' ? '' : '标签'" :disabled="title === '详情'" clearable>
-              <template #append>
-                <el-button type="primary" size="small">
-                  扫描
-                </el-button>
-              </template>
-            </el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="立卡年月" prop="cardEstablishmentDate">
-            <el-date-picker
-              v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '立卡年月'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="启用日期" prop="enableDate">
-            <el-date-picker
-              v-model="ruleForm.enableDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '启用日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定方式" prop="mesureType">
-            <el-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'">
-              <el-option v-for="item in mesureTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定周期" prop="mesureCycle">
-            <el-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="12">
-          <el-form-item label="测量范围" prop="mesureRange">
-            <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === '详情' ? '' : '测量范围'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="不确定度" prop="uncertainty">
-            <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === '详情' ? '' : '不确定度'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="使用部门" prop="useDept">
-            <com-tree-select
-              v-if="title !== '详情'"
-              v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-              :tree-props="deptProps"
-            />
-            <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
-              <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="使用人" prop="usePerson">
-            <el-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'">
-              <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="专业分类" prop="majorCategory">
-            <el-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'">
-              <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="检定部门" prop="mesureDept">
-            <com-tree-select
-              v-if="title !== '详情'"
-              v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-              :tree-props="deptProps"
-            />
-            <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
-              <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定日期" prop="mesureDate">
-            <el-date-picker
-              v-model="ruleForm.mesureDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '检定日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="有效日期" prop="validDate">
-            <el-date-picker
-              v-model="ruleForm.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '有效日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定结果" prop="mesureResult">
-            <el-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'">
-              <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="8">
-          <el-form-item label="是否是技术指标需要校准/检定的设备" prop="isCalibrationTestEquipment" label-width="260px">
-            <el-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否是测量工装台账" prop="isMeasureAccount" label-width="260px">
-            <el-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否标准配套设备" prop="isStandardSupportEquipment" label-width="260px">
-            <el-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
+    <detail-block-switch title="基本信息">
+      <template #menu>
+        <slot name="menuswitch" />
+      </template>
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资产编号" prop="assetNo">
+              <el-input v-model.trim="ruleForm.assetNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="资产类型" prop="assetType">
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备编号" prop="equipmentNo">
+              <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="生产厂家" prop="manufacturer">
+              <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="厂家国别" prop="manufacturerCountry">
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号" prop="manufacturingNo">
+              <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂年月" prop="manufacturingDate">
+              <el-date-picker
+                v-model="ruleForm.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '出厂年月'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="型号" prop="modelNo">
+              <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="管理状态" prop="managerState">
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="ABC" prop="abc">
+              <el-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'">
+                <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标签绑定" prop="labelBind">
+              <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === '详情' ? '' : '标签'" :disabled="title === '详情'" clearable>
+                <template #append>
+                  <el-button type="primary" size="small">
+                    扫描
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="立卡年月" prop="cardEstablishmentDate">
+              <el-date-picker
+                v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '立卡年月'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="启用日期" prop="enableDate">
+              <el-date-picker
+                v-model="ruleForm.enableDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '启用日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定方式" prop="mesureType">
+              <el-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'">
+                <el-option v-for="item in mesureTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定周期" prop="mesureCycle">
+              <el-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="测量范围" prop="mesureRange">
+              <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === '详情' ? '' : '测量范围'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="不确定度" prop="uncertainty">
+              <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === '详情' ? '' : '不确定度'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="使用部门" prop="useDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
+                :tree-props="deptProps"
+              />
+              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="使用人" prop="usePerson">
+              <el-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'">
+                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="专业分类" prop="majorCategory">
+              <el-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'">
+                <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="检定部门" prop="mesureDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                :tree-props="deptProps"
+              />
+              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定日期" prop="mesureDate">
+              <el-date-picker
+                v-model="ruleForm.mesureDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '检定日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="有效日期" prop="validDate">
+              <el-date-picker
+                v-model="ruleForm.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '有效日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定结果" prop="mesureResult">
+              <el-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'">
+                <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="8">
+            <el-form-item label="是否是技术指标需要校准/检定的设备" prop="isCalibrationTestEquipment" label-width="260px">
+              <el-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否是测量工装台账" prop="isMeasureAccount" label-width="260px">
+              <el-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否标准配套设备" prop="isStandardSupportEquipment" label-width="260px">
+              <el-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资产来源" prop="assetSource">
-            <el-input v-model.trim="ruleForm.assetSource" :placeholder="title === '详情' ? '' : '资产来源'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备规格" prop="equipmentSpecifications">
-            <el-input v-model.trim="ruleForm.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备类别" prop="equipmentCategory">
-            <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
-              <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备类型" prop="equipmentType">
-            <el-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'">
-              <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资本来源" prop="capitalSource">
-            <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
-              <el-option v-for="item in capitalSourceList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="管理级别" prop="managerLevel">
-            <el-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'">
-              <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="用途" prop="purpose">
-            <el-input v-model.trim="ruleForm.purpose" :placeholder="title === '详情' ? '' : '用途'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="技术水平" prop="technicalLevel">
-            <el-input v-model.trim="ruleForm.technicalLevel" :placeholder="title === '详情' ? '' : '技术水平'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="完好状态" prop="intactState">
-            <el-input v-model.trim="ruleForm.intactState" :placeholder="title === '详情' ? '' : '完好状态'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="外形尺寸" prop="overallDimension">
-            <el-input v-model.trim="ruleForm.overallDimension" :placeholder="title === '详情' ? '' : '外形尺寸'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="重量(吨)" prop="weight">
-            <el-input v-model.trim="ruleForm.weight" :placeholder="title === '详情' ? '' : '重量'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="单价" prop="singlePrice">
-            <el-input v-model.trim="ruleForm.singlePrice" :placeholder="title === '详情' ? '' : '单价'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="安装及杂费" prop="installIncidentalExpenses">
-            <el-input v-model.trim="ruleForm.installIncidentalExpenses" :placeholder="title === '详情' ? '' : '安装及杂费'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="安装地点" prop="installPlace">
-            <el-input v-model.trim="ruleForm.installPlace" :placeholder="title === '详情' ? '' : '安装地点'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="原值" prop="originValue">
-            <el-input v-model.trim="ruleForm.originValue" :placeholder="title === '详情' ? '' : '原值'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="目前原值" prop="presentOriginValue">
-            <el-input v-model.trim="ruleForm.presentOriginValue" :placeholder="title === '详情' ? '' : '目前原值'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="折旧年限" prop="depreciationPeriod">
-            <el-input v-model.trim="ruleForm.depreciationPeriod" :placeholder="title === '详情' ? '' : '折旧年限'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="折旧方法" prop="depreciationMethod">
-            <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
-              <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="属性" prop="attribute">
-            <el-input v-model.trim="ruleForm.attribute" placeholder="属性" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="12">
-          <el-form-item label="说明书" prop="minioFileName">
-            <show-photo :minio-file-name="ruleForm.fileList[0]?.minioFileName || ''" />
-            <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
-            <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
-              {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
-            </el-button>
-            <span v-if="title === '详情' && !ruleForm.fileList[0]?.minioFileName">暂无</span>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="24">
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" placeholder="备注" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资产来源" prop="assetSource">
+              <el-input v-model.trim="ruleForm.assetSource" :placeholder="title === '详情' ? '' : '资产来源'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备规格" prop="equipmentSpecifications">
+              <el-input v-model.trim="ruleForm.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备类别" prop="equipmentCategory">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+                <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备类型" prop="equipmentType">
+              <el-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'">
+                <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资本来源" prop="capitalSource">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+                <el-option v-for="item in capitalSourceList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="管理级别" prop="managerLevel">
+              <el-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'">
+                <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="用途" prop="purpose">
+              <el-input v-model.trim="ruleForm.purpose" :placeholder="title === '详情' ? '' : '用途'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="技术水平" prop="technicalLevel">
+              <el-input v-model.trim="ruleForm.technicalLevel" :placeholder="title === '详情' ? '' : '技术水平'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="完好状态" prop="intactState">
+              <el-input v-model.trim="ruleForm.intactState" :placeholder="title === '详情' ? '' : '完好状态'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="外形尺寸" prop="overallDimension">
+              <el-input v-model.trim="ruleForm.overallDimension" :placeholder="title === '详情' ? '' : '外形尺寸'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="重量(吨)" prop="weight">
+              <el-input v-model.trim="ruleForm.weight" :placeholder="title === '详情' ? '' : '重量'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="单价" prop="singlePrice">
+              <el-input v-model.trim="ruleForm.singlePrice" :placeholder="title === '详情' ? '' : '单价'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="安装及杂费" prop="installIncidentalExpenses">
+              <el-input v-model.trim="ruleForm.installIncidentalExpenses" :placeholder="title === '详情' ? '' : '安装及杂费'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="安装地点" prop="installPlace">
+              <el-input v-model.trim="ruleForm.installPlace" :placeholder="title === '详情' ? '' : '安装地点'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="原值" prop="originValue">
+              <el-input v-model.trim="ruleForm.originValue" :placeholder="title === '详情' ? '' : '原值'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="目前原值" prop="presentOriginValue">
+              <el-input v-model.trim="ruleForm.presentOriginValue" :placeholder="title === '详情' ? '' : '目前原值'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="折旧年限" prop="depreciationPeriod">
+              <el-input v-model.trim="ruleForm.depreciationPeriod" :placeholder="title === '详情' ? '' : '折旧年限'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="折旧方法" prop="depreciationMethod">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+                <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="属性" prop="attribute">
+              <el-input v-model.trim="ruleForm.attribute" placeholder="属性" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="说明书" prop="minioFileName">
+              <show-photo :minio-file-name="ruleForm.fileList[0]?.minioFileName || ''" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
+                {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
+              </el-button>
+              <span v-if="title === '详情' && !ruleForm.fileList[0]?.minioFileName">暂无</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" placeholder="备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block-switch>
   </div>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    padding-top: 20px;
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index f46553a..fc3fd54 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -360,20 +360,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          固定资产-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`固定资产-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -763,44 +758,11 @@
           </el-row>
         </div> -->
       </el-form>
-    </div>
+    </detail-page>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index 0abbdb1..6e88e96 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -74,33 +74,29 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ name }} -{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm">
-            关闭
-          </el-button>
-        </span>
-      </div>
-      <div class="body">
-        <!-- 三级菜单 -->
-        <el-radio-group v-model="current">
-          <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
-            {{ item.name }}
-          </el-radio-button>
-        </el-radio-group>
-      </div>
-      <!-- 展示区域 -->
-      <keep-alive>
-        <component :is="currentComp" ref="currentCompRef" :name="current" :title="title" :row="row" />
-      </keep-alive>
-    </div>
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <!-- 展示区域 -->
+    <keep-alive>
+      <component :is="currentComp" ref="currentCompRef" :name="current" :title="title" :row="row">
+        <template #menuswitch>
+          <!-- 三级菜单 -->
+          <el-radio-group v-model="current">
+            <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+              {{ item.name }}
+            </el-radio-button>
+          </el-radio-group>
+        </template>
+      </component>
+    </keep-alive>
   </app-container>
 </template>
 
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f9cdcd0..f653095 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -256,7 +256,7 @@
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
-  // 原生上传图片
+  // 原生上传
   // console.log(event.target.files)
   // if (event.target.files[0].type === 'application/pdf') {
   if (event.target.files?.length !== 0) {
@@ -354,7 +354,7 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" type="primary" @click="identify">
+          <!-- <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" type="primary" @click="identify">
             标签识别
           </el-button>
           <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/import`)" type="primary" @click="batchImport">
@@ -371,7 +371,13 @@
           </el-button>
           <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/print`)" v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/device/standingBook/components/templateTable.vue b/src/views/device/standingBook/components/templateTable.vue
index 8a928f0..7aa563f 100644
--- a/src/views/device/standingBook/components/templateTable.vue
+++ b/src/views/device/standingBook/components/templateTable.vue
@@ -245,11 +245,11 @@
   <div>
     <!-- 添加证书信息组件 -->
     <add-row ref="addRowRef" @add="addRowData" />
-    <div class="header">
-      <div class="title">
-        <!-- {{ $props.name }} -->
-      </div>
-      <span class="btns">
+    <detail-block-switch :title="name">
+      <template #menu>
+        <slot name="menuswitch" />
+      </template>
+      <template #btns>
         <el-button v-if="title !== '详情'" type="info" @click="removeRow">
           删除行
         </el-button>
@@ -259,55 +259,33 @@
         <el-button v-if="title !== '详情'" type="primary" @click="editRow">
           编辑行
         </el-button>
-      </span>
-    </div>
-    <!-- 表格区域 -->
-    <normal-table
-      id="print"
-      :data="list" :total="total" :columns="columns as any"
-      :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-      :list-loading="loadingTable"
-      style="padding-top: 20px;background-color: #fff;"
-      @change="changePage"
-    >
-      <template #preColumns>
-        <el-table-column label="" width="55" align="center">
-          <template #default="scope">
-            <el-radio v-model="select" :label="scope.$index" class="radio" />
-          </template>
-        </el-table-column>
-        <el-table-column label="序号" width="55" align="center">
-          <template #default="scope">
-            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-          </template>
-        </el-table-column>
       </template>
-    </normal-table>
+      <!-- 表格区域 -->
+      <normal-table
+        id="print"
+        :data="list" :total="total" :columns="columns as any"
+        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+        :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </detail-block-switch>
   </div>
 </template>
 
 <style lang="scss" scoped>
-.header {
-  background-color: #fff;
-  // height: 40px;
-  border-radius: 8px;
-  display: flex;
-  align-items: center;
-  flex-direction: column;
-  justify-content: center;
-  position: relative;
-
-  .title {
-    // font-weight: 700;
-  }
-
-  .btns {
-    position: absolute;
-    right: 40px;
-    top: -22px;
-  }
-}
-
 :deep(.el-radio__label) {
   display: none;
 }
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 7538bc8..78a3800 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -272,24 +272,12 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/identify`)" type="primary" @click="identify">
-            标签识别
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/import`)" type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/mould`)" type="primary" @click="templateDownload">
-            模板下载
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/add`)" type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/export`)" type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/print`)" v-print="printObj" type="primary">
-            打印
-          </el-button>
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/identify`)" icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index fc364c8..e74d70e 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -361,20 +361,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ name }} - {{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -458,73 +453,33 @@
           </el-col>
         </el-row>
       </el-form>
-      <div v-if="title !== '新建' ">
-        <div class="header" style="margin-top: 10px;">
-          <div class="title">
-            审批流程
-          </div>
-        </div>
-        <div class="timeline">
-          <el-timeline>
-            <el-timeline-item timestamp="2018/4/12" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/12 20:46</p>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="2018/4/3" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/3 20:46</p>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="2018/4/2" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/2 20:46</p>
-              </el-card>
-            </el-timeline-item>
-          </el-timeline>
-        </div>
-      </div>
-    </div>
+    </detail-page>
+    <detail-block v-if="title !== '新建' " title="审批流程">
+      <el-timeline>
+        <el-timeline-item timestamp="2018/4/12" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/12 20:46</p>
+          </el-card>
+        </el-timeline-item>
+        <el-timeline-item timestamp="2018/4/3" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/3 20:46</p>
+          </el-card>
+        </el-timeline-item>
+        <el-timeline-item timestamp="2018/4/2" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/2 20:46</p>
+          </el-card>
+        </el-timeline-item>
+      </el-timeline>
+    </detail-block>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .timeline {
   background-color: #fff;
 }
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index aa3963f..737568d 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -1,6 +1,6 @@
 <!-- 状态管理公共列表组件 -->
 <script lang="ts" setup>
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessageBox } from 'element-plus'
 import approve from './approvalActionDialog.vue'
 import addDialog from './templateAdd.vue'
 const props = defineProps({
@@ -142,7 +142,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: any) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     title: '详情',
@@ -150,7 +150,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: any) => {
   dialogVisible.value = true
   // addRef.value.initDialog({
   //   title: '编辑',
@@ -158,7 +158,7 @@
   // })
 }
 // 删除
-const remove = (row) => {
+const remove = (row: any) => {
   ElMessageBox.confirm(
     `确认删除${row.equipmentName}吗？`,
     '提示',
@@ -181,20 +181,20 @@
   // })
 }
 // 同意
-const agree = (row) => {
+const agree = (row: any) => {
   console.log(approveRef.value)
   approveRef.value.initDialog({
     radio: '1',
   })
 }
 // 驳回
-const reject = (row) => {
+const reject = (row: any) => {
   approveRef.value.initDialog({
     radio: '3',
   })
 }
 // 拒绝
-const refuse = (row) => {
+const refuse = (row: any) => {
   approveRef.value.initDialog(
     {
       radio: '2',
@@ -202,7 +202,7 @@
   )
 }
 // 取消
-const cancel = (row) => {
+const cancel = (rowrow: any) => {
   ElMessageBox.confirm(
     '确认取消吗？',
     '提示',
@@ -301,20 +301,20 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+          <el-input placeholder="申请编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="设备编号" clearable class="w-50 m-2" />
+          <el-input placeholder="设备编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.modelNo" placeholder="设备名称" clearable class="w-50 m-2" />
+          <el-input placeholder="设备名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请单位" clearable class="w-50 m-2" />
+          <el-input placeholder="申请单位" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.publisher" placeholder="申请状态" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" />
+          <el-select placeholder="申请状态" clearable>
+            <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" /> -->
           </el-select>
         </search-item>
       </search-area>
@@ -328,7 +328,10 @@
           <el-button type="primary" @click="templateDownload">
             模板下载
           </el-button> -->
-          <el-button type="primary" @click="add">
+          <icon-button icon="icon-add" title="新建" @click="add" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+          <!-- <el-button type="primary" @click="add">
             新建
           </el-button>
           <el-button type="primary" @click="exportExcelBtn">
@@ -336,7 +339,7 @@
           </el-button>
           <el-button v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
         </template>
         <!-- 表格区域 -->
         <normal-table
@@ -386,22 +389,3 @@
     </app-container>
   </div>
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 154px !important;
-}
-
-.normal-date {
-  width: 154px !important;
-}
-
-.normal-select {
-  width: 154px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
-
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 0763c5a..9ef0b93 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -19,7 +19,6 @@
 const effectiveStatusName = ref('')
 const title = ref('')
 const fileList = ref<UploadUserFile[]>([])
-console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -80,10 +79,9 @@
   if (row.title === '新建') {
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
-    ruleForm.publisher = ''
+    ruleForm.publisher = userInfo.$state.deptName
     ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 判断有无存储
-    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
     if (sessionStorage.getItem(fileTypeName.value)) {
       const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
       ruleForm.fileType = session.fileType
@@ -117,6 +115,8 @@
     ruleForm.remark = row.remark
     ruleForm.publishTime = row.publishTime
     ruleForm.minioFileName = row.minioFileName
+    // ruleForm.publisher = '0'
+    // ruleForm.createUserId = '1'
   }
 }
 defineExpose({ initDialog })
@@ -148,6 +148,9 @@
       type: 'warning',
     },
       ).then((res) => {
+        if (ruleForm.publisher === userInfo.$state.deptName) {
+          ruleForm.publisher === userInfo.$state.deptId
+        }
         if (flag == '提交') {
           addApi(ruleForm).then((res) => {
             if (res.code == 200) {
@@ -193,7 +196,6 @@
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        console.log(res.data[0])
         ruleForm.minioFileName = res.data[0]
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
@@ -216,7 +218,6 @@
 // ])
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
-  console.log(diffDat)
   if (diffDat < 0) {
     // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '在使用'
@@ -237,7 +238,7 @@
 
 <template>
   <app-container v-if="dialogVisible" style="overflow: hidden;">
-    <detail-page :title="`${title}${fileTypeName}`">
+    <detail-page :title="`${fileTypeName}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
           提交
@@ -278,12 +279,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="发布单位" prop="publisher">
-              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'" class="fill-input">
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled>
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
               <com-tree-select
                 v-else
-                v-model="ruleForm.publisher" :options="PubListTree" placeholder="选择组织机构"
+                v-model="ruleForm.publisher" :options="PubListTree" placeholder="请选择发布单位"
                 :tree-props="deptProps"
               />
             </el-form-item>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 44e3e4d..b45fbc3 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -324,22 +324,9 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <!-- <el-button type="primary" @click="batchImport">
-            批量导入
-          </el-button> -->
-          <!-- <el-button type="primary" @click="templateDownload">
-            模板下载
-          </el-button> -->
-          <!-- <el-button type="primary" @click="add">
-            新建
-          </el-button> -->
-          <el-button type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-print="printObj" type="primary">
-            打印
-          </el-button>
+          <!-- <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange"> -->
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 4677e48..7d4724b 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -204,13 +204,9 @@
     loading.close()
   })
 }
-// 打印
-const print = () => {
-
-}
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
-  // 原生上传图片
+  // 原生上传
   // console.log(event.target.files)
   // if (event.target.files[0].type === 'application/pdf') {
   if (event.target.files?.length !== 0) {
@@ -264,7 +260,7 @@
         <search-item>
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
-        <search-item>
+        <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
@@ -273,13 +269,13 @@
               :value="item.value"
             />
           </el-select>
-        </search-item>
+        </search-item> -->
         <search-item>
           <el-date-picker
             v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 155px;"
+            style="width: 185px;"
           />
         </search-item>
         <search-item>
@@ -287,19 +283,19 @@
             v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 155px;"
+            style="width: 185px;"
           />
         </search-item>
         <search-item>
-          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select> -->
-          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
+          </el-select>
+          <!-- <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" /> -->
         </search-item>
       </search-area>
       <table-container>
@@ -310,7 +306,7 @@
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
-          <icon-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" @click="print" />
+          <icon-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index cf0dd4f..5ca3275 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -3,11 +3,11 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { detailType } from '../measureDept-interface'
-import { getUserList } from '@/api/system/user'
+// import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
+import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import type { userType } from '@/views/system/user/user-interface'
 import { listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
-import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
 const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -31,11 +31,20 @@
   technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
+// 获取计量人员列表
 const getuser = () => {
-  getUserList({ offset: 1, limit: 99999 }).then((res) => {
-    userList.value = res.data.rows
+  getStaffList({
+    staffNo: '', // 人员编号
+    name: '', // 姓名
+    deptId: ruleForm.value.deptId, // 所在部门
+    limit: 999999,
+    offset: 1,
+  }).then((res) => {
+    if (res.code === 200) {
+      userList.value = res.data.records
+    }
   })
-} // 获取用户列表
+}
 const technologyJobList = ref<{ id: string;name: string;value: string }[]>([])
 // 获取技术职务列表
 const getTechnologyJobList = () => {
@@ -50,7 +59,16 @@
     administrationJobList.value = response.data
   })
 }
-
+// 选择负责人自动填充职务信息
+const directorChange = (val: string) => {
+  const selectUser = userList.value.filter(item => item.name === val)[0]
+  getStaffDetail(selectUser).then((res) => {
+    if (res.code === 200) {
+      ruleForm.value.administrationJob = res.data.administrationJob
+      ruleForm.value.technologyJob = res.data.technologyJob
+    }
+  })
+}
 // 提交
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
@@ -95,12 +113,6 @@
 const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
-// const searchQuery = ref({
-//   limit: 10,
-//   offset: 1,
-//   total: 0,
-//   pageSizes: [10, 20, 30],
-// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -410,20 +422,6 @@
     }
   })
 }
-// const handleSizeChange = (val: number) => {
-//   searchQuery.value.limit = val
-//   getDepartmentList()
-//   getuserInfoList()
-//   getInstrumentInfo()
-//   getDeviceInfo()
-// }
-// const handleCurrentChange = (val: number) => {
-//   searchQuery.value.offset = val
-//   getDepartmentList()
-//   getuserInfoList()
-//   getInstrumentInfo()
-//   getDeviceInfo()
-// }
 // 弹窗初始化
 const initDialog = (row: any) => {
   reset()
@@ -460,22 +458,17 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title.split('-')[2] === '编辑'" type="primary" @click="submitForm(ruleFormRef)">
-            提交
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="title">
+      <template #btns>
+        <el-button v-if="title.split('-')[2] === '编辑'" type="primary" @click="submitForm(ruleFormRef)">
+          提交
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title.split('-')[2] === '详情' ? 'isDetail' : '']">
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item :label=" `${title.split('-')[1]}编号`" prop="organizeNo">
               <el-input v-model.trim="ruleForm.organizeNo" placeholder="系统自动生成" disabled />
@@ -487,7 +480,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="title.split('-')[1] === '工程组'" :gutter="24" class="marg">
+        <el-row v-if="title.split('-')[1] === '工程组'" :gutter="24">
           <el-col :span="6">
             <el-form-item label="科室编号">
               <el-input v-model.trim="ruleForm.pDeptId" disabled />
@@ -509,10 +502,10 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
-              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" @change="directorChange">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.name" />
               </el-select>
             </el-form-item>
@@ -532,7 +525,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="24">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
               <el-input v-model.trim="ruleForm.remark" :placeholder="title.split('-')[2] === '详情' ? '' : '备注'" :disabled="title.split('-')[2] === '详情'" />
@@ -540,85 +533,24 @@
           </el-col>
         </el-row>
       </el-form>
-      <!-- 科室信息-人员信息等列表切换 -->
-      <div>
-        <div class="header" style="margin-top: 10px;">
-          <!-- 切换 -->
-          <el-radio-group v-model="current" class="change-btn">
-            <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
-              {{ item.name }}
-            </el-radio-button>
-          </el-radio-group>
-          <div class="title">
-            {{ current }}
-          </div>
-          <span class="btns">
-          <!-- <el-button type="info" :disabled="title === '详情'" @click="removeRow">
-            删除行
-          </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
-            添加行
-          </el-button> -->
-          </span>
-        </div>
-        <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <el-table-column type="index" label="序号" width="55" align="center" />
-          <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
-        </el-table>
-        <!-- <div style="width: 100%;margin-top: 10px;">
-          <el-pagination
-            :current-page="searchQuery.offset"
-            :page-sizes="searchQuery.pageSizes"
-            :page-size="searchQuery.limit"
-            :total="searchQuery.total"
-            layout="total, sizes, prev, pager, next"
-            hide-on-single-page
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-          />
-        </div> -->
-      </div>
-    </div>
+    </detail-page>
+    <detail-block-switch :title="current">
+      <template #menu>
+        <el-radio-group v-model="current" class="change-btn">
+          <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
+            {{ item.name }}
+          </el-radio-button>
+        </el-radio-group>
+      </template>
+      <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
+        <el-table-column type="index" label="序号" width="55" align="center" />
+        <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </detail-block-switch>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-    position: relative;
-
-    .change-btn {
-      position: absolute;
-      left: 40px;
-      top: 4px;
-    }
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 4px;
-    }
-  }
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
@@ -628,8 +560,4 @@
     }
   }
 }
-
-.marg {
-  margin-top: 10px;
-}
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 9ad87af..aac1ef2 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -231,12 +231,14 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
+          <!-- <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
           <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
+          <icon-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 2e3322a..3f472eb 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -41,7 +41,7 @@
   { text: '证书号', value: 'certificateNo', align: 'center' },
   { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
   { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'validDate', align: 'center', width: '200' },
   { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
 ]) // 表格
 const certificateStatusList = ref([
@@ -90,7 +90,7 @@
   loadingTable.value = true
   getCertificateList(searchQuery).then((res) => {
     if (res.code === 200) {
-      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效' }))
+      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效', validDate: item.validDate.split(' ')[0], certificateDate: item.certificateDate.split(' ')[0] }))
       list.value = res.data.records
       total.value = Number(res.data.total)
     }
@@ -115,6 +115,7 @@
   addRef.value.initDialog({
     ...row,
     title: '详情',
+    name: props.isRemind ? '证书状况' : '证书记录',
   })
 }
 // 编辑
@@ -123,6 +124,7 @@
   addRef.value.initDialog({
     ...row,
     title: '编辑',
+    name: props.isRemind ? '证书状况' : '证书记录',
   })
 }
 
@@ -193,6 +195,7 @@
   dialogVisible.value = true
   addRef.value.initDialog({
     title: '新建',
+    name: props.isRemind ? '证书状况' : '证书记录',
   })
 }
 // 导出
@@ -292,21 +295,11 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
-            模板下载
-          </el-button>
-          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
-            打印
-          </el-button>
+          <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
@@ -325,7 +318,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column fixed="right" label="操作" align="center" width="150">
+            <el-table-column fixed="right" label="操作" align="center" width="180">
               <template #default="{ row }">
                 <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
                   提醒
@@ -336,7 +329,7 @@
                 <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 4dc1b17..4352604 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -69,7 +69,16 @@
     const IdCard = ruleForm.value.idCard
     const birthday = `${IdCard.substring(6, 10)}-${IdCard.substring(10, 12)}`
     ruleForm.value.birthday = birthday
-    console.log(ruleForm.value)
+    // 获取性别 第17位  奇数为男 偶数为女
+    // ruleForm.value.sex
+    if (Number(IdCard.substring(16, 17)) % 2) {
+      // 男
+      ruleForm.value.sex = '1'
+    }
+    else {
+      //  女
+      ruleForm.value.sex = '2'
+    }
   })
 }
 const dialogVisible = ref<boolean>(false) // 弹窗显示
@@ -130,7 +139,6 @@
     technologyExam: '', // 技术考核
     remark: '', // 备注
     certificateList: [], // 证书列表
-
   }
 }
 const technologyJobList = ref<technologyJobType[]>([])
@@ -309,7 +317,7 @@
           }
           (title.value === '新建'
             ? getStaffAdd
-            : getStaffupdate) ({ ...ruleForm.value, certificateList: changeList.value[0].data }).then((res) => {
+            : getStaffupdate) ({ ...ruleForm.value, certificateList: changeList.value[0].data, birthday: `${ruleForm.value.idCard.substring(6, 10)}-${ruleForm.value.idCard.substring(10, 12)}-${ruleForm.value.idCard.substring(12, 14)}` }).then((res) => {
             if (res.code == 200) {
               formEl?.resetFields()
               ElMessage.success('提交成功')
@@ -332,12 +340,14 @@
   emits('resetData')
   resetFormData()
 }
+const selectTreeRef = ref()
 // 弹窗初始化
 const initDialog = (row: any) => {
   changeList.value[0].data = []
   dialogVisible.value = true
   title.value = row.title
   resetFormData()
+  selectTreeRef.value?.clearSelected()
   getuser()
   getPubList()
   getSexList()
@@ -370,20 +380,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          计量人员-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
-            完成
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`计量人员-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+          完成
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
         <el-row :gutter="24" class="marg">
           <el-col :span="5">
@@ -394,6 +399,7 @@
                 :http-request="uploadQuarterlyEvaluateFile"
                 :before-upload="beforeAvatarUpload"
                 :disabled="title === '详情'"
+                accept="image/png, image/jpeg,image/jpg"
               >
                 <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
                 <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
@@ -425,8 +431,8 @@
               </el-select>
               <com-tree-select
                 v-else
-                v-model="ruleForm.deptId" :options="PubListTree" placeholder="选择组织机构"
-                :tree-props="deptProps"
+                ref="selectTreeRef" v-model="ruleForm.deptId" :options="PubListTree"
+                placeholder="选择组织机构" :tree-props="deptProps"
               />
             </el-form-item>
             <el-form-item label="计量专业" prop="major" class="marg-item">
@@ -489,29 +495,19 @@
           </el-col>
         </el-row>
       </el-form>
-      <!-- 证书基本信息 -->
-      <!-- 切换 -->
-      <!-- <el-radio-group v-model="current" style="margin-bottom: -15px;">
-          <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
-            {{ item.name }}
-          </el-radio-button>
-        </el-radio-group> -->
-      <div class="header" style="margin-top: 10px;">
-        <div class="title">
-          {{ current }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="info" @click="removeRow">
-            删除行
-          </el-button>
-          <el-button v-if="title !== '详情'" type="primary" @click="addRow">
-            添加行
-          </el-button>
-          <el-button v-if="title !== '详情'" type="primary" @click="editRow">
-            编辑行
-          </el-button>
-        </span>
-      </div>
+    </detail-page>
+    <detail-block :title="current">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="info" @click="removeRow">
+          删除行
+        </el-button>
+        <el-button v-if="title !== '详情'" type="primary" @click="addRow">
+          添加行
+        </el-button>
+        <el-button v-if="title !== '详情'" type="primary" @click="editRow">
+          编辑行
+        </el-button>
+      </template>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
         <el-table-column width="55" align="center">
           <template #default="scope">
@@ -523,7 +519,7 @@
         <el-table-column type="index" label="序号" width="55" />
         <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
       </el-table>
-    </div>
+    </detail-block>
     <!-- 添加证书信息组件 -->
     <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
     <!-- 选择用户列表组件 -->
@@ -532,77 +528,38 @@
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    background-color: #fff;
-    border-radius: 8px;
-    padding-top: 10px;
-    margin-top: 10px;
-    padding-right: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    display: flex;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    position: relative;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 5px;
-    }
-  }
-
-  :deep(.el-radio__label) {
-    display: none;
-  }
-
-  :deep(.el-icon.avatar-uploader-icon) {
-    font-size: 28px;
-    color: #8c939d;
-    width: 190px;
-    height: 250px;
-    text-align: center;
-  }
-
-  :deep(.avatar-uploader .avatar) {
-    width: 190px;
-    height: 250px;
-    display: block;
-  }
-
-  .isDetail {
-    ::v-deep {
-      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-        display: none;
-      }
-    }
-  }
+:deep(.el-radio__label) {
+  display: none;
 }
 
-.marg {
-  margin-top: 20px;
+:deep(.el-icon.avatar-uploader-icon) {
+  font-size: 28px;
+  color: #8c939d;
+  width: 190px;
+  height: 250px;
+  text-align: center;
 }
 
-.marg-item {
-  margin-top: 20px;
+:deep(.avatar-uploader .avatar) {
+  width: 190px;
+  height: 250px;
+  display: block;
+}
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
 }
 </style>
 
 <style scoped>
 .avatar-uploader .avatar {
-  width: 220px;
-  height: 320px;
+  width: 190px;
+  height: 250px;
   display: block;
 }
 </style>
@@ -624,8 +581,8 @@
 .el-icon.avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
-  width: 220px;
-  height: 320px;
+  width: 190px;
+  height: 250px;
   text-align: center;
 }
 </style>

diff --git a/src/components.d.ts b/src/components.d.ts
index 6e85584..815d62f 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -16,14 +16,13 @@
     BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default']
     BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
-    Benchcol: typeof import('./components/benchcol/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/DetailPage/index copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
+    DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
diff --git a/src/components/DetailPage/DetailBlockSwitch.vue b/src/components/DetailPage/DetailBlockSwitch.vue
new file mode 100644
index 0000000..4d92074
--- /dev/null
+++ b/src/components/DetailPage/DetailBlockSwitch.vue
@@ -0,0 +1,71 @@
+<script lang="ts" setup name="DetailBlock">
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+})
+
+const slots = useSlots()
+</script>
+
+<template>
+  <div class="detail-main">
+    <div class="header">
+      <div class="menu">
+        <slot name="menu" />
+      </div>
+      <div class="title">
+        {{ title }}
+      </div>
+      <div class="btns">
+        <slot name="btns" />
+      </div>
+    </div>
+    <div v-if="slots.default" class="content">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-main {
+  background-color: #fff;
+  border-radius: 8px;
+  margin-top: 10px;
+  padding-top: 10px;
+
+  .header {
+    position: relative;
+    height: 40px;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+
+    .title {
+      font-weight: 500;
+    }
+
+    .btns {
+      position: absolute;
+      right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+
+    .menu {
+      position: absolute;
+      left: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+
+  .content {
+    background-color: #fff;
+    padding: 0 10px 20px;
+    margin-top: 10px;
+  }
+}
+</style>
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d6c1c91..1644a80 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -314,6 +314,39 @@
       },
     ],
   },
+  {
+    path: '/borrow',
+    component: Layout,
+    redirect: '/device/borrow/borrowapply',
+    name: 'Borrow',
+    meta: {
+      title: '设备领用',
+      icon: 'ep:key',
+      auth: '/device/borrow',
+    },
+    children: [
+      {
+        path: 'borrowapply',
+        name: 'borroWapply',
+        component: () => import('@/views/device/borrow/borrwoApply.vue'),
+        meta: {
+          title: '设备借用申请',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowapply',
+        },
+      },
+      {
+        path: 'borrowhandle',
+        name: 'borrowHandle',
+        component: () => import('@/views/device/borrow/borrowHandle.vue'),
+        meta: {
+          title: '设备借用处理',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowhandle',
+        },
+      },
+    ],
+  },
 
 ]
 
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
new file mode 100644
index 0000000..1c2405e
--- /dev/null
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="borrowHandle">
+// 逻辑代码
+</script>
+
+<template>
+  <app-container>
+    设备借用处理
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
new file mode 100644
index 0000000..03d414b
--- /dev/null
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="borrowApply">
+// 逻辑代码
+</script>
+
+<template>
+  <app-container>
+    设备借用申请
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index c2682fc..5f7b347 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -339,381 +339,374 @@
 
 <template>
   <div class="body-container">
-    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资产编号" prop="assetNo">
-            <el-input v-model.trim="ruleForm.assetNo" placeholder="系统自动生成" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="资产类型" prop="assetType">
-            <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备编号" prop="equipmentNo">
-            <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备名称" prop="equipmentName">
-            <el-input v-model.trim="ruleForm.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="生产厂家" prop="manufacturer">
-            <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="厂家国别" prop="manufacturerCountry">
-            <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="出厂编号" prop="manufacturingNo">
-            <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="出厂年月" prop="manufacturingDate">
-            <el-date-picker
-              v-model="ruleForm.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '出厂年月'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="型号" prop="modelNo">
-            <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="管理状态" prop="managerState">
-            <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="ABC" prop="abc">
-            <el-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'">
-              <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="标签绑定" prop="labelBind">
-            <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === '详情' ? '' : '标签'" :disabled="title === '详情'" clearable>
-              <template #append>
-                <el-button type="primary" size="small">
-                  扫描
-                </el-button>
-              </template>
-            </el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="立卡年月" prop="cardEstablishmentDate">
-            <el-date-picker
-              v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '立卡年月'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="启用日期" prop="enableDate">
-            <el-date-picker
-              v-model="ruleForm.enableDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '启用日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定方式" prop="mesureType">
-            <el-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'">
-              <el-option v-for="item in mesureTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定周期" prop="mesureCycle">
-            <el-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="12">
-          <el-form-item label="测量范围" prop="mesureRange">
-            <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === '详情' ? '' : '测量范围'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="不确定度" prop="uncertainty">
-            <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === '详情' ? '' : '不确定度'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="使用部门" prop="useDept">
-            <com-tree-select
-              v-if="title !== '详情'"
-              v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-              :tree-props="deptProps"
-            />
-            <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
-              <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="使用人" prop="usePerson">
-            <el-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'">
-              <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="专业分类" prop="majorCategory">
-            <el-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'">
-              <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="检定部门" prop="mesureDept">
-            <com-tree-select
-              v-if="title !== '详情'"
-              v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-              :tree-props="deptProps"
-            />
-            <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
-              <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定日期" prop="mesureDate">
-            <el-date-picker
-              v-model="ruleForm.mesureDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '检定日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="有效日期" prop="validDate">
-            <el-date-picker
-              v-model="ruleForm.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '有效日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定结果" prop="mesureResult">
-            <el-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'">
-              <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="8">
-          <el-form-item label="是否是技术指标需要校准/检定的设备" prop="isCalibrationTestEquipment" label-width="260px">
-            <el-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否是测量工装台账" prop="isMeasureAccount" label-width="260px">
-            <el-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否标准配套设备" prop="isStandardSupportEquipment" label-width="260px">
-            <el-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
+    <detail-block-switch title="基本信息">
+      <template #menu>
+        <slot name="menuswitch" />
+      </template>
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资产编号" prop="assetNo">
+              <el-input v-model.trim="ruleForm.assetNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="资产类型" prop="assetType">
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备编号" prop="equipmentNo">
+              <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="生产厂家" prop="manufacturer">
+              <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="厂家国别" prop="manufacturerCountry">
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号" prop="manufacturingNo">
+              <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂年月" prop="manufacturingDate">
+              <el-date-picker
+                v-model="ruleForm.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '出厂年月'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="型号" prop="modelNo">
+              <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="管理状态" prop="managerState">
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="ABC" prop="abc">
+              <el-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'">
+                <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标签绑定" prop="labelBind">
+              <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === '详情' ? '' : '标签'" :disabled="title === '详情'" clearable>
+                <template #append>
+                  <el-button type="primary" size="small">
+                    扫描
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="立卡年月" prop="cardEstablishmentDate">
+              <el-date-picker
+                v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '立卡年月'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="启用日期" prop="enableDate">
+              <el-date-picker
+                v-model="ruleForm.enableDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '启用日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定方式" prop="mesureType">
+              <el-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'">
+                <el-option v-for="item in mesureTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定周期" prop="mesureCycle">
+              <el-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="测量范围" prop="mesureRange">
+              <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === '详情' ? '' : '测量范围'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="不确定度" prop="uncertainty">
+              <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === '详情' ? '' : '不确定度'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="使用部门" prop="useDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
+                :tree-props="deptProps"
+              />
+              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="使用人" prop="usePerson">
+              <el-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'">
+                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="专业分类" prop="majorCategory">
+              <el-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'">
+                <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="检定部门" prop="mesureDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                :tree-props="deptProps"
+              />
+              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定日期" prop="mesureDate">
+              <el-date-picker
+                v-model="ruleForm.mesureDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '检定日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="有效日期" prop="validDate">
+              <el-date-picker
+                v-model="ruleForm.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '有效日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定结果" prop="mesureResult">
+              <el-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'">
+                <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="8">
+            <el-form-item label="是否是技术指标需要校准/检定的设备" prop="isCalibrationTestEquipment" label-width="260px">
+              <el-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否是测量工装台账" prop="isMeasureAccount" label-width="260px">
+              <el-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否标准配套设备" prop="isStandardSupportEquipment" label-width="260px">
+              <el-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资产来源" prop="assetSource">
-            <el-input v-model.trim="ruleForm.assetSource" :placeholder="title === '详情' ? '' : '资产来源'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备规格" prop="equipmentSpecifications">
-            <el-input v-model.trim="ruleForm.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备类别" prop="equipmentCategory">
-            <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
-              <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备类型" prop="equipmentType">
-            <el-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'">
-              <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资本来源" prop="capitalSource">
-            <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
-              <el-option v-for="item in capitalSourceList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="管理级别" prop="managerLevel">
-            <el-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'">
-              <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="用途" prop="purpose">
-            <el-input v-model.trim="ruleForm.purpose" :placeholder="title === '详情' ? '' : '用途'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="技术水平" prop="technicalLevel">
-            <el-input v-model.trim="ruleForm.technicalLevel" :placeholder="title === '详情' ? '' : '技术水平'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="完好状态" prop="intactState">
-            <el-input v-model.trim="ruleForm.intactState" :placeholder="title === '详情' ? '' : '完好状态'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="外形尺寸" prop="overallDimension">
-            <el-input v-model.trim="ruleForm.overallDimension" :placeholder="title === '详情' ? '' : '外形尺寸'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="重量(吨)" prop="weight">
-            <el-input v-model.trim="ruleForm.weight" :placeholder="title === '详情' ? '' : '重量'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="单价" prop="singlePrice">
-            <el-input v-model.trim="ruleForm.singlePrice" :placeholder="title === '详情' ? '' : '单价'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="安装及杂费" prop="installIncidentalExpenses">
-            <el-input v-model.trim="ruleForm.installIncidentalExpenses" :placeholder="title === '详情' ? '' : '安装及杂费'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="安装地点" prop="installPlace">
-            <el-input v-model.trim="ruleForm.installPlace" :placeholder="title === '详情' ? '' : '安装地点'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="原值" prop="originValue">
-            <el-input v-model.trim="ruleForm.originValue" :placeholder="title === '详情' ? '' : '原值'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="目前原值" prop="presentOriginValue">
-            <el-input v-model.trim="ruleForm.presentOriginValue" :placeholder="title === '详情' ? '' : '目前原值'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="折旧年限" prop="depreciationPeriod">
-            <el-input v-model.trim="ruleForm.depreciationPeriod" :placeholder="title === '详情' ? '' : '折旧年限'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="折旧方法" prop="depreciationMethod">
-            <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
-              <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="属性" prop="attribute">
-            <el-input v-model.trim="ruleForm.attribute" placeholder="属性" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="12">
-          <el-form-item label="说明书" prop="minioFileName">
-            <show-photo :minio-file-name="ruleForm.fileList[0]?.minioFileName || ''" />
-            <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
-            <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
-              {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
-            </el-button>
-            <span v-if="title === '详情' && !ruleForm.fileList[0]?.minioFileName">暂无</span>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="24">
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" placeholder="备注" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资产来源" prop="assetSource">
+              <el-input v-model.trim="ruleForm.assetSource" :placeholder="title === '详情' ? '' : '资产来源'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备规格" prop="equipmentSpecifications">
+              <el-input v-model.trim="ruleForm.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备类别" prop="equipmentCategory">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+                <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备类型" prop="equipmentType">
+              <el-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'">
+                <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资本来源" prop="capitalSource">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+                <el-option v-for="item in capitalSourceList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="管理级别" prop="managerLevel">
+              <el-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'">
+                <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="用途" prop="purpose">
+              <el-input v-model.trim="ruleForm.purpose" :placeholder="title === '详情' ? '' : '用途'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="技术水平" prop="technicalLevel">
+              <el-input v-model.trim="ruleForm.technicalLevel" :placeholder="title === '详情' ? '' : '技术水平'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="完好状态" prop="intactState">
+              <el-input v-model.trim="ruleForm.intactState" :placeholder="title === '详情' ? '' : '完好状态'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="外形尺寸" prop="overallDimension">
+              <el-input v-model.trim="ruleForm.overallDimension" :placeholder="title === '详情' ? '' : '外形尺寸'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="重量(吨)" prop="weight">
+              <el-input v-model.trim="ruleForm.weight" :placeholder="title === '详情' ? '' : '重量'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="单价" prop="singlePrice">
+              <el-input v-model.trim="ruleForm.singlePrice" :placeholder="title === '详情' ? '' : '单价'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="安装及杂费" prop="installIncidentalExpenses">
+              <el-input v-model.trim="ruleForm.installIncidentalExpenses" :placeholder="title === '详情' ? '' : '安装及杂费'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="安装地点" prop="installPlace">
+              <el-input v-model.trim="ruleForm.installPlace" :placeholder="title === '详情' ? '' : '安装地点'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="原值" prop="originValue">
+              <el-input v-model.trim="ruleForm.originValue" :placeholder="title === '详情' ? '' : '原值'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="目前原值" prop="presentOriginValue">
+              <el-input v-model.trim="ruleForm.presentOriginValue" :placeholder="title === '详情' ? '' : '目前原值'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="折旧年限" prop="depreciationPeriod">
+              <el-input v-model.trim="ruleForm.depreciationPeriod" :placeholder="title === '详情' ? '' : '折旧年限'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="折旧方法" prop="depreciationMethod">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+                <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="属性" prop="attribute">
+              <el-input v-model.trim="ruleForm.attribute" placeholder="属性" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="说明书" prop="minioFileName">
+              <show-photo :minio-file-name="ruleForm.fileList[0]?.minioFileName || ''" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
+                {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
+              </el-button>
+              <span v-if="title === '详情' && !ruleForm.fileList[0]?.minioFileName">暂无</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" placeholder="备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block-switch>
   </div>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    padding-top: 20px;
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index f46553a..fc3fd54 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -360,20 +360,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          固定资产-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`固定资产-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -763,44 +758,11 @@
           </el-row>
         </div> -->
       </el-form>
-    </div>
+    </detail-page>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index 0abbdb1..6e88e96 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -74,33 +74,29 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ name }} -{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm">
-            关闭
-          </el-button>
-        </span>
-      </div>
-      <div class="body">
-        <!-- 三级菜单 -->
-        <el-radio-group v-model="current">
-          <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
-            {{ item.name }}
-          </el-radio-button>
-        </el-radio-group>
-      </div>
-      <!-- 展示区域 -->
-      <keep-alive>
-        <component :is="currentComp" ref="currentCompRef" :name="current" :title="title" :row="row" />
-      </keep-alive>
-    </div>
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <!-- 展示区域 -->
+    <keep-alive>
+      <component :is="currentComp" ref="currentCompRef" :name="current" :title="title" :row="row">
+        <template #menuswitch>
+          <!-- 三级菜单 -->
+          <el-radio-group v-model="current">
+            <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+              {{ item.name }}
+            </el-radio-button>
+          </el-radio-group>
+        </template>
+      </component>
+    </keep-alive>
   </app-container>
 </template>
 
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f9cdcd0..f653095 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -256,7 +256,7 @@
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
-  // 原生上传图片
+  // 原生上传
   // console.log(event.target.files)
   // if (event.target.files[0].type === 'application/pdf') {
   if (event.target.files?.length !== 0) {
@@ -354,7 +354,7 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" type="primary" @click="identify">
+          <!-- <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" type="primary" @click="identify">
             标签识别
           </el-button>
           <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/import`)" type="primary" @click="batchImport">
@@ -371,7 +371,13 @@
           </el-button>
           <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/print`)" v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/device/standingBook/components/templateTable.vue b/src/views/device/standingBook/components/templateTable.vue
index 8a928f0..7aa563f 100644
--- a/src/views/device/standingBook/components/templateTable.vue
+++ b/src/views/device/standingBook/components/templateTable.vue
@@ -245,11 +245,11 @@
   <div>
     <!-- 添加证书信息组件 -->
     <add-row ref="addRowRef" @add="addRowData" />
-    <div class="header">
-      <div class="title">
-        <!-- {{ $props.name }} -->
-      </div>
-      <span class="btns">
+    <detail-block-switch :title="name">
+      <template #menu>
+        <slot name="menuswitch" />
+      </template>
+      <template #btns>
         <el-button v-if="title !== '详情'" type="info" @click="removeRow">
           删除行
         </el-button>
@@ -259,55 +259,33 @@
         <el-button v-if="title !== '详情'" type="primary" @click="editRow">
           编辑行
         </el-button>
-      </span>
-    </div>
-    <!-- 表格区域 -->
-    <normal-table
-      id="print"
-      :data="list" :total="total" :columns="columns as any"
-      :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-      :list-loading="loadingTable"
-      style="padding-top: 20px;background-color: #fff;"
-      @change="changePage"
-    >
-      <template #preColumns>
-        <el-table-column label="" width="55" align="center">
-          <template #default="scope">
-            <el-radio v-model="select" :label="scope.$index" class="radio" />
-          </template>
-        </el-table-column>
-        <el-table-column label="序号" width="55" align="center">
-          <template #default="scope">
-            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-          </template>
-        </el-table-column>
       </template>
-    </normal-table>
+      <!-- 表格区域 -->
+      <normal-table
+        id="print"
+        :data="list" :total="total" :columns="columns as any"
+        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+        :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </detail-block-switch>
   </div>
 </template>
 
 <style lang="scss" scoped>
-.header {
-  background-color: #fff;
-  // height: 40px;
-  border-radius: 8px;
-  display: flex;
-  align-items: center;
-  flex-direction: column;
-  justify-content: center;
-  position: relative;
-
-  .title {
-    // font-weight: 700;
-  }
-
-  .btns {
-    position: absolute;
-    right: 40px;
-    top: -22px;
-  }
-}
-
 :deep(.el-radio__label) {
   display: none;
 }
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 7538bc8..78a3800 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -272,24 +272,12 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/identify`)" type="primary" @click="identify">
-            标签识别
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/import`)" type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/mould`)" type="primary" @click="templateDownload">
-            模板下载
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/add`)" type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/export`)" type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/print`)" v-print="printObj" type="primary">
-            打印
-          </el-button>
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/identify`)" icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index fc364c8..e74d70e 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -361,20 +361,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ name }} - {{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -458,73 +453,33 @@
           </el-col>
         </el-row>
       </el-form>
-      <div v-if="title !== '新建' ">
-        <div class="header" style="margin-top: 10px;">
-          <div class="title">
-            审批流程
-          </div>
-        </div>
-        <div class="timeline">
-          <el-timeline>
-            <el-timeline-item timestamp="2018/4/12" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/12 20:46</p>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="2018/4/3" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/3 20:46</p>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="2018/4/2" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/2 20:46</p>
-              </el-card>
-            </el-timeline-item>
-          </el-timeline>
-        </div>
-      </div>
-    </div>
+    </detail-page>
+    <detail-block v-if="title !== '新建' " title="审批流程">
+      <el-timeline>
+        <el-timeline-item timestamp="2018/4/12" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/12 20:46</p>
+          </el-card>
+        </el-timeline-item>
+        <el-timeline-item timestamp="2018/4/3" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/3 20:46</p>
+          </el-card>
+        </el-timeline-item>
+        <el-timeline-item timestamp="2018/4/2" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/2 20:46</p>
+          </el-card>
+        </el-timeline-item>
+      </el-timeline>
+    </detail-block>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .timeline {
   background-color: #fff;
 }
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index aa3963f..737568d 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -1,6 +1,6 @@
 <!-- 状态管理公共列表组件 -->
 <script lang="ts" setup>
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessageBox } from 'element-plus'
 import approve from './approvalActionDialog.vue'
 import addDialog from './templateAdd.vue'
 const props = defineProps({
@@ -142,7 +142,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: any) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     title: '详情',
@@ -150,7 +150,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: any) => {
   dialogVisible.value = true
   // addRef.value.initDialog({
   //   title: '编辑',
@@ -158,7 +158,7 @@
   // })
 }
 // 删除
-const remove = (row) => {
+const remove = (row: any) => {
   ElMessageBox.confirm(
     `确认删除${row.equipmentName}吗？`,
     '提示',
@@ -181,20 +181,20 @@
   // })
 }
 // 同意
-const agree = (row) => {
+const agree = (row: any) => {
   console.log(approveRef.value)
   approveRef.value.initDialog({
     radio: '1',
   })
 }
 // 驳回
-const reject = (row) => {
+const reject = (row: any) => {
   approveRef.value.initDialog({
     radio: '3',
   })
 }
 // 拒绝
-const refuse = (row) => {
+const refuse = (row: any) => {
   approveRef.value.initDialog(
     {
       radio: '2',
@@ -202,7 +202,7 @@
   )
 }
 // 取消
-const cancel = (row) => {
+const cancel = (rowrow: any) => {
   ElMessageBox.confirm(
     '确认取消吗？',
     '提示',
@@ -301,20 +301,20 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+          <el-input placeholder="申请编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="设备编号" clearable class="w-50 m-2" />
+          <el-input placeholder="设备编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.modelNo" placeholder="设备名称" clearable class="w-50 m-2" />
+          <el-input placeholder="设备名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请单位" clearable class="w-50 m-2" />
+          <el-input placeholder="申请单位" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.publisher" placeholder="申请状态" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" />
+          <el-select placeholder="申请状态" clearable>
+            <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" /> -->
           </el-select>
         </search-item>
       </search-area>
@@ -328,7 +328,10 @@
           <el-button type="primary" @click="templateDownload">
             模板下载
           </el-button> -->
-          <el-button type="primary" @click="add">
+          <icon-button icon="icon-add" title="新建" @click="add" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+          <!-- <el-button type="primary" @click="add">
             新建
           </el-button>
           <el-button type="primary" @click="exportExcelBtn">
@@ -336,7 +339,7 @@
           </el-button>
           <el-button v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
         </template>
         <!-- 表格区域 -->
         <normal-table
@@ -386,22 +389,3 @@
     </app-container>
   </div>
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 154px !important;
-}
-
-.normal-date {
-  width: 154px !important;
-}
-
-.normal-select {
-  width: 154px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
-
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 0763c5a..9ef0b93 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -19,7 +19,6 @@
 const effectiveStatusName = ref('')
 const title = ref('')
 const fileList = ref<UploadUserFile[]>([])
-console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -80,10 +79,9 @@
   if (row.title === '新建') {
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
-    ruleForm.publisher = ''
+    ruleForm.publisher = userInfo.$state.deptName
     ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 判断有无存储
-    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
     if (sessionStorage.getItem(fileTypeName.value)) {
       const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
       ruleForm.fileType = session.fileType
@@ -117,6 +115,8 @@
     ruleForm.remark = row.remark
     ruleForm.publishTime = row.publishTime
     ruleForm.minioFileName = row.minioFileName
+    // ruleForm.publisher = '0'
+    // ruleForm.createUserId = '1'
   }
 }
 defineExpose({ initDialog })
@@ -148,6 +148,9 @@
       type: 'warning',
     },
       ).then((res) => {
+        if (ruleForm.publisher === userInfo.$state.deptName) {
+          ruleForm.publisher === userInfo.$state.deptId
+        }
         if (flag == '提交') {
           addApi(ruleForm).then((res) => {
             if (res.code == 200) {
@@ -193,7 +196,6 @@
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        console.log(res.data[0])
         ruleForm.minioFileName = res.data[0]
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
@@ -216,7 +218,6 @@
 // ])
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
-  console.log(diffDat)
   if (diffDat < 0) {
     // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '在使用'
@@ -237,7 +238,7 @@
 
 <template>
   <app-container v-if="dialogVisible" style="overflow: hidden;">
-    <detail-page :title="`${title}${fileTypeName}`">
+    <detail-page :title="`${fileTypeName}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
           提交
@@ -278,12 +279,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="发布单位" prop="publisher">
-              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'" class="fill-input">
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled>
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
               <com-tree-select
                 v-else
-                v-model="ruleForm.publisher" :options="PubListTree" placeholder="选择组织机构"
+                v-model="ruleForm.publisher" :options="PubListTree" placeholder="请选择发布单位"
                 :tree-props="deptProps"
               />
             </el-form-item>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 44e3e4d..b45fbc3 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -324,22 +324,9 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <!-- <el-button type="primary" @click="batchImport">
-            批量导入
-          </el-button> -->
-          <!-- <el-button type="primary" @click="templateDownload">
-            模板下载
-          </el-button> -->
-          <!-- <el-button type="primary" @click="add">
-            新建
-          </el-button> -->
-          <el-button type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-print="printObj" type="primary">
-            打印
-          </el-button>
+          <!-- <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange"> -->
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 4677e48..7d4724b 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -204,13 +204,9 @@
     loading.close()
   })
 }
-// 打印
-const print = () => {
-
-}
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
-  // 原生上传图片
+  // 原生上传
   // console.log(event.target.files)
   // if (event.target.files[0].type === 'application/pdf') {
   if (event.target.files?.length !== 0) {
@@ -264,7 +260,7 @@
         <search-item>
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
-        <search-item>
+        <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
@@ -273,13 +269,13 @@
               :value="item.value"
             />
           </el-select>
-        </search-item>
+        </search-item> -->
         <search-item>
           <el-date-picker
             v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 155px;"
+            style="width: 185px;"
           />
         </search-item>
         <search-item>
@@ -287,19 +283,19 @@
             v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 155px;"
+            style="width: 185px;"
           />
         </search-item>
         <search-item>
-          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select> -->
-          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
+          </el-select>
+          <!-- <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" /> -->
         </search-item>
       </search-area>
       <table-container>
@@ -310,7 +306,7 @@
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
-          <icon-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" @click="print" />
+          <icon-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index cf0dd4f..5ca3275 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -3,11 +3,11 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { detailType } from '../measureDept-interface'
-import { getUserList } from '@/api/system/user'
+// import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
+import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import type { userType } from '@/views/system/user/user-interface'
 import { listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
-import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
 const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -31,11 +31,20 @@
   technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
+// 获取计量人员列表
 const getuser = () => {
-  getUserList({ offset: 1, limit: 99999 }).then((res) => {
-    userList.value = res.data.rows
+  getStaffList({
+    staffNo: '', // 人员编号
+    name: '', // 姓名
+    deptId: ruleForm.value.deptId, // 所在部门
+    limit: 999999,
+    offset: 1,
+  }).then((res) => {
+    if (res.code === 200) {
+      userList.value = res.data.records
+    }
   })
-} // 获取用户列表
+}
 const technologyJobList = ref<{ id: string;name: string;value: string }[]>([])
 // 获取技术职务列表
 const getTechnologyJobList = () => {
@@ -50,7 +59,16 @@
     administrationJobList.value = response.data
   })
 }
-
+// 选择负责人自动填充职务信息
+const directorChange = (val: string) => {
+  const selectUser = userList.value.filter(item => item.name === val)[0]
+  getStaffDetail(selectUser).then((res) => {
+    if (res.code === 200) {
+      ruleForm.value.administrationJob = res.data.administrationJob
+      ruleForm.value.technologyJob = res.data.technologyJob
+    }
+  })
+}
 // 提交
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
@@ -95,12 +113,6 @@
 const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
-// const searchQuery = ref({
-//   limit: 10,
-//   offset: 1,
-//   total: 0,
-//   pageSizes: [10, 20, 30],
-// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -410,20 +422,6 @@
     }
   })
 }
-// const handleSizeChange = (val: number) => {
-//   searchQuery.value.limit = val
-//   getDepartmentList()
-//   getuserInfoList()
-//   getInstrumentInfo()
-//   getDeviceInfo()
-// }
-// const handleCurrentChange = (val: number) => {
-//   searchQuery.value.offset = val
-//   getDepartmentList()
-//   getuserInfoList()
-//   getInstrumentInfo()
-//   getDeviceInfo()
-// }
 // 弹窗初始化
 const initDialog = (row: any) => {
   reset()
@@ -460,22 +458,17 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title.split('-')[2] === '编辑'" type="primary" @click="submitForm(ruleFormRef)">
-            提交
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="title">
+      <template #btns>
+        <el-button v-if="title.split('-')[2] === '编辑'" type="primary" @click="submitForm(ruleFormRef)">
+          提交
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title.split('-')[2] === '详情' ? 'isDetail' : '']">
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item :label=" `${title.split('-')[1]}编号`" prop="organizeNo">
               <el-input v-model.trim="ruleForm.organizeNo" placeholder="系统自动生成" disabled />
@@ -487,7 +480,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="title.split('-')[1] === '工程组'" :gutter="24" class="marg">
+        <el-row v-if="title.split('-')[1] === '工程组'" :gutter="24">
           <el-col :span="6">
             <el-form-item label="科室编号">
               <el-input v-model.trim="ruleForm.pDeptId" disabled />
@@ -509,10 +502,10 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
-              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" @change="directorChange">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.name" />
               </el-select>
             </el-form-item>
@@ -532,7 +525,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="24">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
               <el-input v-model.trim="ruleForm.remark" :placeholder="title.split('-')[2] === '详情' ? '' : '备注'" :disabled="title.split('-')[2] === '详情'" />
@@ -540,85 +533,24 @@
           </el-col>
         </el-row>
       </el-form>
-      <!-- 科室信息-人员信息等列表切换 -->
-      <div>
-        <div class="header" style="margin-top: 10px;">
-          <!-- 切换 -->
-          <el-radio-group v-model="current" class="change-btn">
-            <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
-              {{ item.name }}
-            </el-radio-button>
-          </el-radio-group>
-          <div class="title">
-            {{ current }}
-          </div>
-          <span class="btns">
-          <!-- <el-button type="info" :disabled="title === '详情'" @click="removeRow">
-            删除行
-          </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
-            添加行
-          </el-button> -->
-          </span>
-        </div>
-        <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <el-table-column type="index" label="序号" width="55" align="center" />
-          <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
-        </el-table>
-        <!-- <div style="width: 100%;margin-top: 10px;">
-          <el-pagination
-            :current-page="searchQuery.offset"
-            :page-sizes="searchQuery.pageSizes"
-            :page-size="searchQuery.limit"
-            :total="searchQuery.total"
-            layout="total, sizes, prev, pager, next"
-            hide-on-single-page
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-          />
-        </div> -->
-      </div>
-    </div>
+    </detail-page>
+    <detail-block-switch :title="current">
+      <template #menu>
+        <el-radio-group v-model="current" class="change-btn">
+          <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
+            {{ item.name }}
+          </el-radio-button>
+        </el-radio-group>
+      </template>
+      <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
+        <el-table-column type="index" label="序号" width="55" align="center" />
+        <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </detail-block-switch>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-    position: relative;
-
-    .change-btn {
-      position: absolute;
-      left: 40px;
-      top: 4px;
-    }
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 4px;
-    }
-  }
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
@@ -628,8 +560,4 @@
     }
   }
 }
-
-.marg {
-  margin-top: 10px;
-}
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 9ad87af..aac1ef2 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -231,12 +231,14 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
+          <!-- <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
           <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
+          <icon-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 2e3322a..3f472eb 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -41,7 +41,7 @@
   { text: '证书号', value: 'certificateNo', align: 'center' },
   { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
   { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'validDate', align: 'center', width: '200' },
   { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
 ]) // 表格
 const certificateStatusList = ref([
@@ -90,7 +90,7 @@
   loadingTable.value = true
   getCertificateList(searchQuery).then((res) => {
     if (res.code === 200) {
-      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效' }))
+      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效', validDate: item.validDate.split(' ')[0], certificateDate: item.certificateDate.split(' ')[0] }))
       list.value = res.data.records
       total.value = Number(res.data.total)
     }
@@ -115,6 +115,7 @@
   addRef.value.initDialog({
     ...row,
     title: '详情',
+    name: props.isRemind ? '证书状况' : '证书记录',
   })
 }
 // 编辑
@@ -123,6 +124,7 @@
   addRef.value.initDialog({
     ...row,
     title: '编辑',
+    name: props.isRemind ? '证书状况' : '证书记录',
   })
 }
 
@@ -193,6 +195,7 @@
   dialogVisible.value = true
   addRef.value.initDialog({
     title: '新建',
+    name: props.isRemind ? '证书状况' : '证书记录',
   })
 }
 // 导出
@@ -292,21 +295,11 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
-            模板下载
-          </el-button>
-          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
-            打印
-          </el-button>
+          <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
@@ -325,7 +318,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column fixed="right" label="操作" align="center" width="150">
+            <el-table-column fixed="right" label="操作" align="center" width="180">
               <template #default="{ row }">
                 <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
                   提醒
@@ -336,7 +329,7 @@
                 <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 4dc1b17..4352604 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -69,7 +69,16 @@
     const IdCard = ruleForm.value.idCard
     const birthday = `${IdCard.substring(6, 10)}-${IdCard.substring(10, 12)}`
     ruleForm.value.birthday = birthday
-    console.log(ruleForm.value)
+    // 获取性别 第17位  奇数为男 偶数为女
+    // ruleForm.value.sex
+    if (Number(IdCard.substring(16, 17)) % 2) {
+      // 男
+      ruleForm.value.sex = '1'
+    }
+    else {
+      //  女
+      ruleForm.value.sex = '2'
+    }
   })
 }
 const dialogVisible = ref<boolean>(false) // 弹窗显示
@@ -130,7 +139,6 @@
     technologyExam: '', // 技术考核
     remark: '', // 备注
     certificateList: [], // 证书列表
-
   }
 }
 const technologyJobList = ref<technologyJobType[]>([])
@@ -309,7 +317,7 @@
           }
           (title.value === '新建'
             ? getStaffAdd
-            : getStaffupdate) ({ ...ruleForm.value, certificateList: changeList.value[0].data }).then((res) => {
+            : getStaffupdate) ({ ...ruleForm.value, certificateList: changeList.value[0].data, birthday: `${ruleForm.value.idCard.substring(6, 10)}-${ruleForm.value.idCard.substring(10, 12)}-${ruleForm.value.idCard.substring(12, 14)}` }).then((res) => {
             if (res.code == 200) {
               formEl?.resetFields()
               ElMessage.success('提交成功')
@@ -332,12 +340,14 @@
   emits('resetData')
   resetFormData()
 }
+const selectTreeRef = ref()
 // 弹窗初始化
 const initDialog = (row: any) => {
   changeList.value[0].data = []
   dialogVisible.value = true
   title.value = row.title
   resetFormData()
+  selectTreeRef.value?.clearSelected()
   getuser()
   getPubList()
   getSexList()
@@ -370,20 +380,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          计量人员-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
-            完成
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`计量人员-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+          完成
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
         <el-row :gutter="24" class="marg">
           <el-col :span="5">
@@ -394,6 +399,7 @@
                 :http-request="uploadQuarterlyEvaluateFile"
                 :before-upload="beforeAvatarUpload"
                 :disabled="title === '详情'"
+                accept="image/png, image/jpeg,image/jpg"
               >
                 <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
                 <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
@@ -425,8 +431,8 @@
               </el-select>
               <com-tree-select
                 v-else
-                v-model="ruleForm.deptId" :options="PubListTree" placeholder="选择组织机构"
-                :tree-props="deptProps"
+                ref="selectTreeRef" v-model="ruleForm.deptId" :options="PubListTree"
+                placeholder="选择组织机构" :tree-props="deptProps"
               />
             </el-form-item>
             <el-form-item label="计量专业" prop="major" class="marg-item">
@@ -489,29 +495,19 @@
           </el-col>
         </el-row>
       </el-form>
-      <!-- 证书基本信息 -->
-      <!-- 切换 -->
-      <!-- <el-radio-group v-model="current" style="margin-bottom: -15px;">
-          <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
-            {{ item.name }}
-          </el-radio-button>
-        </el-radio-group> -->
-      <div class="header" style="margin-top: 10px;">
-        <div class="title">
-          {{ current }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="info" @click="removeRow">
-            删除行
-          </el-button>
-          <el-button v-if="title !== '详情'" type="primary" @click="addRow">
-            添加行
-          </el-button>
-          <el-button v-if="title !== '详情'" type="primary" @click="editRow">
-            编辑行
-          </el-button>
-        </span>
-      </div>
+    </detail-page>
+    <detail-block :title="current">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="info" @click="removeRow">
+          删除行
+        </el-button>
+        <el-button v-if="title !== '详情'" type="primary" @click="addRow">
+          添加行
+        </el-button>
+        <el-button v-if="title !== '详情'" type="primary" @click="editRow">
+          编辑行
+        </el-button>
+      </template>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
         <el-table-column width="55" align="center">
           <template #default="scope">
@@ -523,7 +519,7 @@
         <el-table-column type="index" label="序号" width="55" />
         <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
       </el-table>
-    </div>
+    </detail-block>
     <!-- 添加证书信息组件 -->
     <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
     <!-- 选择用户列表组件 -->
@@ -532,77 +528,38 @@
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    background-color: #fff;
-    border-radius: 8px;
-    padding-top: 10px;
-    margin-top: 10px;
-    padding-right: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    display: flex;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    position: relative;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 5px;
-    }
-  }
-
-  :deep(.el-radio__label) {
-    display: none;
-  }
-
-  :deep(.el-icon.avatar-uploader-icon) {
-    font-size: 28px;
-    color: #8c939d;
-    width: 190px;
-    height: 250px;
-    text-align: center;
-  }
-
-  :deep(.avatar-uploader .avatar) {
-    width: 190px;
-    height: 250px;
-    display: block;
-  }
-
-  .isDetail {
-    ::v-deep {
-      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-        display: none;
-      }
-    }
-  }
+:deep(.el-radio__label) {
+  display: none;
 }
 
-.marg {
-  margin-top: 20px;
+:deep(.el-icon.avatar-uploader-icon) {
+  font-size: 28px;
+  color: #8c939d;
+  width: 190px;
+  height: 250px;
+  text-align: center;
 }
 
-.marg-item {
-  margin-top: 20px;
+:deep(.avatar-uploader .avatar) {
+  width: 190px;
+  height: 250px;
+  display: block;
+}
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
 }
 </style>
 
 <style scoped>
 .avatar-uploader .avatar {
-  width: 220px;
-  height: 320px;
+  width: 190px;
+  height: 250px;
   display: block;
 }
 </style>
@@ -624,8 +581,8 @@
 .el-icon.avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
-  width: 220px;
-  height: 320px;
+  width: 190px;
+  height: 250px;
   text-align: center;
 }
 </style>
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index ae48f11..042636e 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -4,7 +4,6 @@
 import dayjs from 'dayjs'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import type { technologyJobType } from '../person-interface'
-import certificateAddDialog from './certificateAddDialog.vue'
 import personListDialog from './personListDialog.vue'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
@@ -14,7 +13,8 @@
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
-const ruleFormRef = ref<FormInstance>() // from组件
+const ruleFormRef1 = ref<FormInstance>() // from组件
+const ruleFormRef2 = ref<FormInstance>() // from组件
 const meterStaff = ref({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -28,26 +28,43 @@
   workDate: '', // 从事日期
   id: '',
 })
+const baseInfo = ref({
+  certificateCompany: '',
+  certificateDate: '',
+  certificateName: '',
+  certificateNo: '',
+  validDate: '',
+  id: '',
+  isDel: 0,
+  minioFileName: '',
+  remark: '',
+})
 const ruleForm = ref({
   meterStaff: {}, // 人员信息
   staffId: '', // 计量人员id
 }) // 表单
-const multipleTableRef = ref<InstanceType<typeof ElTable>>()
 const title = ref('')
+const name = ref('')
 // 身份证号码验证规则
-const validateIDcard = (rule: any, value: any, callback: any) => {
-  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
-  if (rr.test(value)) {
-    callback()
-  }
-  else {
-    callback(new Error('验证失败'))
-  }
-}
+// const validateIDcard = (rule: any, value: any, callback: any) => {
+//   const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+//   if (rr.test(value)) {
+//     callback()
+//   }
+//   else {
+//     callback(new Error('验证失败'))
+//   }
+// }
 const rules = ref({
   staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
   // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
-
+}) // 表单验证规则
+const rules2 = ref({
+  certificateCompany: [{ required: true, message: '发证单位不能为空', trigger: 'blur' }],
+  certificateDate: [{ required: true, message: '发证日期不能为空', trigger: 'blur' }],
+  certificateName: [{ required: true, message: '证书名称不能为空', trigger: 'blur' }],
+  certificateNo: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
+  validDate: [{ required: true, message: '有效日期不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
 const userList = ref<userType[]>([]) // 可使用人列表
@@ -96,6 +113,17 @@
   meterStaff.value.major = ''
   meterStaff.value.workDate = ''
   meterStaff.value.id = ''
+  baseInfo.value = {
+    certificateCompany: '',
+    certificateDate: '',
+    certificateName: '',
+    certificateNo: '',
+    validDate: '',
+    id: '',
+    isDel: 0,
+    minioFileName: '',
+    remark: '',
+  }
 }
 const technologyJobList = ref<technologyJobType[]>([])
 // 获取技术职务列表
@@ -120,98 +148,14 @@
 const confirmPerson = (row: any) => {
   ruleForm.value.staffId = row.staffNo
   meterStaff.value = row
-  ruleFormRef.value?.clearValidate('staffNo')
+  ruleFormRef1.value?.clearValidate('staffNo')
 }
-const changeList = ref([
-  {
-    name: '证书基本信息',
-    data: [] as any[],
-    column: [
-      {
-        label: '证书号',
-        data: 'certificateNo',
-        id: 'zs02',
-      },
-      {
-        label: '证书名称',
-        data: 'certificateName',
-        id: 'zs03',
-      },
-      {
-        label: '发证日期',
-        data: 'certificateDate',
-        id: 'zs04',
-      },
-      {
-        label: '发证单位',
-        data: 'certificateCompany',
-        id: 'zs01',
-      },
-      {
-        label: '有效日期',
-        data: 'validDate',
-        id: 'zs05',
-      },
-    ],
-  },
-  {
-    name: '计量工作培训记录',
-    data: [],
-    column: [],
-  },
-  {
-    name: '业务记录',
-    data: [],
-    column: [],
-  },
-])
-const current = ref('证书基本信息')
-const currentShow = computed(() => {
-  return changeList.value.filter(item => item.name === current.value)[0]
-})
-const certificateRef = ref() // 添加证书信息弹窗
-// 添加行
-const addRow = () => {
-  certificateRef.value.initDialog({ title: '添加' })
-}
-// 编辑行
-const editRow = () => {
-  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
-}
-// 证书信息行内添加数据
-const addRowcertificate = (row: any, flag: string) => {
-  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
-  if (flag === 'update') {
-    changeList.value[0].data = [{
-      ...changeList.value[0].data[0],
-      ...row,
-      certificateStatus: diff < 0 ? '1' : '0',
-      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-    }]
-  }
-  else {
-    changeList.value[0].data.push(
-      {
-        ...row,
-        certificateStatus: diff < 0 ? '1' : '0',
-        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-        id: null,
-        isDel: 0,
-        minioFileName: '',
-        remark: '',
-        staffId: meterStaff.value.id,
-        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-      })
-  }
-}
-const currenSelect = ref<number>(-1) // 当前选中行
-// 删除行
-const removeRow = () => {
-  console.log(currenSelect.value)
-  if (currenSelect.value >= 0) {
+// 提交
+const submitForm = async (formEl1: FormInstance | undefined, formEl2: FormInstance | undefined) => {
+  if (!formEl1 || !formEl2) { return }
+  Promise.all([formEl1.validate(), formEl2.validate()]).then((res) => {
     ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
+      '确认提交吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -219,78 +163,49 @@
         type: 'warning',
       },
     ).then(() => {
-      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
-      currenSelect.value = -1
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 提交
-const submitForm = async (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  await formEl.validate((valid, fields) => {
-    if (valid) {
-      ElMessageBox.confirm(
-        '确认提交吗？',
-        '提示',
-        {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        },
-      ).then(() => {
-        let params
-        if (changeList.value[0].data.length) {
-          params = changeList.value[0].data
-        }
-        else {
-          params = [
-            {
-              certificateCompany: '',
-              certificateDate: '',
-              certificateName: '',
-              certificateNo: '',
-              certificateStatus: '',
-              createTime: '',
-              id: null,
-              isDel: 0,
-              minioFileName: '',
-              remark: '',
-              staffId: meterStaff.value.id,
-              updateTime: '',
-              validDate: '',
-            },
-          ]
-        }
-        (title.value === '新建'
-          ? addCertificateList
-          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
-          formEl?.resetFields()
-          ElMessage.success('提交成功')
-          emits('resetData')
-          resetFormData()
-        })
+      (title.value === '新建'
+        ? addCertificateList
+        : getCertificateUpdate)(title.value === '新建'
+        ? [{
+            ...baseInfo.value,
+            staffId: meterStaff.value.id,
+            createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+            updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+            certificateStatus: dayjs(baseInfo.value.validDate).diff(baseInfo.value.certificateDate, 'day') < 0 ? '1' : '0',
+            meterStaff: undefined,
+          }]
+        : {
+            ...baseInfo.value,
+            staffId: meterStaff.value.id,
+            createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+            updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+            certificateStatus: dayjs(baseInfo.value.validDate).diff(baseInfo.value.certificateDate, 'day') < 0 ? '1' : '0',
+            meterStaff: undefined,
+          }).then((res) => {
+        formEl1?.resetFields()
+        formEl2?.resetFields()
+        ElMessage.success('提交成功')
+        emits('resetData')
+        resetFormData()
       })
-    }
+    })
   })
 }
 // 取消
-const resetForm = (formEl: FormInstance | undefined) => {
+const resetForm = (formEl: FormInstance | undefined, formEl2: FormInstance | undefined) => {
   formEl?.resetFields()
-  changeList.value[0].data = []
+  formEl2?.resetFields()
   emits('resetData')
   resetFormData()
 }
+const selectTreeRef = ref()
 // 弹窗初始化
 const initDialog = (row: any) => {
-  changeList.value[0].data = []
   resetFormData()
   dialogVisible.value = true
   title.value = row.title
-  resetFormData()
+  name.value = row.name
+  selectTreeRef.value?.clearSelected()
   getuser()
   getPubList()
   getSexList()
@@ -303,8 +218,9 @@
   else {
     getCertificateDetail({ id: row.id }).then((res) => {
       if (res.code === 200) {
+        console.log(res, '证书记录')
         meterStaff.value = res.data.meterStaff
-        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+        baseInfo.value = res.data
       }
     })
   }
@@ -314,21 +230,16 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          证书记录-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
-            完成
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
-      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+    <detail-page :title=" `${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
+          完成
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef1, ruleFormRef2)">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef1" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="人员编号" prop="staffNo">
@@ -390,7 +301,8 @@
               </el-select>
               <com-tree-select
                 v-else
-                v-model="meterStaff.deptId" :options="PubListTree" placeholder="选择组织机构"
+                ref="selectTreeRef" v-model="meterStaff.deptId" :options="PubListTree"
+                placeholder="选择组织机构"
                 :tree-props="deptProps"
               />
             </el-form-item>
@@ -410,71 +322,52 @@
           </el-col>
         </el-row>
       </el-form>
-      <div class="header" style="margin-top: 10px;">
-        <div class="title">
-          {{ current }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title === '新建'" type="info" @click="removeRow">
-            删除行
-          </el-button>
-          <el-button v-if="title === '新建'" type="primary" @click="addRow">
-            添加行
-          </el-button>
-          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
-            编辑行
-          </el-button>
-        </span>
-      </div>
-      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
-        <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column>
-        <el-table-column type="index" label="序号" width="55" />
-        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
-      </el-table>
-    </div>
-    <!-- 添加证书信息组件 -->
-    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    </detail-page>
+    <detail-block title="证书基本信息">
+      <el-form ref="ruleFormRef2" :model="baseInfo" :rules="rules2" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="证书号" prop="certificateNo">
+              <el-input v-model.trim="baseInfo.certificateNo" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书名称" prop="certificateName">
+              <el-input v-model.trim="baseInfo.certificateName" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证单位" prop="certificateCompany">
+              <el-input v-model.trim="baseInfo.certificateCompany" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发证日期" prop="certificateDate">
+              <el-date-picker
+                v-model="baseInfo.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择发证日期"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书有效日期" prop="validDate">
+              <el-date-picker
+                v-model="baseInfo.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择有效日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block>
     <!-- 选择用户列表组件 -->
     <person-list-dialog ref="personListRef" @add="confirmPerson" />
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    background-color: #fff;
-    border-radius: 8px;
-    padding-top: 10px;
-    margin-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    display: flex;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    position: relative;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 5px;
-    }
-  }
-
   :deep(.el-radio__label) {
     display: none;
   }
@@ -487,40 +380,5 @@
       }
     }
   }
-}
-
-.marg {
-  margin-top: 20px;
-}
 </style>
 
-<style scoped>
-.avatar-uploader .avatar {
-  width: 178px;
-  height: 178px;
-  display: block;
-}
-</style>
-
-<style>
-.avatar-uploader .el-upload {
-  border: 1px dashed var(--el-border-color);
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-  transition: var(--el-transition-duration-fast);
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: var(--el-color-primary);
-}
-
-.el-icon.avatar-uploader-icon {
-  font-size: 28px;
-  color: #8c939d;
-  width: 178px;
-  height: 178px;
-  text-align: center;
-}
-</style>

diff --git a/src/components.d.ts b/src/components.d.ts
index 6e85584..815d62f 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -16,14 +16,13 @@
     BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default']
     BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
-    Benchcol: typeof import('./components/benchcol/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/DetailPage/index copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
+    DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
diff --git a/src/components/DetailPage/DetailBlockSwitch.vue b/src/components/DetailPage/DetailBlockSwitch.vue
new file mode 100644
index 0000000..4d92074
--- /dev/null
+++ b/src/components/DetailPage/DetailBlockSwitch.vue
@@ -0,0 +1,71 @@
+<script lang="ts" setup name="DetailBlock">
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+})
+
+const slots = useSlots()
+</script>
+
+<template>
+  <div class="detail-main">
+    <div class="header">
+      <div class="menu">
+        <slot name="menu" />
+      </div>
+      <div class="title">
+        {{ title }}
+      </div>
+      <div class="btns">
+        <slot name="btns" />
+      </div>
+    </div>
+    <div v-if="slots.default" class="content">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-main {
+  background-color: #fff;
+  border-radius: 8px;
+  margin-top: 10px;
+  padding-top: 10px;
+
+  .header {
+    position: relative;
+    height: 40px;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+
+    .title {
+      font-weight: 500;
+    }
+
+    .btns {
+      position: absolute;
+      right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+
+    .menu {
+      position: absolute;
+      left: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+
+  .content {
+    background-color: #fff;
+    padding: 0 10px 20px;
+    margin-top: 10px;
+  }
+}
+</style>
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d6c1c91..1644a80 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -314,6 +314,39 @@
       },
     ],
   },
+  {
+    path: '/borrow',
+    component: Layout,
+    redirect: '/device/borrow/borrowapply',
+    name: 'Borrow',
+    meta: {
+      title: '设备领用',
+      icon: 'ep:key',
+      auth: '/device/borrow',
+    },
+    children: [
+      {
+        path: 'borrowapply',
+        name: 'borroWapply',
+        component: () => import('@/views/device/borrow/borrwoApply.vue'),
+        meta: {
+          title: '设备借用申请',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowapply',
+        },
+      },
+      {
+        path: 'borrowhandle',
+        name: 'borrowHandle',
+        component: () => import('@/views/device/borrow/borrowHandle.vue'),
+        meta: {
+          title: '设备借用处理',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowhandle',
+        },
+      },
+    ],
+  },
 
 ]
 
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
new file mode 100644
index 0000000..1c2405e
--- /dev/null
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="borrowHandle">
+// 逻辑代码
+</script>
+
+<template>
+  <app-container>
+    设备借用处理
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
new file mode 100644
index 0000000..03d414b
--- /dev/null
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="borrowApply">
+// 逻辑代码
+</script>
+
+<template>
+  <app-container>
+    设备借用申请
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index c2682fc..5f7b347 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -339,381 +339,374 @@
 
 <template>
   <div class="body-container">
-    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资产编号" prop="assetNo">
-            <el-input v-model.trim="ruleForm.assetNo" placeholder="系统自动生成" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="资产类型" prop="assetType">
-            <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备编号" prop="equipmentNo">
-            <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备名称" prop="equipmentName">
-            <el-input v-model.trim="ruleForm.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="生产厂家" prop="manufacturer">
-            <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="厂家国别" prop="manufacturerCountry">
-            <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="出厂编号" prop="manufacturingNo">
-            <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="出厂年月" prop="manufacturingDate">
-            <el-date-picker
-              v-model="ruleForm.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '出厂年月'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="型号" prop="modelNo">
-            <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="管理状态" prop="managerState">
-            <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="ABC" prop="abc">
-            <el-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'">
-              <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="标签绑定" prop="labelBind">
-            <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === '详情' ? '' : '标签'" :disabled="title === '详情'" clearable>
-              <template #append>
-                <el-button type="primary" size="small">
-                  扫描
-                </el-button>
-              </template>
-            </el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="立卡年月" prop="cardEstablishmentDate">
-            <el-date-picker
-              v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '立卡年月'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="启用日期" prop="enableDate">
-            <el-date-picker
-              v-model="ruleForm.enableDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '启用日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定方式" prop="mesureType">
-            <el-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'">
-              <el-option v-for="item in mesureTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定周期" prop="mesureCycle">
-            <el-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="12">
-          <el-form-item label="测量范围" prop="mesureRange">
-            <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === '详情' ? '' : '测量范围'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="不确定度" prop="uncertainty">
-            <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === '详情' ? '' : '不确定度'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="使用部门" prop="useDept">
-            <com-tree-select
-              v-if="title !== '详情'"
-              v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-              :tree-props="deptProps"
-            />
-            <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
-              <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="使用人" prop="usePerson">
-            <el-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'">
-              <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="专业分类" prop="majorCategory">
-            <el-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'">
-              <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="检定部门" prop="mesureDept">
-            <com-tree-select
-              v-if="title !== '详情'"
-              v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-              :tree-props="deptProps"
-            />
-            <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
-              <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定日期" prop="mesureDate">
-            <el-date-picker
-              v-model="ruleForm.mesureDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '检定日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="有效日期" prop="validDate">
-            <el-date-picker
-              v-model="ruleForm.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '有效日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定结果" prop="mesureResult">
-            <el-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'">
-              <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="8">
-          <el-form-item label="是否是技术指标需要校准/检定的设备" prop="isCalibrationTestEquipment" label-width="260px">
-            <el-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否是测量工装台账" prop="isMeasureAccount" label-width="260px">
-            <el-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否标准配套设备" prop="isStandardSupportEquipment" label-width="260px">
-            <el-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
+    <detail-block-switch title="基本信息">
+      <template #menu>
+        <slot name="menuswitch" />
+      </template>
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资产编号" prop="assetNo">
+              <el-input v-model.trim="ruleForm.assetNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="资产类型" prop="assetType">
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备编号" prop="equipmentNo">
+              <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="生产厂家" prop="manufacturer">
+              <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="厂家国别" prop="manufacturerCountry">
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号" prop="manufacturingNo">
+              <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂年月" prop="manufacturingDate">
+              <el-date-picker
+                v-model="ruleForm.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '出厂年月'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="型号" prop="modelNo">
+              <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="管理状态" prop="managerState">
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="ABC" prop="abc">
+              <el-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'">
+                <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标签绑定" prop="labelBind">
+              <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === '详情' ? '' : '标签'" :disabled="title === '详情'" clearable>
+                <template #append>
+                  <el-button type="primary" size="small">
+                    扫描
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="立卡年月" prop="cardEstablishmentDate">
+              <el-date-picker
+                v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '立卡年月'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="启用日期" prop="enableDate">
+              <el-date-picker
+                v-model="ruleForm.enableDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '启用日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定方式" prop="mesureType">
+              <el-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'">
+                <el-option v-for="item in mesureTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定周期" prop="mesureCycle">
+              <el-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="测量范围" prop="mesureRange">
+              <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === '详情' ? '' : '测量范围'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="不确定度" prop="uncertainty">
+              <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === '详情' ? '' : '不确定度'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="使用部门" prop="useDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
+                :tree-props="deptProps"
+              />
+              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="使用人" prop="usePerson">
+              <el-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'">
+                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="专业分类" prop="majorCategory">
+              <el-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'">
+                <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="检定部门" prop="mesureDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                :tree-props="deptProps"
+              />
+              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定日期" prop="mesureDate">
+              <el-date-picker
+                v-model="ruleForm.mesureDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '检定日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="有效日期" prop="validDate">
+              <el-date-picker
+                v-model="ruleForm.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '有效日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定结果" prop="mesureResult">
+              <el-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'">
+                <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="8">
+            <el-form-item label="是否是技术指标需要校准/检定的设备" prop="isCalibrationTestEquipment" label-width="260px">
+              <el-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否是测量工装台账" prop="isMeasureAccount" label-width="260px">
+              <el-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否标准配套设备" prop="isStandardSupportEquipment" label-width="260px">
+              <el-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资产来源" prop="assetSource">
-            <el-input v-model.trim="ruleForm.assetSource" :placeholder="title === '详情' ? '' : '资产来源'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备规格" prop="equipmentSpecifications">
-            <el-input v-model.trim="ruleForm.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备类别" prop="equipmentCategory">
-            <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
-              <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备类型" prop="equipmentType">
-            <el-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'">
-              <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资本来源" prop="capitalSource">
-            <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
-              <el-option v-for="item in capitalSourceList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="管理级别" prop="managerLevel">
-            <el-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'">
-              <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="用途" prop="purpose">
-            <el-input v-model.trim="ruleForm.purpose" :placeholder="title === '详情' ? '' : '用途'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="技术水平" prop="technicalLevel">
-            <el-input v-model.trim="ruleForm.technicalLevel" :placeholder="title === '详情' ? '' : '技术水平'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="完好状态" prop="intactState">
-            <el-input v-model.trim="ruleForm.intactState" :placeholder="title === '详情' ? '' : '完好状态'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="外形尺寸" prop="overallDimension">
-            <el-input v-model.trim="ruleForm.overallDimension" :placeholder="title === '详情' ? '' : '外形尺寸'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="重量(吨)" prop="weight">
-            <el-input v-model.trim="ruleForm.weight" :placeholder="title === '详情' ? '' : '重量'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="单价" prop="singlePrice">
-            <el-input v-model.trim="ruleForm.singlePrice" :placeholder="title === '详情' ? '' : '单价'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="安装及杂费" prop="installIncidentalExpenses">
-            <el-input v-model.trim="ruleForm.installIncidentalExpenses" :placeholder="title === '详情' ? '' : '安装及杂费'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="安装地点" prop="installPlace">
-            <el-input v-model.trim="ruleForm.installPlace" :placeholder="title === '详情' ? '' : '安装地点'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="原值" prop="originValue">
-            <el-input v-model.trim="ruleForm.originValue" :placeholder="title === '详情' ? '' : '原值'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="目前原值" prop="presentOriginValue">
-            <el-input v-model.trim="ruleForm.presentOriginValue" :placeholder="title === '详情' ? '' : '目前原值'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="折旧年限" prop="depreciationPeriod">
-            <el-input v-model.trim="ruleForm.depreciationPeriod" :placeholder="title === '详情' ? '' : '折旧年限'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="折旧方法" prop="depreciationMethod">
-            <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
-              <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="属性" prop="attribute">
-            <el-input v-model.trim="ruleForm.attribute" placeholder="属性" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="12">
-          <el-form-item label="说明书" prop="minioFileName">
-            <show-photo :minio-file-name="ruleForm.fileList[0]?.minioFileName || ''" />
-            <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
-            <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
-              {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
-            </el-button>
-            <span v-if="title === '详情' && !ruleForm.fileList[0]?.minioFileName">暂无</span>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="24">
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" placeholder="备注" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资产来源" prop="assetSource">
+              <el-input v-model.trim="ruleForm.assetSource" :placeholder="title === '详情' ? '' : '资产来源'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备规格" prop="equipmentSpecifications">
+              <el-input v-model.trim="ruleForm.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备类别" prop="equipmentCategory">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+                <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备类型" prop="equipmentType">
+              <el-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'">
+                <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资本来源" prop="capitalSource">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+                <el-option v-for="item in capitalSourceList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="管理级别" prop="managerLevel">
+              <el-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'">
+                <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="用途" prop="purpose">
+              <el-input v-model.trim="ruleForm.purpose" :placeholder="title === '详情' ? '' : '用途'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="技术水平" prop="technicalLevel">
+              <el-input v-model.trim="ruleForm.technicalLevel" :placeholder="title === '详情' ? '' : '技术水平'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="完好状态" prop="intactState">
+              <el-input v-model.trim="ruleForm.intactState" :placeholder="title === '详情' ? '' : '完好状态'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="外形尺寸" prop="overallDimension">
+              <el-input v-model.trim="ruleForm.overallDimension" :placeholder="title === '详情' ? '' : '外形尺寸'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="重量(吨)" prop="weight">
+              <el-input v-model.trim="ruleForm.weight" :placeholder="title === '详情' ? '' : '重量'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="单价" prop="singlePrice">
+              <el-input v-model.trim="ruleForm.singlePrice" :placeholder="title === '详情' ? '' : '单价'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="安装及杂费" prop="installIncidentalExpenses">
+              <el-input v-model.trim="ruleForm.installIncidentalExpenses" :placeholder="title === '详情' ? '' : '安装及杂费'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="安装地点" prop="installPlace">
+              <el-input v-model.trim="ruleForm.installPlace" :placeholder="title === '详情' ? '' : '安装地点'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="原值" prop="originValue">
+              <el-input v-model.trim="ruleForm.originValue" :placeholder="title === '详情' ? '' : '原值'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="目前原值" prop="presentOriginValue">
+              <el-input v-model.trim="ruleForm.presentOriginValue" :placeholder="title === '详情' ? '' : '目前原值'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="折旧年限" prop="depreciationPeriod">
+              <el-input v-model.trim="ruleForm.depreciationPeriod" :placeholder="title === '详情' ? '' : '折旧年限'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="折旧方法" prop="depreciationMethod">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+                <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="属性" prop="attribute">
+              <el-input v-model.trim="ruleForm.attribute" placeholder="属性" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="说明书" prop="minioFileName">
+              <show-photo :minio-file-name="ruleForm.fileList[0]?.minioFileName || ''" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
+                {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
+              </el-button>
+              <span v-if="title === '详情' && !ruleForm.fileList[0]?.minioFileName">暂无</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" placeholder="备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block-switch>
   </div>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    padding-top: 20px;
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index f46553a..fc3fd54 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -360,20 +360,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          固定资产-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`固定资产-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -763,44 +758,11 @@
           </el-row>
         </div> -->
       </el-form>
-    </div>
+    </detail-page>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index 0abbdb1..6e88e96 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -74,33 +74,29 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ name }} -{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm">
-            关闭
-          </el-button>
-        </span>
-      </div>
-      <div class="body">
-        <!-- 三级菜单 -->
-        <el-radio-group v-model="current">
-          <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
-            {{ item.name }}
-          </el-radio-button>
-        </el-radio-group>
-      </div>
-      <!-- 展示区域 -->
-      <keep-alive>
-        <component :is="currentComp" ref="currentCompRef" :name="current" :title="title" :row="row" />
-      </keep-alive>
-    </div>
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <!-- 展示区域 -->
+    <keep-alive>
+      <component :is="currentComp" ref="currentCompRef" :name="current" :title="title" :row="row">
+        <template #menuswitch>
+          <!-- 三级菜单 -->
+          <el-radio-group v-model="current">
+            <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+              {{ item.name }}
+            </el-radio-button>
+          </el-radio-group>
+        </template>
+      </component>
+    </keep-alive>
   </app-container>
 </template>
 
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f9cdcd0..f653095 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -256,7 +256,7 @@
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
-  // 原生上传图片
+  // 原生上传
   // console.log(event.target.files)
   // if (event.target.files[0].type === 'application/pdf') {
   if (event.target.files?.length !== 0) {
@@ -354,7 +354,7 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" type="primary" @click="identify">
+          <!-- <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" type="primary" @click="identify">
             标签识别
           </el-button>
           <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/import`)" type="primary" @click="batchImport">
@@ -371,7 +371,13 @@
           </el-button>
           <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/print`)" v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/device/standingBook/components/templateTable.vue b/src/views/device/standingBook/components/templateTable.vue
index 8a928f0..7aa563f 100644
--- a/src/views/device/standingBook/components/templateTable.vue
+++ b/src/views/device/standingBook/components/templateTable.vue
@@ -245,11 +245,11 @@
   <div>
     <!-- 添加证书信息组件 -->
     <add-row ref="addRowRef" @add="addRowData" />
-    <div class="header">
-      <div class="title">
-        <!-- {{ $props.name }} -->
-      </div>
-      <span class="btns">
+    <detail-block-switch :title="name">
+      <template #menu>
+        <slot name="menuswitch" />
+      </template>
+      <template #btns>
         <el-button v-if="title !== '详情'" type="info" @click="removeRow">
           删除行
         </el-button>
@@ -259,55 +259,33 @@
         <el-button v-if="title !== '详情'" type="primary" @click="editRow">
           编辑行
         </el-button>
-      </span>
-    </div>
-    <!-- 表格区域 -->
-    <normal-table
-      id="print"
-      :data="list" :total="total" :columns="columns as any"
-      :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-      :list-loading="loadingTable"
-      style="padding-top: 20px;background-color: #fff;"
-      @change="changePage"
-    >
-      <template #preColumns>
-        <el-table-column label="" width="55" align="center">
-          <template #default="scope">
-            <el-radio v-model="select" :label="scope.$index" class="radio" />
-          </template>
-        </el-table-column>
-        <el-table-column label="序号" width="55" align="center">
-          <template #default="scope">
-            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-          </template>
-        </el-table-column>
       </template>
-    </normal-table>
+      <!-- 表格区域 -->
+      <normal-table
+        id="print"
+        :data="list" :total="total" :columns="columns as any"
+        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+        :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </detail-block-switch>
   </div>
 </template>
 
 <style lang="scss" scoped>
-.header {
-  background-color: #fff;
-  // height: 40px;
-  border-radius: 8px;
-  display: flex;
-  align-items: center;
-  flex-direction: column;
-  justify-content: center;
-  position: relative;
-
-  .title {
-    // font-weight: 700;
-  }
-
-  .btns {
-    position: absolute;
-    right: 40px;
-    top: -22px;
-  }
-}
-
 :deep(.el-radio__label) {
   display: none;
 }
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 7538bc8..78a3800 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -272,24 +272,12 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/identify`)" type="primary" @click="identify">
-            标签识别
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/import`)" type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/mould`)" type="primary" @click="templateDownload">
-            模板下载
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/add`)" type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/export`)" type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/print`)" v-print="printObj" type="primary">
-            打印
-          </el-button>
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/identify`)" icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index fc364c8..e74d70e 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -361,20 +361,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ name }} - {{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -458,73 +453,33 @@
           </el-col>
         </el-row>
       </el-form>
-      <div v-if="title !== '新建' ">
-        <div class="header" style="margin-top: 10px;">
-          <div class="title">
-            审批流程
-          </div>
-        </div>
-        <div class="timeline">
-          <el-timeline>
-            <el-timeline-item timestamp="2018/4/12" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/12 20:46</p>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="2018/4/3" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/3 20:46</p>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="2018/4/2" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/2 20:46</p>
-              </el-card>
-            </el-timeline-item>
-          </el-timeline>
-        </div>
-      </div>
-    </div>
+    </detail-page>
+    <detail-block v-if="title !== '新建' " title="审批流程">
+      <el-timeline>
+        <el-timeline-item timestamp="2018/4/12" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/12 20:46</p>
+          </el-card>
+        </el-timeline-item>
+        <el-timeline-item timestamp="2018/4/3" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/3 20:46</p>
+          </el-card>
+        </el-timeline-item>
+        <el-timeline-item timestamp="2018/4/2" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/2 20:46</p>
+          </el-card>
+        </el-timeline-item>
+      </el-timeline>
+    </detail-block>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .timeline {
   background-color: #fff;
 }
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index aa3963f..737568d 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -1,6 +1,6 @@
 <!-- 状态管理公共列表组件 -->
 <script lang="ts" setup>
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessageBox } from 'element-plus'
 import approve from './approvalActionDialog.vue'
 import addDialog from './templateAdd.vue'
 const props = defineProps({
@@ -142,7 +142,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: any) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     title: '详情',
@@ -150,7 +150,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: any) => {
   dialogVisible.value = true
   // addRef.value.initDialog({
   //   title: '编辑',
@@ -158,7 +158,7 @@
   // })
 }
 // 删除
-const remove = (row) => {
+const remove = (row: any) => {
   ElMessageBox.confirm(
     `确认删除${row.equipmentName}吗？`,
     '提示',
@@ -181,20 +181,20 @@
   // })
 }
 // 同意
-const agree = (row) => {
+const agree = (row: any) => {
   console.log(approveRef.value)
   approveRef.value.initDialog({
     radio: '1',
   })
 }
 // 驳回
-const reject = (row) => {
+const reject = (row: any) => {
   approveRef.value.initDialog({
     radio: '3',
   })
 }
 // 拒绝
-const refuse = (row) => {
+const refuse = (row: any) => {
   approveRef.value.initDialog(
     {
       radio: '2',
@@ -202,7 +202,7 @@
   )
 }
 // 取消
-const cancel = (row) => {
+const cancel = (rowrow: any) => {
   ElMessageBox.confirm(
     '确认取消吗？',
     '提示',
@@ -301,20 +301,20 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+          <el-input placeholder="申请编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="设备编号" clearable class="w-50 m-2" />
+          <el-input placeholder="设备编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.modelNo" placeholder="设备名称" clearable class="w-50 m-2" />
+          <el-input placeholder="设备名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请单位" clearable class="w-50 m-2" />
+          <el-input placeholder="申请单位" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.publisher" placeholder="申请状态" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" />
+          <el-select placeholder="申请状态" clearable>
+            <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" /> -->
           </el-select>
         </search-item>
       </search-area>
@@ -328,7 +328,10 @@
           <el-button type="primary" @click="templateDownload">
             模板下载
           </el-button> -->
-          <el-button type="primary" @click="add">
+          <icon-button icon="icon-add" title="新建" @click="add" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+          <!-- <el-button type="primary" @click="add">
             新建
           </el-button>
           <el-button type="primary" @click="exportExcelBtn">
@@ -336,7 +339,7 @@
           </el-button>
           <el-button v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
         </template>
         <!-- 表格区域 -->
         <normal-table
@@ -386,22 +389,3 @@
     </app-container>
   </div>
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 154px !important;
-}
-
-.normal-date {
-  width: 154px !important;
-}
-
-.normal-select {
-  width: 154px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
-
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 0763c5a..9ef0b93 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -19,7 +19,6 @@
 const effectiveStatusName = ref('')
 const title = ref('')
 const fileList = ref<UploadUserFile[]>([])
-console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -80,10 +79,9 @@
   if (row.title === '新建') {
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
-    ruleForm.publisher = ''
+    ruleForm.publisher = userInfo.$state.deptName
     ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 判断有无存储
-    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
     if (sessionStorage.getItem(fileTypeName.value)) {
       const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
       ruleForm.fileType = session.fileType
@@ -117,6 +115,8 @@
     ruleForm.remark = row.remark
     ruleForm.publishTime = row.publishTime
     ruleForm.minioFileName = row.minioFileName
+    // ruleForm.publisher = '0'
+    // ruleForm.createUserId = '1'
   }
 }
 defineExpose({ initDialog })
@@ -148,6 +148,9 @@
       type: 'warning',
     },
       ).then((res) => {
+        if (ruleForm.publisher === userInfo.$state.deptName) {
+          ruleForm.publisher === userInfo.$state.deptId
+        }
         if (flag == '提交') {
           addApi(ruleForm).then((res) => {
             if (res.code == 200) {
@@ -193,7 +196,6 @@
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        console.log(res.data[0])
         ruleForm.minioFileName = res.data[0]
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
@@ -216,7 +218,6 @@
 // ])
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
-  console.log(diffDat)
   if (diffDat < 0) {
     // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '在使用'
@@ -237,7 +238,7 @@
 
 <template>
   <app-container v-if="dialogVisible" style="overflow: hidden;">
-    <detail-page :title="`${title}${fileTypeName}`">
+    <detail-page :title="`${fileTypeName}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
           提交
@@ -278,12 +279,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="发布单位" prop="publisher">
-              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'" class="fill-input">
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled>
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
               <com-tree-select
                 v-else
-                v-model="ruleForm.publisher" :options="PubListTree" placeholder="选择组织机构"
+                v-model="ruleForm.publisher" :options="PubListTree" placeholder="请选择发布单位"
                 :tree-props="deptProps"
               />
             </el-form-item>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 44e3e4d..b45fbc3 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -324,22 +324,9 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <!-- <el-button type="primary" @click="batchImport">
-            批量导入
-          </el-button> -->
-          <!-- <el-button type="primary" @click="templateDownload">
-            模板下载
-          </el-button> -->
-          <!-- <el-button type="primary" @click="add">
-            新建
-          </el-button> -->
-          <el-button type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-print="printObj" type="primary">
-            打印
-          </el-button>
+          <!-- <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange"> -->
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 4677e48..7d4724b 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -204,13 +204,9 @@
     loading.close()
   })
 }
-// 打印
-const print = () => {
-
-}
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
-  // 原生上传图片
+  // 原生上传
   // console.log(event.target.files)
   // if (event.target.files[0].type === 'application/pdf') {
   if (event.target.files?.length !== 0) {
@@ -264,7 +260,7 @@
         <search-item>
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
-        <search-item>
+        <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
@@ -273,13 +269,13 @@
               :value="item.value"
             />
           </el-select>
-        </search-item>
+        </search-item> -->
         <search-item>
           <el-date-picker
             v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 155px;"
+            style="width: 185px;"
           />
         </search-item>
         <search-item>
@@ -287,19 +283,19 @@
             v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 155px;"
+            style="width: 185px;"
           />
         </search-item>
         <search-item>
-          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select> -->
-          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
+          </el-select>
+          <!-- <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" /> -->
         </search-item>
       </search-area>
       <table-container>
@@ -310,7 +306,7 @@
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
-          <icon-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" @click="print" />
+          <icon-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index cf0dd4f..5ca3275 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -3,11 +3,11 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { detailType } from '../measureDept-interface'
-import { getUserList } from '@/api/system/user'
+// import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
+import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import type { userType } from '@/views/system/user/user-interface'
 import { listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
-import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
 const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -31,11 +31,20 @@
   technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
+// 获取计量人员列表
 const getuser = () => {
-  getUserList({ offset: 1, limit: 99999 }).then((res) => {
-    userList.value = res.data.rows
+  getStaffList({
+    staffNo: '', // 人员编号
+    name: '', // 姓名
+    deptId: ruleForm.value.deptId, // 所在部门
+    limit: 999999,
+    offset: 1,
+  }).then((res) => {
+    if (res.code === 200) {
+      userList.value = res.data.records
+    }
   })
-} // 获取用户列表
+}
 const technologyJobList = ref<{ id: string;name: string;value: string }[]>([])
 // 获取技术职务列表
 const getTechnologyJobList = () => {
@@ -50,7 +59,16 @@
     administrationJobList.value = response.data
   })
 }
-
+// 选择负责人自动填充职务信息
+const directorChange = (val: string) => {
+  const selectUser = userList.value.filter(item => item.name === val)[0]
+  getStaffDetail(selectUser).then((res) => {
+    if (res.code === 200) {
+      ruleForm.value.administrationJob = res.data.administrationJob
+      ruleForm.value.technologyJob = res.data.technologyJob
+    }
+  })
+}
 // 提交
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
@@ -95,12 +113,6 @@
 const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
-// const searchQuery = ref({
-//   limit: 10,
-//   offset: 1,
-//   total: 0,
-//   pageSizes: [10, 20, 30],
-// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -410,20 +422,6 @@
     }
   })
 }
-// const handleSizeChange = (val: number) => {
-//   searchQuery.value.limit = val
-//   getDepartmentList()
-//   getuserInfoList()
-//   getInstrumentInfo()
-//   getDeviceInfo()
-// }
-// const handleCurrentChange = (val: number) => {
-//   searchQuery.value.offset = val
-//   getDepartmentList()
-//   getuserInfoList()
-//   getInstrumentInfo()
-//   getDeviceInfo()
-// }
 // 弹窗初始化
 const initDialog = (row: any) => {
   reset()
@@ -460,22 +458,17 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title.split('-')[2] === '编辑'" type="primary" @click="submitForm(ruleFormRef)">
-            提交
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="title">
+      <template #btns>
+        <el-button v-if="title.split('-')[2] === '编辑'" type="primary" @click="submitForm(ruleFormRef)">
+          提交
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title.split('-')[2] === '详情' ? 'isDetail' : '']">
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item :label=" `${title.split('-')[1]}编号`" prop="organizeNo">
               <el-input v-model.trim="ruleForm.organizeNo" placeholder="系统自动生成" disabled />
@@ -487,7 +480,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="title.split('-')[1] === '工程组'" :gutter="24" class="marg">
+        <el-row v-if="title.split('-')[1] === '工程组'" :gutter="24">
           <el-col :span="6">
             <el-form-item label="科室编号">
               <el-input v-model.trim="ruleForm.pDeptId" disabled />
@@ -509,10 +502,10 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
-              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" @change="directorChange">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.name" />
               </el-select>
             </el-form-item>
@@ -532,7 +525,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="24">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
               <el-input v-model.trim="ruleForm.remark" :placeholder="title.split('-')[2] === '详情' ? '' : '备注'" :disabled="title.split('-')[2] === '详情'" />
@@ -540,85 +533,24 @@
           </el-col>
         </el-row>
       </el-form>
-      <!-- 科室信息-人员信息等列表切换 -->
-      <div>
-        <div class="header" style="margin-top: 10px;">
-          <!-- 切换 -->
-          <el-radio-group v-model="current" class="change-btn">
-            <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
-              {{ item.name }}
-            </el-radio-button>
-          </el-radio-group>
-          <div class="title">
-            {{ current }}
-          </div>
-          <span class="btns">
-          <!-- <el-button type="info" :disabled="title === '详情'" @click="removeRow">
-            删除行
-          </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
-            添加行
-          </el-button> -->
-          </span>
-        </div>
-        <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <el-table-column type="index" label="序号" width="55" align="center" />
-          <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
-        </el-table>
-        <!-- <div style="width: 100%;margin-top: 10px;">
-          <el-pagination
-            :current-page="searchQuery.offset"
-            :page-sizes="searchQuery.pageSizes"
-            :page-size="searchQuery.limit"
-            :total="searchQuery.total"
-            layout="total, sizes, prev, pager, next"
-            hide-on-single-page
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-          />
-        </div> -->
-      </div>
-    </div>
+    </detail-page>
+    <detail-block-switch :title="current">
+      <template #menu>
+        <el-radio-group v-model="current" class="change-btn">
+          <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
+            {{ item.name }}
+          </el-radio-button>
+        </el-radio-group>
+      </template>
+      <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
+        <el-table-column type="index" label="序号" width="55" align="center" />
+        <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </detail-block-switch>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-    position: relative;
-
-    .change-btn {
-      position: absolute;
-      left: 40px;
-      top: 4px;
-    }
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 4px;
-    }
-  }
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
@@ -628,8 +560,4 @@
     }
   }
 }
-
-.marg {
-  margin-top: 10px;
-}
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 9ad87af..aac1ef2 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -231,12 +231,14 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
+          <!-- <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
           <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
+          <icon-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 2e3322a..3f472eb 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -41,7 +41,7 @@
   { text: '证书号', value: 'certificateNo', align: 'center' },
   { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
   { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'validDate', align: 'center', width: '200' },
   { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
 ]) // 表格
 const certificateStatusList = ref([
@@ -90,7 +90,7 @@
   loadingTable.value = true
   getCertificateList(searchQuery).then((res) => {
     if (res.code === 200) {
-      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效' }))
+      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效', validDate: item.validDate.split(' ')[0], certificateDate: item.certificateDate.split(' ')[0] }))
       list.value = res.data.records
       total.value = Number(res.data.total)
     }
@@ -115,6 +115,7 @@
   addRef.value.initDialog({
     ...row,
     title: '详情',
+    name: props.isRemind ? '证书状况' : '证书记录',
   })
 }
 // 编辑
@@ -123,6 +124,7 @@
   addRef.value.initDialog({
     ...row,
     title: '编辑',
+    name: props.isRemind ? '证书状况' : '证书记录',
   })
 }
 
@@ -193,6 +195,7 @@
   dialogVisible.value = true
   addRef.value.initDialog({
     title: '新建',
+    name: props.isRemind ? '证书状况' : '证书记录',
   })
 }
 // 导出
@@ -292,21 +295,11 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
-            模板下载
-          </el-button>
-          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
-            打印
-          </el-button>
+          <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
@@ -325,7 +318,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column fixed="right" label="操作" align="center" width="150">
+            <el-table-column fixed="right" label="操作" align="center" width="180">
               <template #default="{ row }">
                 <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
                   提醒
@@ -336,7 +329,7 @@
                 <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 4dc1b17..4352604 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -69,7 +69,16 @@
     const IdCard = ruleForm.value.idCard
     const birthday = `${IdCard.substring(6, 10)}-${IdCard.substring(10, 12)}`
     ruleForm.value.birthday = birthday
-    console.log(ruleForm.value)
+    // 获取性别 第17位  奇数为男 偶数为女
+    // ruleForm.value.sex
+    if (Number(IdCard.substring(16, 17)) % 2) {
+      // 男
+      ruleForm.value.sex = '1'
+    }
+    else {
+      //  女
+      ruleForm.value.sex = '2'
+    }
   })
 }
 const dialogVisible = ref<boolean>(false) // 弹窗显示
@@ -130,7 +139,6 @@
     technologyExam: '', // 技术考核
     remark: '', // 备注
     certificateList: [], // 证书列表
-
   }
 }
 const technologyJobList = ref<technologyJobType[]>([])
@@ -309,7 +317,7 @@
           }
           (title.value === '新建'
             ? getStaffAdd
-            : getStaffupdate) ({ ...ruleForm.value, certificateList: changeList.value[0].data }).then((res) => {
+            : getStaffupdate) ({ ...ruleForm.value, certificateList: changeList.value[0].data, birthday: `${ruleForm.value.idCard.substring(6, 10)}-${ruleForm.value.idCard.substring(10, 12)}-${ruleForm.value.idCard.substring(12, 14)}` }).then((res) => {
             if (res.code == 200) {
               formEl?.resetFields()
               ElMessage.success('提交成功')
@@ -332,12 +340,14 @@
   emits('resetData')
   resetFormData()
 }
+const selectTreeRef = ref()
 // 弹窗初始化
 const initDialog = (row: any) => {
   changeList.value[0].data = []
   dialogVisible.value = true
   title.value = row.title
   resetFormData()
+  selectTreeRef.value?.clearSelected()
   getuser()
   getPubList()
   getSexList()
@@ -370,20 +380,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          计量人员-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
-            完成
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`计量人员-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+          完成
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
         <el-row :gutter="24" class="marg">
           <el-col :span="5">
@@ -394,6 +399,7 @@
                 :http-request="uploadQuarterlyEvaluateFile"
                 :before-upload="beforeAvatarUpload"
                 :disabled="title === '详情'"
+                accept="image/png, image/jpeg,image/jpg"
               >
                 <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
                 <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
@@ -425,8 +431,8 @@
               </el-select>
               <com-tree-select
                 v-else
-                v-model="ruleForm.deptId" :options="PubListTree" placeholder="选择组织机构"
-                :tree-props="deptProps"
+                ref="selectTreeRef" v-model="ruleForm.deptId" :options="PubListTree"
+                placeholder="选择组织机构" :tree-props="deptProps"
               />
             </el-form-item>
             <el-form-item label="计量专业" prop="major" class="marg-item">
@@ -489,29 +495,19 @@
           </el-col>
         </el-row>
       </el-form>
-      <!-- 证书基本信息 -->
-      <!-- 切换 -->
-      <!-- <el-radio-group v-model="current" style="margin-bottom: -15px;">
-          <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
-            {{ item.name }}
-          </el-radio-button>
-        </el-radio-group> -->
-      <div class="header" style="margin-top: 10px;">
-        <div class="title">
-          {{ current }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="info" @click="removeRow">
-            删除行
-          </el-button>
-          <el-button v-if="title !== '详情'" type="primary" @click="addRow">
-            添加行
-          </el-button>
-          <el-button v-if="title !== '详情'" type="primary" @click="editRow">
-            编辑行
-          </el-button>
-        </span>
-      </div>
+    </detail-page>
+    <detail-block :title="current">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="info" @click="removeRow">
+          删除行
+        </el-button>
+        <el-button v-if="title !== '详情'" type="primary" @click="addRow">
+          添加行
+        </el-button>
+        <el-button v-if="title !== '详情'" type="primary" @click="editRow">
+          编辑行
+        </el-button>
+      </template>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
         <el-table-column width="55" align="center">
           <template #default="scope">
@@ -523,7 +519,7 @@
         <el-table-column type="index" label="序号" width="55" />
         <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
       </el-table>
-    </div>
+    </detail-block>
     <!-- 添加证书信息组件 -->
     <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
     <!-- 选择用户列表组件 -->
@@ -532,77 +528,38 @@
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    background-color: #fff;
-    border-radius: 8px;
-    padding-top: 10px;
-    margin-top: 10px;
-    padding-right: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    display: flex;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    position: relative;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 5px;
-    }
-  }
-
-  :deep(.el-radio__label) {
-    display: none;
-  }
-
-  :deep(.el-icon.avatar-uploader-icon) {
-    font-size: 28px;
-    color: #8c939d;
-    width: 190px;
-    height: 250px;
-    text-align: center;
-  }
-
-  :deep(.avatar-uploader .avatar) {
-    width: 190px;
-    height: 250px;
-    display: block;
-  }
-
-  .isDetail {
-    ::v-deep {
-      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-        display: none;
-      }
-    }
-  }
+:deep(.el-radio__label) {
+  display: none;
 }
 
-.marg {
-  margin-top: 20px;
+:deep(.el-icon.avatar-uploader-icon) {
+  font-size: 28px;
+  color: #8c939d;
+  width: 190px;
+  height: 250px;
+  text-align: center;
 }
 
-.marg-item {
-  margin-top: 20px;
+:deep(.avatar-uploader .avatar) {
+  width: 190px;
+  height: 250px;
+  display: block;
+}
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
 }
 </style>
 
 <style scoped>
 .avatar-uploader .avatar {
-  width: 220px;
-  height: 320px;
+  width: 190px;
+  height: 250px;
   display: block;
 }
 </style>
@@ -624,8 +581,8 @@
 .el-icon.avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
-  width: 220px;
-  height: 320px;
+  width: 190px;
+  height: 250px;
   text-align: center;
 }
 </style>
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index ae48f11..042636e 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -4,7 +4,6 @@
 import dayjs from 'dayjs'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import type { technologyJobType } from '../person-interface'
-import certificateAddDialog from './certificateAddDialog.vue'
 import personListDialog from './personListDialog.vue'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
@@ -14,7 +13,8 @@
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
-const ruleFormRef = ref<FormInstance>() // from组件
+const ruleFormRef1 = ref<FormInstance>() // from组件
+const ruleFormRef2 = ref<FormInstance>() // from组件
 const meterStaff = ref({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -28,26 +28,43 @@
   workDate: '', // 从事日期
   id: '',
 })
+const baseInfo = ref({
+  certificateCompany: '',
+  certificateDate: '',
+  certificateName: '',
+  certificateNo: '',
+  validDate: '',
+  id: '',
+  isDel: 0,
+  minioFileName: '',
+  remark: '',
+})
 const ruleForm = ref({
   meterStaff: {}, // 人员信息
   staffId: '', // 计量人员id
 }) // 表单
-const multipleTableRef = ref<InstanceType<typeof ElTable>>()
 const title = ref('')
+const name = ref('')
 // 身份证号码验证规则
-const validateIDcard = (rule: any, value: any, callback: any) => {
-  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
-  if (rr.test(value)) {
-    callback()
-  }
-  else {
-    callback(new Error('验证失败'))
-  }
-}
+// const validateIDcard = (rule: any, value: any, callback: any) => {
+//   const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+//   if (rr.test(value)) {
+//     callback()
+//   }
+//   else {
+//     callback(new Error('验证失败'))
+//   }
+// }
 const rules = ref({
   staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
   // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
-
+}) // 表单验证规则
+const rules2 = ref({
+  certificateCompany: [{ required: true, message: '发证单位不能为空', trigger: 'blur' }],
+  certificateDate: [{ required: true, message: '发证日期不能为空', trigger: 'blur' }],
+  certificateName: [{ required: true, message: '证书名称不能为空', trigger: 'blur' }],
+  certificateNo: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
+  validDate: [{ required: true, message: '有效日期不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
 const userList = ref<userType[]>([]) // 可使用人列表
@@ -96,6 +113,17 @@
   meterStaff.value.major = ''
   meterStaff.value.workDate = ''
   meterStaff.value.id = ''
+  baseInfo.value = {
+    certificateCompany: '',
+    certificateDate: '',
+    certificateName: '',
+    certificateNo: '',
+    validDate: '',
+    id: '',
+    isDel: 0,
+    minioFileName: '',
+    remark: '',
+  }
 }
 const technologyJobList = ref<technologyJobType[]>([])
 // 获取技术职务列表
@@ -120,98 +148,14 @@
 const confirmPerson = (row: any) => {
   ruleForm.value.staffId = row.staffNo
   meterStaff.value = row
-  ruleFormRef.value?.clearValidate('staffNo')
+  ruleFormRef1.value?.clearValidate('staffNo')
 }
-const changeList = ref([
-  {
-    name: '证书基本信息',
-    data: [] as any[],
-    column: [
-      {
-        label: '证书号',
-        data: 'certificateNo',
-        id: 'zs02',
-      },
-      {
-        label: '证书名称',
-        data: 'certificateName',
-        id: 'zs03',
-      },
-      {
-        label: '发证日期',
-        data: 'certificateDate',
-        id: 'zs04',
-      },
-      {
-        label: '发证单位',
-        data: 'certificateCompany',
-        id: 'zs01',
-      },
-      {
-        label: '有效日期',
-        data: 'validDate',
-        id: 'zs05',
-      },
-    ],
-  },
-  {
-    name: '计量工作培训记录',
-    data: [],
-    column: [],
-  },
-  {
-    name: '业务记录',
-    data: [],
-    column: [],
-  },
-])
-const current = ref('证书基本信息')
-const currentShow = computed(() => {
-  return changeList.value.filter(item => item.name === current.value)[0]
-})
-const certificateRef = ref() // 添加证书信息弹窗
-// 添加行
-const addRow = () => {
-  certificateRef.value.initDialog({ title: '添加' })
-}
-// 编辑行
-const editRow = () => {
-  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
-}
-// 证书信息行内添加数据
-const addRowcertificate = (row: any, flag: string) => {
-  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
-  if (flag === 'update') {
-    changeList.value[0].data = [{
-      ...changeList.value[0].data[0],
-      ...row,
-      certificateStatus: diff < 0 ? '1' : '0',
-      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-    }]
-  }
-  else {
-    changeList.value[0].data.push(
-      {
-        ...row,
-        certificateStatus: diff < 0 ? '1' : '0',
-        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-        id: null,
-        isDel: 0,
-        minioFileName: '',
-        remark: '',
-        staffId: meterStaff.value.id,
-        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-      })
-  }
-}
-const currenSelect = ref<number>(-1) // 当前选中行
-// 删除行
-const removeRow = () => {
-  console.log(currenSelect.value)
-  if (currenSelect.value >= 0) {
+// 提交
+const submitForm = async (formEl1: FormInstance | undefined, formEl2: FormInstance | undefined) => {
+  if (!formEl1 || !formEl2) { return }
+  Promise.all([formEl1.validate(), formEl2.validate()]).then((res) => {
     ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
+      '确认提交吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -219,78 +163,49 @@
         type: 'warning',
       },
     ).then(() => {
-      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
-      currenSelect.value = -1
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 提交
-const submitForm = async (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  await formEl.validate((valid, fields) => {
-    if (valid) {
-      ElMessageBox.confirm(
-        '确认提交吗？',
-        '提示',
-        {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        },
-      ).then(() => {
-        let params
-        if (changeList.value[0].data.length) {
-          params = changeList.value[0].data
-        }
-        else {
-          params = [
-            {
-              certificateCompany: '',
-              certificateDate: '',
-              certificateName: '',
-              certificateNo: '',
-              certificateStatus: '',
-              createTime: '',
-              id: null,
-              isDel: 0,
-              minioFileName: '',
-              remark: '',
-              staffId: meterStaff.value.id,
-              updateTime: '',
-              validDate: '',
-            },
-          ]
-        }
-        (title.value === '新建'
-          ? addCertificateList
-          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
-          formEl?.resetFields()
-          ElMessage.success('提交成功')
-          emits('resetData')
-          resetFormData()
-        })
+      (title.value === '新建'
+        ? addCertificateList
+        : getCertificateUpdate)(title.value === '新建'
+        ? [{
+            ...baseInfo.value,
+            staffId: meterStaff.value.id,
+            createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+            updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+            certificateStatus: dayjs(baseInfo.value.validDate).diff(baseInfo.value.certificateDate, 'day') < 0 ? '1' : '0',
+            meterStaff: undefined,
+          }]
+        : {
+            ...baseInfo.value,
+            staffId: meterStaff.value.id,
+            createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+            updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+            certificateStatus: dayjs(baseInfo.value.validDate).diff(baseInfo.value.certificateDate, 'day') < 0 ? '1' : '0',
+            meterStaff: undefined,
+          }).then((res) => {
+        formEl1?.resetFields()
+        formEl2?.resetFields()
+        ElMessage.success('提交成功')
+        emits('resetData')
+        resetFormData()
       })
-    }
+    })
   })
 }
 // 取消
-const resetForm = (formEl: FormInstance | undefined) => {
+const resetForm = (formEl: FormInstance | undefined, formEl2: FormInstance | undefined) => {
   formEl?.resetFields()
-  changeList.value[0].data = []
+  formEl2?.resetFields()
   emits('resetData')
   resetFormData()
 }
+const selectTreeRef = ref()
 // 弹窗初始化
 const initDialog = (row: any) => {
-  changeList.value[0].data = []
   resetFormData()
   dialogVisible.value = true
   title.value = row.title
-  resetFormData()
+  name.value = row.name
+  selectTreeRef.value?.clearSelected()
   getuser()
   getPubList()
   getSexList()
@@ -303,8 +218,9 @@
   else {
     getCertificateDetail({ id: row.id }).then((res) => {
       if (res.code === 200) {
+        console.log(res, '证书记录')
         meterStaff.value = res.data.meterStaff
-        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+        baseInfo.value = res.data
       }
     })
   }
@@ -314,21 +230,16 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          证书记录-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
-            完成
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
-      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+    <detail-page :title=" `${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
+          完成
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef1, ruleFormRef2)">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef1" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="人员编号" prop="staffNo">
@@ -390,7 +301,8 @@
               </el-select>
               <com-tree-select
                 v-else
-                v-model="meterStaff.deptId" :options="PubListTree" placeholder="选择组织机构"
+                ref="selectTreeRef" v-model="meterStaff.deptId" :options="PubListTree"
+                placeholder="选择组织机构"
                 :tree-props="deptProps"
               />
             </el-form-item>
@@ -410,71 +322,52 @@
           </el-col>
         </el-row>
       </el-form>
-      <div class="header" style="margin-top: 10px;">
-        <div class="title">
-          {{ current }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title === '新建'" type="info" @click="removeRow">
-            删除行
-          </el-button>
-          <el-button v-if="title === '新建'" type="primary" @click="addRow">
-            添加行
-          </el-button>
-          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
-            编辑行
-          </el-button>
-        </span>
-      </div>
-      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
-        <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column>
-        <el-table-column type="index" label="序号" width="55" />
-        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
-      </el-table>
-    </div>
-    <!-- 添加证书信息组件 -->
-    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    </detail-page>
+    <detail-block title="证书基本信息">
+      <el-form ref="ruleFormRef2" :model="baseInfo" :rules="rules2" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="证书号" prop="certificateNo">
+              <el-input v-model.trim="baseInfo.certificateNo" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书名称" prop="certificateName">
+              <el-input v-model.trim="baseInfo.certificateName" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证单位" prop="certificateCompany">
+              <el-input v-model.trim="baseInfo.certificateCompany" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发证日期" prop="certificateDate">
+              <el-date-picker
+                v-model="baseInfo.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择发证日期"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书有效日期" prop="validDate">
+              <el-date-picker
+                v-model="baseInfo.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择有效日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block>
     <!-- 选择用户列表组件 -->
     <person-list-dialog ref="personListRef" @add="confirmPerson" />
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    background-color: #fff;
-    border-radius: 8px;
-    padding-top: 10px;
-    margin-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    display: flex;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    position: relative;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 5px;
-    }
-  }
-
   :deep(.el-radio__label) {
     display: none;
   }
@@ -487,40 +380,5 @@
       }
     }
   }
-}
-
-.marg {
-  margin-top: 20px;
-}
 </style>
 
-<style scoped>
-.avatar-uploader .avatar {
-  width: 178px;
-  height: 178px;
-  display: block;
-}
-</style>
-
-<style>
-.avatar-uploader .el-upload {
-  border: 1px dashed var(--el-border-color);
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-  transition: var(--el-transition-duration-fast);
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: var(--el-color-primary);
-}
-
-.el-icon.avatar-uploader-icon {
-  font-size: 28px;
-  color: #8c939d;
-  width: 178px;
-  height: 178px;
-  text-align: center;
-}
-</style>
diff --git a/src/views/measure/person/components/addRecordCancel.vue b/src/views/measure/person/components/addRecordCancel.vue
new file mode 100644
index 0000000..c32ac43
--- /dev/null
+++ b/src/views/measure/person/components/addRecordCancel.vue
@@ -0,0 +1,459 @@
+<!-- 计量人员新增  证书基本信息table表格   作废 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import type { technologyJobType } from '../person-interface'
+import certificateAddDialog from './certificateAddDialog.vue'
+import personListDialog from './personListDialog.vue'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import type { TreeStructure, userType } from '@/views/system/user/user-interface'
+import { getDictByCode } from '@/api/system/dict'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const meterStaff = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  idCard: '', // 身份证号
+  sex: '', // 性别
+  education: '', // 文化程度
+  technologyJob: '', // 技术职务
+  administrationJob: '', // 行政职务
+  deptId: '', // 工作部门
+  major: '', // 专业
+  workDate: '', // 从事日期
+  id: '',
+})
+const ruleForm = ref({
+  meterStaff: {}, // 人员信息
+  staffId: '', // 计量人员id
+}) // 表单
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const title = ref('')
+const name = ref('')
+// 身份证号码验证规则
+const validateIDcard = (rule: any, value: any, callback: any) => {
+  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+  if (rr.test(value)) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+const rules = ref({
+  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
+
+}) // 表单验证规则
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref<TreeStructure[]>([])
+const PubListTree = ref([])
+// 获取组织列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
+  })
+}
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sex').then((response) => {
+    sexList.value = response.data
+  })
+}
+const educationList = ref<technologyJobType[]>([])
+// 获取文化程度列表
+const geteducationList = () => {
+  getDictByCode('education').then((response) => {
+    educationList.value = response.data
+  })
+}
+// 重置表单内容
+const resetFormData = () => {
+  meterStaff.value.staffNo = ''
+  meterStaff.value.name = ''
+  meterStaff.value.idCard = ''
+  meterStaff.value.sex = ''
+  meterStaff.value.education = ''
+  meterStaff.value.technologyJob = ''
+  meterStaff.value.administrationJob = ''
+  meterStaff.value.deptId = ''
+  meterStaff.value.major = ''
+  meterStaff.value.workDate = ''
+  meterStaff.value.id = ''
+}
+const technologyJobList = ref<technologyJobType[]>([])
+// 获取技术职务列表
+const getTechnologyJobList = () => {
+  getDictByCode('technologyJob').then((response) => {
+    technologyJobList.value = response.data
+  })
+}
+const administrationJobList = ref<technologyJobType[]>([])
+// 获取行政职务列表
+const getAdministrationJob = () => {
+  getDictByCode('administrationJob').then((response) => {
+    administrationJobList.value = response.data
+  })
+}
+const personListRef = ref()
+// 选择人员
+const selectPerson = () => {
+  personListRef.value.initDialog()
+}
+// 保存选择人员信息
+const confirmPerson = (row: any) => {
+  ruleForm.value.staffId = row.staffNo
+  meterStaff.value = row
+  ruleFormRef.value?.clearValidate('staffNo')
+}
+const changeList = ref([
+  {
+    name: '证书基本信息',
+    data: [] as any[],
+    column: [
+      {
+        label: '证书号',
+        data: 'certificateNo',
+        id: 'zs02',
+      },
+      {
+        label: '证书名称',
+        data: 'certificateName',
+        id: 'zs03',
+      },
+      {
+        label: '发证日期',
+        data: 'certificateDate',
+        id: 'zs04',
+      },
+      {
+        label: '发证单位',
+        data: 'certificateCompany',
+        id: 'zs01',
+      },
+      {
+        label: '有效日期',
+        data: 'validDate',
+        id: 'zs05',
+      },
+    ],
+  },
+  {
+    name: '计量工作培训记录',
+    data: [],
+    column: [],
+  },
+  {
+    name: '业务记录',
+    data: [],
+    column: [],
+  },
+])
+const current = ref('证书基本信息')
+const currentShow = computed(() => {
+  return changeList.value.filter(item => item.name === current.value)[0]
+})
+const certificateRef = ref() // 添加证书信息弹窗
+// 添加行
+const addRow = () => {
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
+}
+// 证书信息行内添加数据
+const addRowcertificate = (row: any, flag: string) => {
+  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
+  if (flag === 'update') {
+    changeList.value[0].data = [{
+      ...changeList.value[0].data[0],
+      ...row,
+      certificateStatus: diff < 0 ? '1' : '0',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    }]
+  }
+  else {
+    changeList.value[0].data.push(
+      {
+        ...row,
+        certificateStatus: diff < 0 ? '1' : '0',
+        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        id: null,
+        isDel: 0,
+        minioFileName: '',
+        remark: '',
+        staffId: meterStaff.value.id,
+        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
+  }
+}
+const currenSelect = ref<number>(-1) // 当前选中行
+// 删除行
+const removeRow = () => {
+  console.log(currenSelect.value)
+  if (currenSelect.value >= 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
+      currenSelect.value = -1
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        let params
+        if (changeList.value[0].data.length) {
+          params = changeList.value[0].data
+        }
+        else {
+          params = [
+            {
+              certificateCompany: '',
+              certificateDate: '',
+              certificateName: '',
+              certificateNo: '',
+              certificateStatus: '',
+              createTime: '',
+              id: null,
+              isDel: 0,
+              minioFileName: '',
+              remark: '',
+              staffId: meterStaff.value.id,
+              updateTime: '',
+              validDate: '',
+            },
+          ]
+        }
+        (title.value === '新建'
+          ? addCertificateList
+          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
+          formEl?.resetFields()
+          ElMessage.success('提交成功')
+          emits('resetData')
+          resetFormData()
+        })
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  changeList.value[0].data = []
+  emits('resetData')
+  resetFormData()
+}
+const selectTreeRef = ref()
+// 弹窗初始化
+const initDialog = (row: any) => {
+  changeList.value[0].data = []
+  resetFormData()
+  dialogVisible.value = true
+  title.value = row.title
+  name.value = row.name
+  selectTreeRef.value.clearSelected()
+  resetFormData()
+  getuser()
+  getPubList()
+  getSexList()
+  geteducationList()
+  getTechnologyJobList()
+  getAdministrationJob()
+  if (row.title === '新建') {
+    console.log()
+  }
+  else {
+    getCertificateDetail({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        meterStaff.value = res.data.meterStaff
+        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+      }
+    })
+  }
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <detail-page :title=" `${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+          完成
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="人员编号" prop="staffNo">
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="selectPerson">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="meterStaff.name">
+              <el-input v-model.trim="meterStaff.name" placeholder="姓名" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="性别" prop="meterStaff.sex">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="文化程度" prop="meterStaff.education">
+              <el-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="技术职务" prop="meterStaff.technologyJob">
+              <el-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="行政职务" prop="meterStaff.administrationJob">
+              <el-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="工作部门" prop="deptId">
+              <el-select v-if="title === '详情'" v-model="meterStaff.deptId" disabled>
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+              <com-tree-select
+                v-else
+                ref="selectTreeRef" v-model="meterStaff.deptId" :options="PubListTree"
+                placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业" prop="major">
+              <el-input v-model.trim="meterStaff.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="从事日期" prop="workDate">
+              <el-date-picker
+                v-model="meterStaff.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择从事日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block :title="current">
+      <template #btns>
+        <el-button v-if="title === '新建'" type="info" @click="removeRow">
+          删除行
+        </el-button>
+        <el-button v-if="title === '新建'" type="primary" @click="addRow">
+          添加行
+        </el-button>
+        <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+          编辑行
+        </el-button>
+      </template>
+      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
+        <el-table-column width="55" align="center">
+          <template #default="scope">
+            <el-radio-group v-model="currenSelect" class="ml-4">
+              <el-radio :label="scope.$index" />
+            </el-radio-group>
+          </template>
+        </el-table-column>
+        <el-table-column type="index" label="序号" width="55" />
+        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </detail-block>
+    <!-- 添加证书信息组件 -->
+    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    <!-- 选择用户列表组件 -->
+    <person-list-dialog ref="personListRef" @add="confirmPerson" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        display: none;
+      }
+    }
+  }
+</style>
+

diff --git a/src/components.d.ts b/src/components.d.ts
index 6e85584..815d62f 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -16,14 +16,13 @@
     BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default']
     BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
-    Benchcol: typeof import('./components/benchcol/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/DetailPage/index copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
+    DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
diff --git a/src/components/DetailPage/DetailBlockSwitch.vue b/src/components/DetailPage/DetailBlockSwitch.vue
new file mode 100644
index 0000000..4d92074
--- /dev/null
+++ b/src/components/DetailPage/DetailBlockSwitch.vue
@@ -0,0 +1,71 @@
+<script lang="ts" setup name="DetailBlock">
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+})
+
+const slots = useSlots()
+</script>
+
+<template>
+  <div class="detail-main">
+    <div class="header">
+      <div class="menu">
+        <slot name="menu" />
+      </div>
+      <div class="title">
+        {{ title }}
+      </div>
+      <div class="btns">
+        <slot name="btns" />
+      </div>
+    </div>
+    <div v-if="slots.default" class="content">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-main {
+  background-color: #fff;
+  border-radius: 8px;
+  margin-top: 10px;
+  padding-top: 10px;
+
+  .header {
+    position: relative;
+    height: 40px;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+
+    .title {
+      font-weight: 500;
+    }
+
+    .btns {
+      position: absolute;
+      right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+
+    .menu {
+      position: absolute;
+      left: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+
+  .content {
+    background-color: #fff;
+    padding: 0 10px 20px;
+    margin-top: 10px;
+  }
+}
+</style>
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d6c1c91..1644a80 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -314,6 +314,39 @@
       },
     ],
   },
+  {
+    path: '/borrow',
+    component: Layout,
+    redirect: '/device/borrow/borrowapply',
+    name: 'Borrow',
+    meta: {
+      title: '设备领用',
+      icon: 'ep:key',
+      auth: '/device/borrow',
+    },
+    children: [
+      {
+        path: 'borrowapply',
+        name: 'borroWapply',
+        component: () => import('@/views/device/borrow/borrwoApply.vue'),
+        meta: {
+          title: '设备借用申请',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowapply',
+        },
+      },
+      {
+        path: 'borrowhandle',
+        name: 'borrowHandle',
+        component: () => import('@/views/device/borrow/borrowHandle.vue'),
+        meta: {
+          title: '设备借用处理',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowhandle',
+        },
+      },
+    ],
+  },
 
 ]
 
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
new file mode 100644
index 0000000..1c2405e
--- /dev/null
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="borrowHandle">
+// 逻辑代码
+</script>
+
+<template>
+  <app-container>
+    设备借用处理
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
new file mode 100644
index 0000000..03d414b
--- /dev/null
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="borrowApply">
+// 逻辑代码
+</script>
+
+<template>
+  <app-container>
+    设备借用申请
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index c2682fc..5f7b347 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -339,381 +339,374 @@
 
 <template>
   <div class="body-container">
-    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资产编号" prop="assetNo">
-            <el-input v-model.trim="ruleForm.assetNo" placeholder="系统自动生成" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="资产类型" prop="assetType">
-            <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备编号" prop="equipmentNo">
-            <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备名称" prop="equipmentName">
-            <el-input v-model.trim="ruleForm.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="生产厂家" prop="manufacturer">
-            <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="厂家国别" prop="manufacturerCountry">
-            <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="出厂编号" prop="manufacturingNo">
-            <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="出厂年月" prop="manufacturingDate">
-            <el-date-picker
-              v-model="ruleForm.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '出厂年月'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="型号" prop="modelNo">
-            <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="管理状态" prop="managerState">
-            <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="ABC" prop="abc">
-            <el-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'">
-              <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="标签绑定" prop="labelBind">
-            <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === '详情' ? '' : '标签'" :disabled="title === '详情'" clearable>
-              <template #append>
-                <el-button type="primary" size="small">
-                  扫描
-                </el-button>
-              </template>
-            </el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="立卡年月" prop="cardEstablishmentDate">
-            <el-date-picker
-              v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '立卡年月'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="启用日期" prop="enableDate">
-            <el-date-picker
-              v-model="ruleForm.enableDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '启用日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定方式" prop="mesureType">
-            <el-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'">
-              <el-option v-for="item in mesureTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定周期" prop="mesureCycle">
-            <el-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="12">
-          <el-form-item label="测量范围" prop="mesureRange">
-            <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === '详情' ? '' : '测量范围'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="不确定度" prop="uncertainty">
-            <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === '详情' ? '' : '不确定度'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="使用部门" prop="useDept">
-            <com-tree-select
-              v-if="title !== '详情'"
-              v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-              :tree-props="deptProps"
-            />
-            <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
-              <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="使用人" prop="usePerson">
-            <el-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'">
-              <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="专业分类" prop="majorCategory">
-            <el-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'">
-              <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="检定部门" prop="mesureDept">
-            <com-tree-select
-              v-if="title !== '详情'"
-              v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-              :tree-props="deptProps"
-            />
-            <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
-              <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定日期" prop="mesureDate">
-            <el-date-picker
-              v-model="ruleForm.mesureDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '检定日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="有效日期" prop="validDate">
-            <el-date-picker
-              v-model="ruleForm.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '有效日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定结果" prop="mesureResult">
-            <el-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'">
-              <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="8">
-          <el-form-item label="是否是技术指标需要校准/检定的设备" prop="isCalibrationTestEquipment" label-width="260px">
-            <el-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否是测量工装台账" prop="isMeasureAccount" label-width="260px">
-            <el-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否标准配套设备" prop="isStandardSupportEquipment" label-width="260px">
-            <el-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
+    <detail-block-switch title="基本信息">
+      <template #menu>
+        <slot name="menuswitch" />
+      </template>
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资产编号" prop="assetNo">
+              <el-input v-model.trim="ruleForm.assetNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="资产类型" prop="assetType">
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备编号" prop="equipmentNo">
+              <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="生产厂家" prop="manufacturer">
+              <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="厂家国别" prop="manufacturerCountry">
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号" prop="manufacturingNo">
+              <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂年月" prop="manufacturingDate">
+              <el-date-picker
+                v-model="ruleForm.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '出厂年月'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="型号" prop="modelNo">
+              <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="管理状态" prop="managerState">
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="ABC" prop="abc">
+              <el-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'">
+                <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标签绑定" prop="labelBind">
+              <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === '详情' ? '' : '标签'" :disabled="title === '详情'" clearable>
+                <template #append>
+                  <el-button type="primary" size="small">
+                    扫描
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="立卡年月" prop="cardEstablishmentDate">
+              <el-date-picker
+                v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '立卡年月'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="启用日期" prop="enableDate">
+              <el-date-picker
+                v-model="ruleForm.enableDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '启用日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定方式" prop="mesureType">
+              <el-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'">
+                <el-option v-for="item in mesureTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定周期" prop="mesureCycle">
+              <el-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="测量范围" prop="mesureRange">
+              <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === '详情' ? '' : '测量范围'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="不确定度" prop="uncertainty">
+              <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === '详情' ? '' : '不确定度'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="使用部门" prop="useDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
+                :tree-props="deptProps"
+              />
+              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="使用人" prop="usePerson">
+              <el-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'">
+                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="专业分类" prop="majorCategory">
+              <el-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'">
+                <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="检定部门" prop="mesureDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                :tree-props="deptProps"
+              />
+              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定日期" prop="mesureDate">
+              <el-date-picker
+                v-model="ruleForm.mesureDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '检定日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="有效日期" prop="validDate">
+              <el-date-picker
+                v-model="ruleForm.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '有效日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定结果" prop="mesureResult">
+              <el-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'">
+                <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="8">
+            <el-form-item label="是否是技术指标需要校准/检定的设备" prop="isCalibrationTestEquipment" label-width="260px">
+              <el-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否是测量工装台账" prop="isMeasureAccount" label-width="260px">
+              <el-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否标准配套设备" prop="isStandardSupportEquipment" label-width="260px">
+              <el-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资产来源" prop="assetSource">
-            <el-input v-model.trim="ruleForm.assetSource" :placeholder="title === '详情' ? '' : '资产来源'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备规格" prop="equipmentSpecifications">
-            <el-input v-model.trim="ruleForm.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备类别" prop="equipmentCategory">
-            <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
-              <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备类型" prop="equipmentType">
-            <el-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'">
-              <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资本来源" prop="capitalSource">
-            <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
-              <el-option v-for="item in capitalSourceList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="管理级别" prop="managerLevel">
-            <el-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'">
-              <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="用途" prop="purpose">
-            <el-input v-model.trim="ruleForm.purpose" :placeholder="title === '详情' ? '' : '用途'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="技术水平" prop="technicalLevel">
-            <el-input v-model.trim="ruleForm.technicalLevel" :placeholder="title === '详情' ? '' : '技术水平'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="完好状态" prop="intactState">
-            <el-input v-model.trim="ruleForm.intactState" :placeholder="title === '详情' ? '' : '完好状态'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="外形尺寸" prop="overallDimension">
-            <el-input v-model.trim="ruleForm.overallDimension" :placeholder="title === '详情' ? '' : '外形尺寸'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="重量(吨)" prop="weight">
-            <el-input v-model.trim="ruleForm.weight" :placeholder="title === '详情' ? '' : '重量'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="单价" prop="singlePrice">
-            <el-input v-model.trim="ruleForm.singlePrice" :placeholder="title === '详情' ? '' : '单价'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="安装及杂费" prop="installIncidentalExpenses">
-            <el-input v-model.trim="ruleForm.installIncidentalExpenses" :placeholder="title === '详情' ? '' : '安装及杂费'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="安装地点" prop="installPlace">
-            <el-input v-model.trim="ruleForm.installPlace" :placeholder="title === '详情' ? '' : '安装地点'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="原值" prop="originValue">
-            <el-input v-model.trim="ruleForm.originValue" :placeholder="title === '详情' ? '' : '原值'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="目前原值" prop="presentOriginValue">
-            <el-input v-model.trim="ruleForm.presentOriginValue" :placeholder="title === '详情' ? '' : '目前原值'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="折旧年限" prop="depreciationPeriod">
-            <el-input v-model.trim="ruleForm.depreciationPeriod" :placeholder="title === '详情' ? '' : '折旧年限'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="折旧方法" prop="depreciationMethod">
-            <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
-              <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="属性" prop="attribute">
-            <el-input v-model.trim="ruleForm.attribute" placeholder="属性" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="12">
-          <el-form-item label="说明书" prop="minioFileName">
-            <show-photo :minio-file-name="ruleForm.fileList[0]?.minioFileName || ''" />
-            <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
-            <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
-              {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
-            </el-button>
-            <span v-if="title === '详情' && !ruleForm.fileList[0]?.minioFileName">暂无</span>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="24">
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" placeholder="备注" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资产来源" prop="assetSource">
+              <el-input v-model.trim="ruleForm.assetSource" :placeholder="title === '详情' ? '' : '资产来源'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备规格" prop="equipmentSpecifications">
+              <el-input v-model.trim="ruleForm.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备类别" prop="equipmentCategory">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+                <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备类型" prop="equipmentType">
+              <el-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'">
+                <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资本来源" prop="capitalSource">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+                <el-option v-for="item in capitalSourceList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="管理级别" prop="managerLevel">
+              <el-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'">
+                <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="用途" prop="purpose">
+              <el-input v-model.trim="ruleForm.purpose" :placeholder="title === '详情' ? '' : '用途'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="技术水平" prop="technicalLevel">
+              <el-input v-model.trim="ruleForm.technicalLevel" :placeholder="title === '详情' ? '' : '技术水平'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="完好状态" prop="intactState">
+              <el-input v-model.trim="ruleForm.intactState" :placeholder="title === '详情' ? '' : '完好状态'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="外形尺寸" prop="overallDimension">
+              <el-input v-model.trim="ruleForm.overallDimension" :placeholder="title === '详情' ? '' : '外形尺寸'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="重量(吨)" prop="weight">
+              <el-input v-model.trim="ruleForm.weight" :placeholder="title === '详情' ? '' : '重量'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="单价" prop="singlePrice">
+              <el-input v-model.trim="ruleForm.singlePrice" :placeholder="title === '详情' ? '' : '单价'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="安装及杂费" prop="installIncidentalExpenses">
+              <el-input v-model.trim="ruleForm.installIncidentalExpenses" :placeholder="title === '详情' ? '' : '安装及杂费'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="安装地点" prop="installPlace">
+              <el-input v-model.trim="ruleForm.installPlace" :placeholder="title === '详情' ? '' : '安装地点'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="原值" prop="originValue">
+              <el-input v-model.trim="ruleForm.originValue" :placeholder="title === '详情' ? '' : '原值'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="目前原值" prop="presentOriginValue">
+              <el-input v-model.trim="ruleForm.presentOriginValue" :placeholder="title === '详情' ? '' : '目前原值'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="折旧年限" prop="depreciationPeriod">
+              <el-input v-model.trim="ruleForm.depreciationPeriod" :placeholder="title === '详情' ? '' : '折旧年限'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="折旧方法" prop="depreciationMethod">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+                <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="属性" prop="attribute">
+              <el-input v-model.trim="ruleForm.attribute" placeholder="属性" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="说明书" prop="minioFileName">
+              <show-photo :minio-file-name="ruleForm.fileList[0]?.minioFileName || ''" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
+                {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
+              </el-button>
+              <span v-if="title === '详情' && !ruleForm.fileList[0]?.minioFileName">暂无</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" placeholder="备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block-switch>
   </div>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    padding-top: 20px;
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index f46553a..fc3fd54 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -360,20 +360,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          固定资产-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`固定资产-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -763,44 +758,11 @@
           </el-row>
         </div> -->
       </el-form>
-    </div>
+    </detail-page>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index 0abbdb1..6e88e96 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -74,33 +74,29 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ name }} -{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm">
-            关闭
-          </el-button>
-        </span>
-      </div>
-      <div class="body">
-        <!-- 三级菜单 -->
-        <el-radio-group v-model="current">
-          <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
-            {{ item.name }}
-          </el-radio-button>
-        </el-radio-group>
-      </div>
-      <!-- 展示区域 -->
-      <keep-alive>
-        <component :is="currentComp" ref="currentCompRef" :name="current" :title="title" :row="row" />
-      </keep-alive>
-    </div>
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <!-- 展示区域 -->
+    <keep-alive>
+      <component :is="currentComp" ref="currentCompRef" :name="current" :title="title" :row="row">
+        <template #menuswitch>
+          <!-- 三级菜单 -->
+          <el-radio-group v-model="current">
+            <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+              {{ item.name }}
+            </el-radio-button>
+          </el-radio-group>
+        </template>
+      </component>
+    </keep-alive>
   </app-container>
 </template>
 
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f9cdcd0..f653095 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -256,7 +256,7 @@
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
-  // 原生上传图片
+  // 原生上传
   // console.log(event.target.files)
   // if (event.target.files[0].type === 'application/pdf') {
   if (event.target.files?.length !== 0) {
@@ -354,7 +354,7 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" type="primary" @click="identify">
+          <!-- <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" type="primary" @click="identify">
             标签识别
           </el-button>
           <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/import`)" type="primary" @click="batchImport">
@@ -371,7 +371,13 @@
           </el-button>
           <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/print`)" v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/device/standingBook/components/templateTable.vue b/src/views/device/standingBook/components/templateTable.vue
index 8a928f0..7aa563f 100644
--- a/src/views/device/standingBook/components/templateTable.vue
+++ b/src/views/device/standingBook/components/templateTable.vue
@@ -245,11 +245,11 @@
   <div>
     <!-- 添加证书信息组件 -->
     <add-row ref="addRowRef" @add="addRowData" />
-    <div class="header">
-      <div class="title">
-        <!-- {{ $props.name }} -->
-      </div>
-      <span class="btns">
+    <detail-block-switch :title="name">
+      <template #menu>
+        <slot name="menuswitch" />
+      </template>
+      <template #btns>
         <el-button v-if="title !== '详情'" type="info" @click="removeRow">
           删除行
         </el-button>
@@ -259,55 +259,33 @@
         <el-button v-if="title !== '详情'" type="primary" @click="editRow">
           编辑行
         </el-button>
-      </span>
-    </div>
-    <!-- 表格区域 -->
-    <normal-table
-      id="print"
-      :data="list" :total="total" :columns="columns as any"
-      :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-      :list-loading="loadingTable"
-      style="padding-top: 20px;background-color: #fff;"
-      @change="changePage"
-    >
-      <template #preColumns>
-        <el-table-column label="" width="55" align="center">
-          <template #default="scope">
-            <el-radio v-model="select" :label="scope.$index" class="radio" />
-          </template>
-        </el-table-column>
-        <el-table-column label="序号" width="55" align="center">
-          <template #default="scope">
-            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-          </template>
-        </el-table-column>
       </template>
-    </normal-table>
+      <!-- 表格区域 -->
+      <normal-table
+        id="print"
+        :data="list" :total="total" :columns="columns as any"
+        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+        :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </detail-block-switch>
   </div>
 </template>
 
 <style lang="scss" scoped>
-.header {
-  background-color: #fff;
-  // height: 40px;
-  border-radius: 8px;
-  display: flex;
-  align-items: center;
-  flex-direction: column;
-  justify-content: center;
-  position: relative;
-
-  .title {
-    // font-weight: 700;
-  }
-
-  .btns {
-    position: absolute;
-    right: 40px;
-    top: -22px;
-  }
-}
-
 :deep(.el-radio__label) {
   display: none;
 }
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 7538bc8..78a3800 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -272,24 +272,12 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/identify`)" type="primary" @click="identify">
-            标签识别
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/import`)" type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/mould`)" type="primary" @click="templateDownload">
-            模板下载
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/add`)" type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/export`)" type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/print`)" v-print="printObj" type="primary">
-            打印
-          </el-button>
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/identify`)" icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index fc364c8..e74d70e 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -361,20 +361,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ name }} - {{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -458,73 +453,33 @@
           </el-col>
         </el-row>
       </el-form>
-      <div v-if="title !== '新建' ">
-        <div class="header" style="margin-top: 10px;">
-          <div class="title">
-            审批流程
-          </div>
-        </div>
-        <div class="timeline">
-          <el-timeline>
-            <el-timeline-item timestamp="2018/4/12" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/12 20:46</p>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="2018/4/3" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/3 20:46</p>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="2018/4/2" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/2 20:46</p>
-              </el-card>
-            </el-timeline-item>
-          </el-timeline>
-        </div>
-      </div>
-    </div>
+    </detail-page>
+    <detail-block v-if="title !== '新建' " title="审批流程">
+      <el-timeline>
+        <el-timeline-item timestamp="2018/4/12" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/12 20:46</p>
+          </el-card>
+        </el-timeline-item>
+        <el-timeline-item timestamp="2018/4/3" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/3 20:46</p>
+          </el-card>
+        </el-timeline-item>
+        <el-timeline-item timestamp="2018/4/2" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/2 20:46</p>
+          </el-card>
+        </el-timeline-item>
+      </el-timeline>
+    </detail-block>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .timeline {
   background-color: #fff;
 }
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index aa3963f..737568d 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -1,6 +1,6 @@
 <!-- 状态管理公共列表组件 -->
 <script lang="ts" setup>
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessageBox } from 'element-plus'
 import approve from './approvalActionDialog.vue'
 import addDialog from './templateAdd.vue'
 const props = defineProps({
@@ -142,7 +142,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: any) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     title: '详情',
@@ -150,7 +150,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: any) => {
   dialogVisible.value = true
   // addRef.value.initDialog({
   //   title: '编辑',
@@ -158,7 +158,7 @@
   // })
 }
 // 删除
-const remove = (row) => {
+const remove = (row: any) => {
   ElMessageBox.confirm(
     `确认删除${row.equipmentName}吗？`,
     '提示',
@@ -181,20 +181,20 @@
   // })
 }
 // 同意
-const agree = (row) => {
+const agree = (row: any) => {
   console.log(approveRef.value)
   approveRef.value.initDialog({
     radio: '1',
   })
 }
 // 驳回
-const reject = (row) => {
+const reject = (row: any) => {
   approveRef.value.initDialog({
     radio: '3',
   })
 }
 // 拒绝
-const refuse = (row) => {
+const refuse = (row: any) => {
   approveRef.value.initDialog(
     {
       radio: '2',
@@ -202,7 +202,7 @@
   )
 }
 // 取消
-const cancel = (row) => {
+const cancel = (rowrow: any) => {
   ElMessageBox.confirm(
     '确认取消吗？',
     '提示',
@@ -301,20 +301,20 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+          <el-input placeholder="申请编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="设备编号" clearable class="w-50 m-2" />
+          <el-input placeholder="设备编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.modelNo" placeholder="设备名称" clearable class="w-50 m-2" />
+          <el-input placeholder="设备名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请单位" clearable class="w-50 m-2" />
+          <el-input placeholder="申请单位" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.publisher" placeholder="申请状态" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" />
+          <el-select placeholder="申请状态" clearable>
+            <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" /> -->
           </el-select>
         </search-item>
       </search-area>
@@ -328,7 +328,10 @@
           <el-button type="primary" @click="templateDownload">
             模板下载
           </el-button> -->
-          <el-button type="primary" @click="add">
+          <icon-button icon="icon-add" title="新建" @click="add" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+          <!-- <el-button type="primary" @click="add">
             新建
           </el-button>
           <el-button type="primary" @click="exportExcelBtn">
@@ -336,7 +339,7 @@
           </el-button>
           <el-button v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
         </template>
         <!-- 表格区域 -->
         <normal-table
@@ -386,22 +389,3 @@
     </app-container>
   </div>
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 154px !important;
-}
-
-.normal-date {
-  width: 154px !important;
-}
-
-.normal-select {
-  width: 154px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
-
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 0763c5a..9ef0b93 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -19,7 +19,6 @@
 const effectiveStatusName = ref('')
 const title = ref('')
 const fileList = ref<UploadUserFile[]>([])
-console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -80,10 +79,9 @@
   if (row.title === '新建') {
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
-    ruleForm.publisher = ''
+    ruleForm.publisher = userInfo.$state.deptName
     ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 判断有无存储
-    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
     if (sessionStorage.getItem(fileTypeName.value)) {
       const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
       ruleForm.fileType = session.fileType
@@ -117,6 +115,8 @@
     ruleForm.remark = row.remark
     ruleForm.publishTime = row.publishTime
     ruleForm.minioFileName = row.minioFileName
+    // ruleForm.publisher = '0'
+    // ruleForm.createUserId = '1'
   }
 }
 defineExpose({ initDialog })
@@ -148,6 +148,9 @@
       type: 'warning',
     },
       ).then((res) => {
+        if (ruleForm.publisher === userInfo.$state.deptName) {
+          ruleForm.publisher === userInfo.$state.deptId
+        }
         if (flag == '提交') {
           addApi(ruleForm).then((res) => {
             if (res.code == 200) {
@@ -193,7 +196,6 @@
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        console.log(res.data[0])
         ruleForm.minioFileName = res.data[0]
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
@@ -216,7 +218,6 @@
 // ])
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
-  console.log(diffDat)
   if (diffDat < 0) {
     // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '在使用'
@@ -237,7 +238,7 @@
 
 <template>
   <app-container v-if="dialogVisible" style="overflow: hidden;">
-    <detail-page :title="`${title}${fileTypeName}`">
+    <detail-page :title="`${fileTypeName}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
           提交
@@ -278,12 +279,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="发布单位" prop="publisher">
-              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'" class="fill-input">
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled>
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
               <com-tree-select
                 v-else
-                v-model="ruleForm.publisher" :options="PubListTree" placeholder="选择组织机构"
+                v-model="ruleForm.publisher" :options="PubListTree" placeholder="请选择发布单位"
                 :tree-props="deptProps"
               />
             </el-form-item>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 44e3e4d..b45fbc3 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -324,22 +324,9 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <!-- <el-button type="primary" @click="batchImport">
-            批量导入
-          </el-button> -->
-          <!-- <el-button type="primary" @click="templateDownload">
-            模板下载
-          </el-button> -->
-          <!-- <el-button type="primary" @click="add">
-            新建
-          </el-button> -->
-          <el-button type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-print="printObj" type="primary">
-            打印
-          </el-button>
+          <!-- <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange"> -->
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 4677e48..7d4724b 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -204,13 +204,9 @@
     loading.close()
   })
 }
-// 打印
-const print = () => {
-
-}
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
-  // 原生上传图片
+  // 原生上传
   // console.log(event.target.files)
   // if (event.target.files[0].type === 'application/pdf') {
   if (event.target.files?.length !== 0) {
@@ -264,7 +260,7 @@
         <search-item>
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
-        <search-item>
+        <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
@@ -273,13 +269,13 @@
               :value="item.value"
             />
           </el-select>
-        </search-item>
+        </search-item> -->
         <search-item>
           <el-date-picker
             v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 155px;"
+            style="width: 185px;"
           />
         </search-item>
         <search-item>
@@ -287,19 +283,19 @@
             v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 155px;"
+            style="width: 185px;"
           />
         </search-item>
         <search-item>
-          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select> -->
-          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
+          </el-select>
+          <!-- <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" /> -->
         </search-item>
       </search-area>
       <table-container>
@@ -310,7 +306,7 @@
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
-          <icon-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" @click="print" />
+          <icon-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index cf0dd4f..5ca3275 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -3,11 +3,11 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { detailType } from '../measureDept-interface'
-import { getUserList } from '@/api/system/user'
+// import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
+import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import type { userType } from '@/views/system/user/user-interface'
 import { listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
-import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
 const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -31,11 +31,20 @@
   technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
+// 获取计量人员列表
 const getuser = () => {
-  getUserList({ offset: 1, limit: 99999 }).then((res) => {
-    userList.value = res.data.rows
+  getStaffList({
+    staffNo: '', // 人员编号
+    name: '', // 姓名
+    deptId: ruleForm.value.deptId, // 所在部门
+    limit: 999999,
+    offset: 1,
+  }).then((res) => {
+    if (res.code === 200) {
+      userList.value = res.data.records
+    }
   })
-} // 获取用户列表
+}
 const technologyJobList = ref<{ id: string;name: string;value: string }[]>([])
 // 获取技术职务列表
 const getTechnologyJobList = () => {
@@ -50,7 +59,16 @@
     administrationJobList.value = response.data
   })
 }
-
+// 选择负责人自动填充职务信息
+const directorChange = (val: string) => {
+  const selectUser = userList.value.filter(item => item.name === val)[0]
+  getStaffDetail(selectUser).then((res) => {
+    if (res.code === 200) {
+      ruleForm.value.administrationJob = res.data.administrationJob
+      ruleForm.value.technologyJob = res.data.technologyJob
+    }
+  })
+}
 // 提交
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
@@ -95,12 +113,6 @@
 const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
-// const searchQuery = ref({
-//   limit: 10,
-//   offset: 1,
-//   total: 0,
-//   pageSizes: [10, 20, 30],
-// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -410,20 +422,6 @@
     }
   })
 }
-// const handleSizeChange = (val: number) => {
-//   searchQuery.value.limit = val
-//   getDepartmentList()
-//   getuserInfoList()
-//   getInstrumentInfo()
-//   getDeviceInfo()
-// }
-// const handleCurrentChange = (val: number) => {
-//   searchQuery.value.offset = val
-//   getDepartmentList()
-//   getuserInfoList()
-//   getInstrumentInfo()
-//   getDeviceInfo()
-// }
 // 弹窗初始化
 const initDialog = (row: any) => {
   reset()
@@ -460,22 +458,17 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title.split('-')[2] === '编辑'" type="primary" @click="submitForm(ruleFormRef)">
-            提交
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="title">
+      <template #btns>
+        <el-button v-if="title.split('-')[2] === '编辑'" type="primary" @click="submitForm(ruleFormRef)">
+          提交
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title.split('-')[2] === '详情' ? 'isDetail' : '']">
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item :label=" `${title.split('-')[1]}编号`" prop="organizeNo">
               <el-input v-model.trim="ruleForm.organizeNo" placeholder="系统自动生成" disabled />
@@ -487,7 +480,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="title.split('-')[1] === '工程组'" :gutter="24" class="marg">
+        <el-row v-if="title.split('-')[1] === '工程组'" :gutter="24">
           <el-col :span="6">
             <el-form-item label="科室编号">
               <el-input v-model.trim="ruleForm.pDeptId" disabled />
@@ -509,10 +502,10 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
-              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" @change="directorChange">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.name" />
               </el-select>
             </el-form-item>
@@ -532,7 +525,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="24">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
               <el-input v-model.trim="ruleForm.remark" :placeholder="title.split('-')[2] === '详情' ? '' : '备注'" :disabled="title.split('-')[2] === '详情'" />
@@ -540,85 +533,24 @@
           </el-col>
         </el-row>
       </el-form>
-      <!-- 科室信息-人员信息等列表切换 -->
-      <div>
-        <div class="header" style="margin-top: 10px;">
-          <!-- 切换 -->
-          <el-radio-group v-model="current" class="change-btn">
-            <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
-              {{ item.name }}
-            </el-radio-button>
-          </el-radio-group>
-          <div class="title">
-            {{ current }}
-          </div>
-          <span class="btns">
-          <!-- <el-button type="info" :disabled="title === '详情'" @click="removeRow">
-            删除行
-          </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
-            添加行
-          </el-button> -->
-          </span>
-        </div>
-        <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <el-table-column type="index" label="序号" width="55" align="center" />
-          <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
-        </el-table>
-        <!-- <div style="width: 100%;margin-top: 10px;">
-          <el-pagination
-            :current-page="searchQuery.offset"
-            :page-sizes="searchQuery.pageSizes"
-            :page-size="searchQuery.limit"
-            :total="searchQuery.total"
-            layout="total, sizes, prev, pager, next"
-            hide-on-single-page
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-          />
-        </div> -->
-      </div>
-    </div>
+    </detail-page>
+    <detail-block-switch :title="current">
+      <template #menu>
+        <el-radio-group v-model="current" class="change-btn">
+          <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
+            {{ item.name }}
+          </el-radio-button>
+        </el-radio-group>
+      </template>
+      <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
+        <el-table-column type="index" label="序号" width="55" align="center" />
+        <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </detail-block-switch>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-    position: relative;
-
-    .change-btn {
-      position: absolute;
-      left: 40px;
-      top: 4px;
-    }
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 4px;
-    }
-  }
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
@@ -628,8 +560,4 @@
     }
   }
 }
-
-.marg {
-  margin-top: 10px;
-}
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 9ad87af..aac1ef2 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -231,12 +231,14 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
+          <!-- <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
           <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
+          <icon-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 2e3322a..3f472eb 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -41,7 +41,7 @@
   { text: '证书号', value: 'certificateNo', align: 'center' },
   { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
   { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'validDate', align: 'center', width: '200' },
   { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
 ]) // 表格
 const certificateStatusList = ref([
@@ -90,7 +90,7 @@
   loadingTable.value = true
   getCertificateList(searchQuery).then((res) => {
     if (res.code === 200) {
-      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效' }))
+      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效', validDate: item.validDate.split(' ')[0], certificateDate: item.certificateDate.split(' ')[0] }))
       list.value = res.data.records
       total.value = Number(res.data.total)
     }
@@ -115,6 +115,7 @@
   addRef.value.initDialog({
     ...row,
     title: '详情',
+    name: props.isRemind ? '证书状况' : '证书记录',
   })
 }
 // 编辑
@@ -123,6 +124,7 @@
   addRef.value.initDialog({
     ...row,
     title: '编辑',
+    name: props.isRemind ? '证书状况' : '证书记录',
   })
 }
 
@@ -193,6 +195,7 @@
   dialogVisible.value = true
   addRef.value.initDialog({
     title: '新建',
+    name: props.isRemind ? '证书状况' : '证书记录',
   })
 }
 // 导出
@@ -292,21 +295,11 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
-            模板下载
-          </el-button>
-          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
-            打印
-          </el-button>
+          <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
@@ -325,7 +318,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column fixed="right" label="操作" align="center" width="150">
+            <el-table-column fixed="right" label="操作" align="center" width="180">
               <template #default="{ row }">
                 <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
                   提醒
@@ -336,7 +329,7 @@
                 <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 4dc1b17..4352604 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -69,7 +69,16 @@
     const IdCard = ruleForm.value.idCard
     const birthday = `${IdCard.substring(6, 10)}-${IdCard.substring(10, 12)}`
     ruleForm.value.birthday = birthday
-    console.log(ruleForm.value)
+    // 获取性别 第17位  奇数为男 偶数为女
+    // ruleForm.value.sex
+    if (Number(IdCard.substring(16, 17)) % 2) {
+      // 男
+      ruleForm.value.sex = '1'
+    }
+    else {
+      //  女
+      ruleForm.value.sex = '2'
+    }
   })
 }
 const dialogVisible = ref<boolean>(false) // 弹窗显示
@@ -130,7 +139,6 @@
     technologyExam: '', // 技术考核
     remark: '', // 备注
     certificateList: [], // 证书列表
-
   }
 }
 const technologyJobList = ref<technologyJobType[]>([])
@@ -309,7 +317,7 @@
           }
           (title.value === '新建'
             ? getStaffAdd
-            : getStaffupdate) ({ ...ruleForm.value, certificateList: changeList.value[0].data }).then((res) => {
+            : getStaffupdate) ({ ...ruleForm.value, certificateList: changeList.value[0].data, birthday: `${ruleForm.value.idCard.substring(6, 10)}-${ruleForm.value.idCard.substring(10, 12)}-${ruleForm.value.idCard.substring(12, 14)}` }).then((res) => {
             if (res.code == 200) {
               formEl?.resetFields()
               ElMessage.success('提交成功')
@@ -332,12 +340,14 @@
   emits('resetData')
   resetFormData()
 }
+const selectTreeRef = ref()
 // 弹窗初始化
 const initDialog = (row: any) => {
   changeList.value[0].data = []
   dialogVisible.value = true
   title.value = row.title
   resetFormData()
+  selectTreeRef.value?.clearSelected()
   getuser()
   getPubList()
   getSexList()
@@ -370,20 +380,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          计量人员-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
-            完成
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`计量人员-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+          完成
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
         <el-row :gutter="24" class="marg">
           <el-col :span="5">
@@ -394,6 +399,7 @@
                 :http-request="uploadQuarterlyEvaluateFile"
                 :before-upload="beforeAvatarUpload"
                 :disabled="title === '详情'"
+                accept="image/png, image/jpeg,image/jpg"
               >
                 <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
                 <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
@@ -425,8 +431,8 @@
               </el-select>
               <com-tree-select
                 v-else
-                v-model="ruleForm.deptId" :options="PubListTree" placeholder="选择组织机构"
-                :tree-props="deptProps"
+                ref="selectTreeRef" v-model="ruleForm.deptId" :options="PubListTree"
+                placeholder="选择组织机构" :tree-props="deptProps"
               />
             </el-form-item>
             <el-form-item label="计量专业" prop="major" class="marg-item">
@@ -489,29 +495,19 @@
           </el-col>
         </el-row>
       </el-form>
-      <!-- 证书基本信息 -->
-      <!-- 切换 -->
-      <!-- <el-radio-group v-model="current" style="margin-bottom: -15px;">
-          <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
-            {{ item.name }}
-          </el-radio-button>
-        </el-radio-group> -->
-      <div class="header" style="margin-top: 10px;">
-        <div class="title">
-          {{ current }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="info" @click="removeRow">
-            删除行
-          </el-button>
-          <el-button v-if="title !== '详情'" type="primary" @click="addRow">
-            添加行
-          </el-button>
-          <el-button v-if="title !== '详情'" type="primary" @click="editRow">
-            编辑行
-          </el-button>
-        </span>
-      </div>
+    </detail-page>
+    <detail-block :title="current">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="info" @click="removeRow">
+          删除行
+        </el-button>
+        <el-button v-if="title !== '详情'" type="primary" @click="addRow">
+          添加行
+        </el-button>
+        <el-button v-if="title !== '详情'" type="primary" @click="editRow">
+          编辑行
+        </el-button>
+      </template>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
         <el-table-column width="55" align="center">
           <template #default="scope">
@@ -523,7 +519,7 @@
         <el-table-column type="index" label="序号" width="55" />
         <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
       </el-table>
-    </div>
+    </detail-block>
     <!-- 添加证书信息组件 -->
     <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
     <!-- 选择用户列表组件 -->
@@ -532,77 +528,38 @@
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    background-color: #fff;
-    border-radius: 8px;
-    padding-top: 10px;
-    margin-top: 10px;
-    padding-right: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    display: flex;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    position: relative;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 5px;
-    }
-  }
-
-  :deep(.el-radio__label) {
-    display: none;
-  }
-
-  :deep(.el-icon.avatar-uploader-icon) {
-    font-size: 28px;
-    color: #8c939d;
-    width: 190px;
-    height: 250px;
-    text-align: center;
-  }
-
-  :deep(.avatar-uploader .avatar) {
-    width: 190px;
-    height: 250px;
-    display: block;
-  }
-
-  .isDetail {
-    ::v-deep {
-      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-        display: none;
-      }
-    }
-  }
+:deep(.el-radio__label) {
+  display: none;
 }
 
-.marg {
-  margin-top: 20px;
+:deep(.el-icon.avatar-uploader-icon) {
+  font-size: 28px;
+  color: #8c939d;
+  width: 190px;
+  height: 250px;
+  text-align: center;
 }
 
-.marg-item {
-  margin-top: 20px;
+:deep(.avatar-uploader .avatar) {
+  width: 190px;
+  height: 250px;
+  display: block;
+}
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
 }
 </style>
 
 <style scoped>
 .avatar-uploader .avatar {
-  width: 220px;
-  height: 320px;
+  width: 190px;
+  height: 250px;
   display: block;
 }
 </style>
@@ -624,8 +581,8 @@
 .el-icon.avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
-  width: 220px;
-  height: 320px;
+  width: 190px;
+  height: 250px;
   text-align: center;
 }
 </style>
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index ae48f11..042636e 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -4,7 +4,6 @@
 import dayjs from 'dayjs'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import type { technologyJobType } from '../person-interface'
-import certificateAddDialog from './certificateAddDialog.vue'
 import personListDialog from './personListDialog.vue'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
@@ -14,7 +13,8 @@
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
-const ruleFormRef = ref<FormInstance>() // from组件
+const ruleFormRef1 = ref<FormInstance>() // from组件
+const ruleFormRef2 = ref<FormInstance>() // from组件
 const meterStaff = ref({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -28,26 +28,43 @@
   workDate: '', // 从事日期
   id: '',
 })
+const baseInfo = ref({
+  certificateCompany: '',
+  certificateDate: '',
+  certificateName: '',
+  certificateNo: '',
+  validDate: '',
+  id: '',
+  isDel: 0,
+  minioFileName: '',
+  remark: '',
+})
 const ruleForm = ref({
   meterStaff: {}, // 人员信息
   staffId: '', // 计量人员id
 }) // 表单
-const multipleTableRef = ref<InstanceType<typeof ElTable>>()
 const title = ref('')
+const name = ref('')
 // 身份证号码验证规则
-const validateIDcard = (rule: any, value: any, callback: any) => {
-  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
-  if (rr.test(value)) {
-    callback()
-  }
-  else {
-    callback(new Error('验证失败'))
-  }
-}
+// const validateIDcard = (rule: any, value: any, callback: any) => {
+//   const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+//   if (rr.test(value)) {
+//     callback()
+//   }
+//   else {
+//     callback(new Error('验证失败'))
+//   }
+// }
 const rules = ref({
   staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
   // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
-
+}) // 表单验证规则
+const rules2 = ref({
+  certificateCompany: [{ required: true, message: '发证单位不能为空', trigger: 'blur' }],
+  certificateDate: [{ required: true, message: '发证日期不能为空', trigger: 'blur' }],
+  certificateName: [{ required: true, message: '证书名称不能为空', trigger: 'blur' }],
+  certificateNo: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
+  validDate: [{ required: true, message: '有效日期不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
 const userList = ref<userType[]>([]) // 可使用人列表
@@ -96,6 +113,17 @@
   meterStaff.value.major = ''
   meterStaff.value.workDate = ''
   meterStaff.value.id = ''
+  baseInfo.value = {
+    certificateCompany: '',
+    certificateDate: '',
+    certificateName: '',
+    certificateNo: '',
+    validDate: '',
+    id: '',
+    isDel: 0,
+    minioFileName: '',
+    remark: '',
+  }
 }
 const technologyJobList = ref<technologyJobType[]>([])
 // 获取技术职务列表
@@ -120,98 +148,14 @@
 const confirmPerson = (row: any) => {
   ruleForm.value.staffId = row.staffNo
   meterStaff.value = row
-  ruleFormRef.value?.clearValidate('staffNo')
+  ruleFormRef1.value?.clearValidate('staffNo')
 }
-const changeList = ref([
-  {
-    name: '证书基本信息',
-    data: [] as any[],
-    column: [
-      {
-        label: '证书号',
-        data: 'certificateNo',
-        id: 'zs02',
-      },
-      {
-        label: '证书名称',
-        data: 'certificateName',
-        id: 'zs03',
-      },
-      {
-        label: '发证日期',
-        data: 'certificateDate',
-        id: 'zs04',
-      },
-      {
-        label: '发证单位',
-        data: 'certificateCompany',
-        id: 'zs01',
-      },
-      {
-        label: '有效日期',
-        data: 'validDate',
-        id: 'zs05',
-      },
-    ],
-  },
-  {
-    name: '计量工作培训记录',
-    data: [],
-    column: [],
-  },
-  {
-    name: '业务记录',
-    data: [],
-    column: [],
-  },
-])
-const current = ref('证书基本信息')
-const currentShow = computed(() => {
-  return changeList.value.filter(item => item.name === current.value)[0]
-})
-const certificateRef = ref() // 添加证书信息弹窗
-// 添加行
-const addRow = () => {
-  certificateRef.value.initDialog({ title: '添加' })
-}
-// 编辑行
-const editRow = () => {
-  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
-}
-// 证书信息行内添加数据
-const addRowcertificate = (row: any, flag: string) => {
-  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
-  if (flag === 'update') {
-    changeList.value[0].data = [{
-      ...changeList.value[0].data[0],
-      ...row,
-      certificateStatus: diff < 0 ? '1' : '0',
-      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-    }]
-  }
-  else {
-    changeList.value[0].data.push(
-      {
-        ...row,
-        certificateStatus: diff < 0 ? '1' : '0',
-        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-        id: null,
-        isDel: 0,
-        minioFileName: '',
-        remark: '',
-        staffId: meterStaff.value.id,
-        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-      })
-  }
-}
-const currenSelect = ref<number>(-1) // 当前选中行
-// 删除行
-const removeRow = () => {
-  console.log(currenSelect.value)
-  if (currenSelect.value >= 0) {
+// 提交
+const submitForm = async (formEl1: FormInstance | undefined, formEl2: FormInstance | undefined) => {
+  if (!formEl1 || !formEl2) { return }
+  Promise.all([formEl1.validate(), formEl2.validate()]).then((res) => {
     ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
+      '确认提交吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -219,78 +163,49 @@
         type: 'warning',
       },
     ).then(() => {
-      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
-      currenSelect.value = -1
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 提交
-const submitForm = async (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  await formEl.validate((valid, fields) => {
-    if (valid) {
-      ElMessageBox.confirm(
-        '确认提交吗？',
-        '提示',
-        {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        },
-      ).then(() => {
-        let params
-        if (changeList.value[0].data.length) {
-          params = changeList.value[0].data
-        }
-        else {
-          params = [
-            {
-              certificateCompany: '',
-              certificateDate: '',
-              certificateName: '',
-              certificateNo: '',
-              certificateStatus: '',
-              createTime: '',
-              id: null,
-              isDel: 0,
-              minioFileName: '',
-              remark: '',
-              staffId: meterStaff.value.id,
-              updateTime: '',
-              validDate: '',
-            },
-          ]
-        }
-        (title.value === '新建'
-          ? addCertificateList
-          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
-          formEl?.resetFields()
-          ElMessage.success('提交成功')
-          emits('resetData')
-          resetFormData()
-        })
+      (title.value === '新建'
+        ? addCertificateList
+        : getCertificateUpdate)(title.value === '新建'
+        ? [{
+            ...baseInfo.value,
+            staffId: meterStaff.value.id,
+            createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+            updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+            certificateStatus: dayjs(baseInfo.value.validDate).diff(baseInfo.value.certificateDate, 'day') < 0 ? '1' : '0',
+            meterStaff: undefined,
+          }]
+        : {
+            ...baseInfo.value,
+            staffId: meterStaff.value.id,
+            createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+            updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+            certificateStatus: dayjs(baseInfo.value.validDate).diff(baseInfo.value.certificateDate, 'day') < 0 ? '1' : '0',
+            meterStaff: undefined,
+          }).then((res) => {
+        formEl1?.resetFields()
+        formEl2?.resetFields()
+        ElMessage.success('提交成功')
+        emits('resetData')
+        resetFormData()
       })
-    }
+    })
   })
 }
 // 取消
-const resetForm = (formEl: FormInstance | undefined) => {
+const resetForm = (formEl: FormInstance | undefined, formEl2: FormInstance | undefined) => {
   formEl?.resetFields()
-  changeList.value[0].data = []
+  formEl2?.resetFields()
   emits('resetData')
   resetFormData()
 }
+const selectTreeRef = ref()
 // 弹窗初始化
 const initDialog = (row: any) => {
-  changeList.value[0].data = []
   resetFormData()
   dialogVisible.value = true
   title.value = row.title
-  resetFormData()
+  name.value = row.name
+  selectTreeRef.value?.clearSelected()
   getuser()
   getPubList()
   getSexList()
@@ -303,8 +218,9 @@
   else {
     getCertificateDetail({ id: row.id }).then((res) => {
       if (res.code === 200) {
+        console.log(res, '证书记录')
         meterStaff.value = res.data.meterStaff
-        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+        baseInfo.value = res.data
       }
     })
   }
@@ -314,21 +230,16 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          证书记录-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
-            完成
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
-      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+    <detail-page :title=" `${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
+          完成
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef1, ruleFormRef2)">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef1" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="人员编号" prop="staffNo">
@@ -390,7 +301,8 @@
               </el-select>
               <com-tree-select
                 v-else
-                v-model="meterStaff.deptId" :options="PubListTree" placeholder="选择组织机构"
+                ref="selectTreeRef" v-model="meterStaff.deptId" :options="PubListTree"
+                placeholder="选择组织机构"
                 :tree-props="deptProps"
               />
             </el-form-item>
@@ -410,71 +322,52 @@
           </el-col>
         </el-row>
       </el-form>
-      <div class="header" style="margin-top: 10px;">
-        <div class="title">
-          {{ current }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title === '新建'" type="info" @click="removeRow">
-            删除行
-          </el-button>
-          <el-button v-if="title === '新建'" type="primary" @click="addRow">
-            添加行
-          </el-button>
-          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
-            编辑行
-          </el-button>
-        </span>
-      </div>
-      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
-        <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column>
-        <el-table-column type="index" label="序号" width="55" />
-        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
-      </el-table>
-    </div>
-    <!-- 添加证书信息组件 -->
-    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    </detail-page>
+    <detail-block title="证书基本信息">
+      <el-form ref="ruleFormRef2" :model="baseInfo" :rules="rules2" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="证书号" prop="certificateNo">
+              <el-input v-model.trim="baseInfo.certificateNo" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书名称" prop="certificateName">
+              <el-input v-model.trim="baseInfo.certificateName" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证单位" prop="certificateCompany">
+              <el-input v-model.trim="baseInfo.certificateCompany" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发证日期" prop="certificateDate">
+              <el-date-picker
+                v-model="baseInfo.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择发证日期"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书有效日期" prop="validDate">
+              <el-date-picker
+                v-model="baseInfo.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择有效日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block>
     <!-- 选择用户列表组件 -->
     <person-list-dialog ref="personListRef" @add="confirmPerson" />
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    background-color: #fff;
-    border-radius: 8px;
-    padding-top: 10px;
-    margin-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    display: flex;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    position: relative;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 5px;
-    }
-  }
-
   :deep(.el-radio__label) {
     display: none;
   }
@@ -487,40 +380,5 @@
       }
     }
   }
-}
-
-.marg {
-  margin-top: 20px;
-}
 </style>
 
-<style scoped>
-.avatar-uploader .avatar {
-  width: 178px;
-  height: 178px;
-  display: block;
-}
-</style>
-
-<style>
-.avatar-uploader .el-upload {
-  border: 1px dashed var(--el-border-color);
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-  transition: var(--el-transition-duration-fast);
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: var(--el-color-primary);
-}
-
-.el-icon.avatar-uploader-icon {
-  font-size: 28px;
-  color: #8c939d;
-  width: 178px;
-  height: 178px;
-  text-align: center;
-}
-</style>
diff --git a/src/views/measure/person/components/addRecordCancel.vue b/src/views/measure/person/components/addRecordCancel.vue
new file mode 100644
index 0000000..c32ac43
--- /dev/null
+++ b/src/views/measure/person/components/addRecordCancel.vue
@@ -0,0 +1,459 @@
+<!-- 计量人员新增  证书基本信息table表格   作废 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import type { technologyJobType } from '../person-interface'
+import certificateAddDialog from './certificateAddDialog.vue'
+import personListDialog from './personListDialog.vue'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import type { TreeStructure, userType } from '@/views/system/user/user-interface'
+import { getDictByCode } from '@/api/system/dict'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const meterStaff = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  idCard: '', // 身份证号
+  sex: '', // 性别
+  education: '', // 文化程度
+  technologyJob: '', // 技术职务
+  administrationJob: '', // 行政职务
+  deptId: '', // 工作部门
+  major: '', // 专业
+  workDate: '', // 从事日期
+  id: '',
+})
+const ruleForm = ref({
+  meterStaff: {}, // 人员信息
+  staffId: '', // 计量人员id
+}) // 表单
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const title = ref('')
+const name = ref('')
+// 身份证号码验证规则
+const validateIDcard = (rule: any, value: any, callback: any) => {
+  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+  if (rr.test(value)) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+const rules = ref({
+  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
+
+}) // 表单验证规则
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref<TreeStructure[]>([])
+const PubListTree = ref([])
+// 获取组织列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
+  })
+}
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sex').then((response) => {
+    sexList.value = response.data
+  })
+}
+const educationList = ref<technologyJobType[]>([])
+// 获取文化程度列表
+const geteducationList = () => {
+  getDictByCode('education').then((response) => {
+    educationList.value = response.data
+  })
+}
+// 重置表单内容
+const resetFormData = () => {
+  meterStaff.value.staffNo = ''
+  meterStaff.value.name = ''
+  meterStaff.value.idCard = ''
+  meterStaff.value.sex = ''
+  meterStaff.value.education = ''
+  meterStaff.value.technologyJob = ''
+  meterStaff.value.administrationJob = ''
+  meterStaff.value.deptId = ''
+  meterStaff.value.major = ''
+  meterStaff.value.workDate = ''
+  meterStaff.value.id = ''
+}
+const technologyJobList = ref<technologyJobType[]>([])
+// 获取技术职务列表
+const getTechnologyJobList = () => {
+  getDictByCode('technologyJob').then((response) => {
+    technologyJobList.value = response.data
+  })
+}
+const administrationJobList = ref<technologyJobType[]>([])
+// 获取行政职务列表
+const getAdministrationJob = () => {
+  getDictByCode('administrationJob').then((response) => {
+    administrationJobList.value = response.data
+  })
+}
+const personListRef = ref()
+// 选择人员
+const selectPerson = () => {
+  personListRef.value.initDialog()
+}
+// 保存选择人员信息
+const confirmPerson = (row: any) => {
+  ruleForm.value.staffId = row.staffNo
+  meterStaff.value = row
+  ruleFormRef.value?.clearValidate('staffNo')
+}
+const changeList = ref([
+  {
+    name: '证书基本信息',
+    data: [] as any[],
+    column: [
+      {
+        label: '证书号',
+        data: 'certificateNo',
+        id: 'zs02',
+      },
+      {
+        label: '证书名称',
+        data: 'certificateName',
+        id: 'zs03',
+      },
+      {
+        label: '发证日期',
+        data: 'certificateDate',
+        id: 'zs04',
+      },
+      {
+        label: '发证单位',
+        data: 'certificateCompany',
+        id: 'zs01',
+      },
+      {
+        label: '有效日期',
+        data: 'validDate',
+        id: 'zs05',
+      },
+    ],
+  },
+  {
+    name: '计量工作培训记录',
+    data: [],
+    column: [],
+  },
+  {
+    name: '业务记录',
+    data: [],
+    column: [],
+  },
+])
+const current = ref('证书基本信息')
+const currentShow = computed(() => {
+  return changeList.value.filter(item => item.name === current.value)[0]
+})
+const certificateRef = ref() // 添加证书信息弹窗
+// 添加行
+const addRow = () => {
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
+}
+// 证书信息行内添加数据
+const addRowcertificate = (row: any, flag: string) => {
+  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
+  if (flag === 'update') {
+    changeList.value[0].data = [{
+      ...changeList.value[0].data[0],
+      ...row,
+      certificateStatus: diff < 0 ? '1' : '0',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    }]
+  }
+  else {
+    changeList.value[0].data.push(
+      {
+        ...row,
+        certificateStatus: diff < 0 ? '1' : '0',
+        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        id: null,
+        isDel: 0,
+        minioFileName: '',
+        remark: '',
+        staffId: meterStaff.value.id,
+        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
+  }
+}
+const currenSelect = ref<number>(-1) // 当前选中行
+// 删除行
+const removeRow = () => {
+  console.log(currenSelect.value)
+  if (currenSelect.value >= 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
+      currenSelect.value = -1
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        let params
+        if (changeList.value[0].data.length) {
+          params = changeList.value[0].data
+        }
+        else {
+          params = [
+            {
+              certificateCompany: '',
+              certificateDate: '',
+              certificateName: '',
+              certificateNo: '',
+              certificateStatus: '',
+              createTime: '',
+              id: null,
+              isDel: 0,
+              minioFileName: '',
+              remark: '',
+              staffId: meterStaff.value.id,
+              updateTime: '',
+              validDate: '',
+            },
+          ]
+        }
+        (title.value === '新建'
+          ? addCertificateList
+          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
+          formEl?.resetFields()
+          ElMessage.success('提交成功')
+          emits('resetData')
+          resetFormData()
+        })
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  changeList.value[0].data = []
+  emits('resetData')
+  resetFormData()
+}
+const selectTreeRef = ref()
+// 弹窗初始化
+const initDialog = (row: any) => {
+  changeList.value[0].data = []
+  resetFormData()
+  dialogVisible.value = true
+  title.value = row.title
+  name.value = row.name
+  selectTreeRef.value.clearSelected()
+  resetFormData()
+  getuser()
+  getPubList()
+  getSexList()
+  geteducationList()
+  getTechnologyJobList()
+  getAdministrationJob()
+  if (row.title === '新建') {
+    console.log()
+  }
+  else {
+    getCertificateDetail({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        meterStaff.value = res.data.meterStaff
+        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+      }
+    })
+  }
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <detail-page :title=" `${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+          完成
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="人员编号" prop="staffNo">
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="selectPerson">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="meterStaff.name">
+              <el-input v-model.trim="meterStaff.name" placeholder="姓名" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="性别" prop="meterStaff.sex">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="文化程度" prop="meterStaff.education">
+              <el-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="技术职务" prop="meterStaff.technologyJob">
+              <el-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="行政职务" prop="meterStaff.administrationJob">
+              <el-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="工作部门" prop="deptId">
+              <el-select v-if="title === '详情'" v-model="meterStaff.deptId" disabled>
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+              <com-tree-select
+                v-else
+                ref="selectTreeRef" v-model="meterStaff.deptId" :options="PubListTree"
+                placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业" prop="major">
+              <el-input v-model.trim="meterStaff.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="从事日期" prop="workDate">
+              <el-date-picker
+                v-model="meterStaff.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择从事日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block :title="current">
+      <template #btns>
+        <el-button v-if="title === '新建'" type="info" @click="removeRow">
+          删除行
+        </el-button>
+        <el-button v-if="title === '新建'" type="primary" @click="addRow">
+          添加行
+        </el-button>
+        <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+          编辑行
+        </el-button>
+      </template>
+      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
+        <el-table-column width="55" align="center">
+          <template #default="scope">
+            <el-radio-group v-model="currenSelect" class="ml-4">
+              <el-radio :label="scope.$index" />
+            </el-radio-group>
+          </template>
+        </el-table-column>
+        <el-table-column type="index" label="序号" width="55" />
+        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </detail-block>
+    <!-- 添加证书信息组件 -->
+    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    <!-- 选择用户列表组件 -->
+    <person-list-dialog ref="personListRef" @add="confirmPerson" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        display: none;
+      }
+    }
+  }
+</style>
+
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 332c73c..178fc12 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -32,6 +32,7 @@
   form.validDate = ''
 }
 const initDialog = (row: any) => {
+  resetData()
   title.value = row.title
   if (row.title === '编辑') {
     form.certificateNo = row.certificateNo
@@ -50,10 +51,12 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       if (title.value === '编辑') {
-        emits('add', form, 'update')
+        const deptRow = JSON.parse(JSON.stringify(form))
+        emits('add', deptRow, 'update')
       }
       else {
-        emits('add', form, '')
+        const deptRow = JSON.parse(JSON.stringify(form))
+        emits('add', deptRow, '')
       }
       dialogFormVisible.value = false
     }

diff --git a/src/components.d.ts b/src/components.d.ts
index 6e85584..815d62f 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -16,14 +16,13 @@
     BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default']
     BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
-    Benchcol: typeof import('./components/benchcol/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/DetailPage/index copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
+    DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
diff --git a/src/components/DetailPage/DetailBlockSwitch.vue b/src/components/DetailPage/DetailBlockSwitch.vue
new file mode 100644
index 0000000..4d92074
--- /dev/null
+++ b/src/components/DetailPage/DetailBlockSwitch.vue
@@ -0,0 +1,71 @@
+<script lang="ts" setup name="DetailBlock">
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+})
+
+const slots = useSlots()
+</script>
+
+<template>
+  <div class="detail-main">
+    <div class="header">
+      <div class="menu">
+        <slot name="menu" />
+      </div>
+      <div class="title">
+        {{ title }}
+      </div>
+      <div class="btns">
+        <slot name="btns" />
+      </div>
+    </div>
+    <div v-if="slots.default" class="content">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-main {
+  background-color: #fff;
+  border-radius: 8px;
+  margin-top: 10px;
+  padding-top: 10px;
+
+  .header {
+    position: relative;
+    height: 40px;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+
+    .title {
+      font-weight: 500;
+    }
+
+    .btns {
+      position: absolute;
+      right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+
+    .menu {
+      position: absolute;
+      left: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+
+  .content {
+    background-color: #fff;
+    padding: 0 10px 20px;
+    margin-top: 10px;
+  }
+}
+</style>
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d6c1c91..1644a80 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -314,6 +314,39 @@
       },
     ],
   },
+  {
+    path: '/borrow',
+    component: Layout,
+    redirect: '/device/borrow/borrowapply',
+    name: 'Borrow',
+    meta: {
+      title: '设备领用',
+      icon: 'ep:key',
+      auth: '/device/borrow',
+    },
+    children: [
+      {
+        path: 'borrowapply',
+        name: 'borroWapply',
+        component: () => import('@/views/device/borrow/borrwoApply.vue'),
+        meta: {
+          title: '设备借用申请',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowapply',
+        },
+      },
+      {
+        path: 'borrowhandle',
+        name: 'borrowHandle',
+        component: () => import('@/views/device/borrow/borrowHandle.vue'),
+        meta: {
+          title: '设备借用处理',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowhandle',
+        },
+      },
+    ],
+  },
 
 ]
 
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
new file mode 100644
index 0000000..1c2405e
--- /dev/null
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="borrowHandle">
+// 逻辑代码
+</script>
+
+<template>
+  <app-container>
+    设备借用处理
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
new file mode 100644
index 0000000..03d414b
--- /dev/null
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="borrowApply">
+// 逻辑代码
+</script>
+
+<template>
+  <app-container>
+    设备借用申请
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index c2682fc..5f7b347 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -339,381 +339,374 @@
 
 <template>
   <div class="body-container">
-    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资产编号" prop="assetNo">
-            <el-input v-model.trim="ruleForm.assetNo" placeholder="系统自动生成" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="资产类型" prop="assetType">
-            <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备编号" prop="equipmentNo">
-            <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备名称" prop="equipmentName">
-            <el-input v-model.trim="ruleForm.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="生产厂家" prop="manufacturer">
-            <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="厂家国别" prop="manufacturerCountry">
-            <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="出厂编号" prop="manufacturingNo">
-            <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="出厂年月" prop="manufacturingDate">
-            <el-date-picker
-              v-model="ruleForm.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '出厂年月'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="型号" prop="modelNo">
-            <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="管理状态" prop="managerState">
-            <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="ABC" prop="abc">
-            <el-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'">
-              <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="标签绑定" prop="labelBind">
-            <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === '详情' ? '' : '标签'" :disabled="title === '详情'" clearable>
-              <template #append>
-                <el-button type="primary" size="small">
-                  扫描
-                </el-button>
-              </template>
-            </el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="立卡年月" prop="cardEstablishmentDate">
-            <el-date-picker
-              v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '立卡年月'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="启用日期" prop="enableDate">
-            <el-date-picker
-              v-model="ruleForm.enableDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '启用日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定方式" prop="mesureType">
-            <el-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'">
-              <el-option v-for="item in mesureTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定周期" prop="mesureCycle">
-            <el-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="12">
-          <el-form-item label="测量范围" prop="mesureRange">
-            <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === '详情' ? '' : '测量范围'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="不确定度" prop="uncertainty">
-            <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === '详情' ? '' : '不确定度'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="使用部门" prop="useDept">
-            <com-tree-select
-              v-if="title !== '详情'"
-              v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-              :tree-props="deptProps"
-            />
-            <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
-              <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="使用人" prop="usePerson">
-            <el-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'">
-              <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="专业分类" prop="majorCategory">
-            <el-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'">
-              <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="检定部门" prop="mesureDept">
-            <com-tree-select
-              v-if="title !== '详情'"
-              v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-              :tree-props="deptProps"
-            />
-            <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
-              <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定日期" prop="mesureDate">
-            <el-date-picker
-              v-model="ruleForm.mesureDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '检定日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="有效日期" prop="validDate">
-            <el-date-picker
-              v-model="ruleForm.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '有效日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定结果" prop="mesureResult">
-            <el-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'">
-              <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="8">
-          <el-form-item label="是否是技术指标需要校准/检定的设备" prop="isCalibrationTestEquipment" label-width="260px">
-            <el-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否是测量工装台账" prop="isMeasureAccount" label-width="260px">
-            <el-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否标准配套设备" prop="isStandardSupportEquipment" label-width="260px">
-            <el-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
+    <detail-block-switch title="基本信息">
+      <template #menu>
+        <slot name="menuswitch" />
+      </template>
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资产编号" prop="assetNo">
+              <el-input v-model.trim="ruleForm.assetNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="资产类型" prop="assetType">
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备编号" prop="equipmentNo">
+              <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="生产厂家" prop="manufacturer">
+              <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="厂家国别" prop="manufacturerCountry">
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号" prop="manufacturingNo">
+              <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂年月" prop="manufacturingDate">
+              <el-date-picker
+                v-model="ruleForm.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '出厂年月'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="型号" prop="modelNo">
+              <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="管理状态" prop="managerState">
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="ABC" prop="abc">
+              <el-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'">
+                <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标签绑定" prop="labelBind">
+              <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === '详情' ? '' : '标签'" :disabled="title === '详情'" clearable>
+                <template #append>
+                  <el-button type="primary" size="small">
+                    扫描
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="立卡年月" prop="cardEstablishmentDate">
+              <el-date-picker
+                v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '立卡年月'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="启用日期" prop="enableDate">
+              <el-date-picker
+                v-model="ruleForm.enableDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '启用日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定方式" prop="mesureType">
+              <el-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'">
+                <el-option v-for="item in mesureTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定周期" prop="mesureCycle">
+              <el-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="测量范围" prop="mesureRange">
+              <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === '详情' ? '' : '测量范围'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="不确定度" prop="uncertainty">
+              <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === '详情' ? '' : '不确定度'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="使用部门" prop="useDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
+                :tree-props="deptProps"
+              />
+              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="使用人" prop="usePerson">
+              <el-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'">
+                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="专业分类" prop="majorCategory">
+              <el-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'">
+                <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="检定部门" prop="mesureDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                :tree-props="deptProps"
+              />
+              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定日期" prop="mesureDate">
+              <el-date-picker
+                v-model="ruleForm.mesureDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '检定日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="有效日期" prop="validDate">
+              <el-date-picker
+                v-model="ruleForm.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '有效日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定结果" prop="mesureResult">
+              <el-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'">
+                <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="8">
+            <el-form-item label="是否是技术指标需要校准/检定的设备" prop="isCalibrationTestEquipment" label-width="260px">
+              <el-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否是测量工装台账" prop="isMeasureAccount" label-width="260px">
+              <el-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否标准配套设备" prop="isStandardSupportEquipment" label-width="260px">
+              <el-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资产来源" prop="assetSource">
-            <el-input v-model.trim="ruleForm.assetSource" :placeholder="title === '详情' ? '' : '资产来源'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备规格" prop="equipmentSpecifications">
-            <el-input v-model.trim="ruleForm.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备类别" prop="equipmentCategory">
-            <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
-              <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备类型" prop="equipmentType">
-            <el-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'">
-              <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资本来源" prop="capitalSource">
-            <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
-              <el-option v-for="item in capitalSourceList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="管理级别" prop="managerLevel">
-            <el-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'">
-              <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="用途" prop="purpose">
-            <el-input v-model.trim="ruleForm.purpose" :placeholder="title === '详情' ? '' : '用途'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="技术水平" prop="technicalLevel">
-            <el-input v-model.trim="ruleForm.technicalLevel" :placeholder="title === '详情' ? '' : '技术水平'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="完好状态" prop="intactState">
-            <el-input v-model.trim="ruleForm.intactState" :placeholder="title === '详情' ? '' : '完好状态'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="外形尺寸" prop="overallDimension">
-            <el-input v-model.trim="ruleForm.overallDimension" :placeholder="title === '详情' ? '' : '外形尺寸'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="重量(吨)" prop="weight">
-            <el-input v-model.trim="ruleForm.weight" :placeholder="title === '详情' ? '' : '重量'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="单价" prop="singlePrice">
-            <el-input v-model.trim="ruleForm.singlePrice" :placeholder="title === '详情' ? '' : '单价'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="安装及杂费" prop="installIncidentalExpenses">
-            <el-input v-model.trim="ruleForm.installIncidentalExpenses" :placeholder="title === '详情' ? '' : '安装及杂费'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="安装地点" prop="installPlace">
-            <el-input v-model.trim="ruleForm.installPlace" :placeholder="title === '详情' ? '' : '安装地点'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="原值" prop="originValue">
-            <el-input v-model.trim="ruleForm.originValue" :placeholder="title === '详情' ? '' : '原值'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="目前原值" prop="presentOriginValue">
-            <el-input v-model.trim="ruleForm.presentOriginValue" :placeholder="title === '详情' ? '' : '目前原值'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="折旧年限" prop="depreciationPeriod">
-            <el-input v-model.trim="ruleForm.depreciationPeriod" :placeholder="title === '详情' ? '' : '折旧年限'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="折旧方法" prop="depreciationMethod">
-            <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
-              <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="属性" prop="attribute">
-            <el-input v-model.trim="ruleForm.attribute" placeholder="属性" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="12">
-          <el-form-item label="说明书" prop="minioFileName">
-            <show-photo :minio-file-name="ruleForm.fileList[0]?.minioFileName || ''" />
-            <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
-            <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
-              {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
-            </el-button>
-            <span v-if="title === '详情' && !ruleForm.fileList[0]?.minioFileName">暂无</span>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="24">
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" placeholder="备注" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资产来源" prop="assetSource">
+              <el-input v-model.trim="ruleForm.assetSource" :placeholder="title === '详情' ? '' : '资产来源'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备规格" prop="equipmentSpecifications">
+              <el-input v-model.trim="ruleForm.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备类别" prop="equipmentCategory">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+                <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备类型" prop="equipmentType">
+              <el-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'">
+                <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资本来源" prop="capitalSource">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+                <el-option v-for="item in capitalSourceList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="管理级别" prop="managerLevel">
+              <el-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'">
+                <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="用途" prop="purpose">
+              <el-input v-model.trim="ruleForm.purpose" :placeholder="title === '详情' ? '' : '用途'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="技术水平" prop="technicalLevel">
+              <el-input v-model.trim="ruleForm.technicalLevel" :placeholder="title === '详情' ? '' : '技术水平'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="完好状态" prop="intactState">
+              <el-input v-model.trim="ruleForm.intactState" :placeholder="title === '详情' ? '' : '完好状态'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="外形尺寸" prop="overallDimension">
+              <el-input v-model.trim="ruleForm.overallDimension" :placeholder="title === '详情' ? '' : '外形尺寸'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="重量(吨)" prop="weight">
+              <el-input v-model.trim="ruleForm.weight" :placeholder="title === '详情' ? '' : '重量'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="单价" prop="singlePrice">
+              <el-input v-model.trim="ruleForm.singlePrice" :placeholder="title === '详情' ? '' : '单价'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="安装及杂费" prop="installIncidentalExpenses">
+              <el-input v-model.trim="ruleForm.installIncidentalExpenses" :placeholder="title === '详情' ? '' : '安装及杂费'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="安装地点" prop="installPlace">
+              <el-input v-model.trim="ruleForm.installPlace" :placeholder="title === '详情' ? '' : '安装地点'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="原值" prop="originValue">
+              <el-input v-model.trim="ruleForm.originValue" :placeholder="title === '详情' ? '' : '原值'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="目前原值" prop="presentOriginValue">
+              <el-input v-model.trim="ruleForm.presentOriginValue" :placeholder="title === '详情' ? '' : '目前原值'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="折旧年限" prop="depreciationPeriod">
+              <el-input v-model.trim="ruleForm.depreciationPeriod" :placeholder="title === '详情' ? '' : '折旧年限'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="折旧方法" prop="depreciationMethod">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+                <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="属性" prop="attribute">
+              <el-input v-model.trim="ruleForm.attribute" placeholder="属性" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="说明书" prop="minioFileName">
+              <show-photo :minio-file-name="ruleForm.fileList[0]?.minioFileName || ''" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
+                {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
+              </el-button>
+              <span v-if="title === '详情' && !ruleForm.fileList[0]?.minioFileName">暂无</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" placeholder="备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block-switch>
   </div>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    padding-top: 20px;
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index f46553a..fc3fd54 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -360,20 +360,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          固定资产-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`固定资产-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -763,44 +758,11 @@
           </el-row>
         </div> -->
       </el-form>
-    </div>
+    </detail-page>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index 0abbdb1..6e88e96 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -74,33 +74,29 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ name }} -{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm">
-            关闭
-          </el-button>
-        </span>
-      </div>
-      <div class="body">
-        <!-- 三级菜单 -->
-        <el-radio-group v-model="current">
-          <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
-            {{ item.name }}
-          </el-radio-button>
-        </el-radio-group>
-      </div>
-      <!-- 展示区域 -->
-      <keep-alive>
-        <component :is="currentComp" ref="currentCompRef" :name="current" :title="title" :row="row" />
-      </keep-alive>
-    </div>
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <!-- 展示区域 -->
+    <keep-alive>
+      <component :is="currentComp" ref="currentCompRef" :name="current" :title="title" :row="row">
+        <template #menuswitch>
+          <!-- 三级菜单 -->
+          <el-radio-group v-model="current">
+            <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+              {{ item.name }}
+            </el-radio-button>
+          </el-radio-group>
+        </template>
+      </component>
+    </keep-alive>
   </app-container>
 </template>
 
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f9cdcd0..f653095 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -256,7 +256,7 @@
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
-  // 原生上传图片
+  // 原生上传
   // console.log(event.target.files)
   // if (event.target.files[0].type === 'application/pdf') {
   if (event.target.files?.length !== 0) {
@@ -354,7 +354,7 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" type="primary" @click="identify">
+          <!-- <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" type="primary" @click="identify">
             标签识别
           </el-button>
           <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/import`)" type="primary" @click="batchImport">
@@ -371,7 +371,13 @@
           </el-button>
           <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/print`)" v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/device/standingBook/components/templateTable.vue b/src/views/device/standingBook/components/templateTable.vue
index 8a928f0..7aa563f 100644
--- a/src/views/device/standingBook/components/templateTable.vue
+++ b/src/views/device/standingBook/components/templateTable.vue
@@ -245,11 +245,11 @@
   <div>
     <!-- 添加证书信息组件 -->
     <add-row ref="addRowRef" @add="addRowData" />
-    <div class="header">
-      <div class="title">
-        <!-- {{ $props.name }} -->
-      </div>
-      <span class="btns">
+    <detail-block-switch :title="name">
+      <template #menu>
+        <slot name="menuswitch" />
+      </template>
+      <template #btns>
         <el-button v-if="title !== '详情'" type="info" @click="removeRow">
           删除行
         </el-button>
@@ -259,55 +259,33 @@
         <el-button v-if="title !== '详情'" type="primary" @click="editRow">
           编辑行
         </el-button>
-      </span>
-    </div>
-    <!-- 表格区域 -->
-    <normal-table
-      id="print"
-      :data="list" :total="total" :columns="columns as any"
-      :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-      :list-loading="loadingTable"
-      style="padding-top: 20px;background-color: #fff;"
-      @change="changePage"
-    >
-      <template #preColumns>
-        <el-table-column label="" width="55" align="center">
-          <template #default="scope">
-            <el-radio v-model="select" :label="scope.$index" class="radio" />
-          </template>
-        </el-table-column>
-        <el-table-column label="序号" width="55" align="center">
-          <template #default="scope">
-            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-          </template>
-        </el-table-column>
       </template>
-    </normal-table>
+      <!-- 表格区域 -->
+      <normal-table
+        id="print"
+        :data="list" :total="total" :columns="columns as any"
+        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+        :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </detail-block-switch>
   </div>
 </template>
 
 <style lang="scss" scoped>
-.header {
-  background-color: #fff;
-  // height: 40px;
-  border-radius: 8px;
-  display: flex;
-  align-items: center;
-  flex-direction: column;
-  justify-content: center;
-  position: relative;
-
-  .title {
-    // font-weight: 700;
-  }
-
-  .btns {
-    position: absolute;
-    right: 40px;
-    top: -22px;
-  }
-}
-
 :deep(.el-radio__label) {
   display: none;
 }
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 7538bc8..78a3800 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -272,24 +272,12 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/identify`)" type="primary" @click="identify">
-            标签识别
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/import`)" type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/mould`)" type="primary" @click="templateDownload">
-            模板下载
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/add`)" type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/export`)" type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/print`)" v-print="printObj" type="primary">
-            打印
-          </el-button>
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/identify`)" icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index fc364c8..e74d70e 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -361,20 +361,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ name }} - {{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -458,73 +453,33 @@
           </el-col>
         </el-row>
       </el-form>
-      <div v-if="title !== '新建' ">
-        <div class="header" style="margin-top: 10px;">
-          <div class="title">
-            审批流程
-          </div>
-        </div>
-        <div class="timeline">
-          <el-timeline>
-            <el-timeline-item timestamp="2018/4/12" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/12 20:46</p>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="2018/4/3" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/3 20:46</p>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="2018/4/2" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/2 20:46</p>
-              </el-card>
-            </el-timeline-item>
-          </el-timeline>
-        </div>
-      </div>
-    </div>
+    </detail-page>
+    <detail-block v-if="title !== '新建' " title="审批流程">
+      <el-timeline>
+        <el-timeline-item timestamp="2018/4/12" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/12 20:46</p>
+          </el-card>
+        </el-timeline-item>
+        <el-timeline-item timestamp="2018/4/3" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/3 20:46</p>
+          </el-card>
+        </el-timeline-item>
+        <el-timeline-item timestamp="2018/4/2" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/2 20:46</p>
+          </el-card>
+        </el-timeline-item>
+      </el-timeline>
+    </detail-block>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .timeline {
   background-color: #fff;
 }
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index aa3963f..737568d 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -1,6 +1,6 @@
 <!-- 状态管理公共列表组件 -->
 <script lang="ts" setup>
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessageBox } from 'element-plus'
 import approve from './approvalActionDialog.vue'
 import addDialog from './templateAdd.vue'
 const props = defineProps({
@@ -142,7 +142,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: any) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     title: '详情',
@@ -150,7 +150,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: any) => {
   dialogVisible.value = true
   // addRef.value.initDialog({
   //   title: '编辑',
@@ -158,7 +158,7 @@
   // })
 }
 // 删除
-const remove = (row) => {
+const remove = (row: any) => {
   ElMessageBox.confirm(
     `确认删除${row.equipmentName}吗？`,
     '提示',
@@ -181,20 +181,20 @@
   // })
 }
 // 同意
-const agree = (row) => {
+const agree = (row: any) => {
   console.log(approveRef.value)
   approveRef.value.initDialog({
     radio: '1',
   })
 }
 // 驳回
-const reject = (row) => {
+const reject = (row: any) => {
   approveRef.value.initDialog({
     radio: '3',
   })
 }
 // 拒绝
-const refuse = (row) => {
+const refuse = (row: any) => {
   approveRef.value.initDialog(
     {
       radio: '2',
@@ -202,7 +202,7 @@
   )
 }
 // 取消
-const cancel = (row) => {
+const cancel = (rowrow: any) => {
   ElMessageBox.confirm(
     '确认取消吗？',
     '提示',
@@ -301,20 +301,20 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+          <el-input placeholder="申请编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="设备编号" clearable class="w-50 m-2" />
+          <el-input placeholder="设备编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.modelNo" placeholder="设备名称" clearable class="w-50 m-2" />
+          <el-input placeholder="设备名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请单位" clearable class="w-50 m-2" />
+          <el-input placeholder="申请单位" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.publisher" placeholder="申请状态" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" />
+          <el-select placeholder="申请状态" clearable>
+            <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" /> -->
           </el-select>
         </search-item>
       </search-area>
@@ -328,7 +328,10 @@
           <el-button type="primary" @click="templateDownload">
             模板下载
           </el-button> -->
-          <el-button type="primary" @click="add">
+          <icon-button icon="icon-add" title="新建" @click="add" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+          <!-- <el-button type="primary" @click="add">
             新建
           </el-button>
           <el-button type="primary" @click="exportExcelBtn">
@@ -336,7 +339,7 @@
           </el-button>
           <el-button v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
         </template>
         <!-- 表格区域 -->
         <normal-table
@@ -386,22 +389,3 @@
     </app-container>
   </div>
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 154px !important;
-}
-
-.normal-date {
-  width: 154px !important;
-}
-
-.normal-select {
-  width: 154px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
-
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 0763c5a..9ef0b93 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -19,7 +19,6 @@
 const effectiveStatusName = ref('')
 const title = ref('')
 const fileList = ref<UploadUserFile[]>([])
-console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -80,10 +79,9 @@
   if (row.title === '新建') {
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
-    ruleForm.publisher = ''
+    ruleForm.publisher = userInfo.$state.deptName
     ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 判断有无存储
-    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
     if (sessionStorage.getItem(fileTypeName.value)) {
       const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
       ruleForm.fileType = session.fileType
@@ -117,6 +115,8 @@
     ruleForm.remark = row.remark
     ruleForm.publishTime = row.publishTime
     ruleForm.minioFileName = row.minioFileName
+    // ruleForm.publisher = '0'
+    // ruleForm.createUserId = '1'
   }
 }
 defineExpose({ initDialog })
@@ -148,6 +148,9 @@
       type: 'warning',
     },
       ).then((res) => {
+        if (ruleForm.publisher === userInfo.$state.deptName) {
+          ruleForm.publisher === userInfo.$state.deptId
+        }
         if (flag == '提交') {
           addApi(ruleForm).then((res) => {
             if (res.code == 200) {
@@ -193,7 +196,6 @@
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        console.log(res.data[0])
         ruleForm.minioFileName = res.data[0]
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
@@ -216,7 +218,6 @@
 // ])
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
-  console.log(diffDat)
   if (diffDat < 0) {
     // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '在使用'
@@ -237,7 +238,7 @@
 
 <template>
   <app-container v-if="dialogVisible" style="overflow: hidden;">
-    <detail-page :title="`${title}${fileTypeName}`">
+    <detail-page :title="`${fileTypeName}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
           提交
@@ -278,12 +279,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="发布单位" prop="publisher">
-              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'" class="fill-input">
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled>
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
               <com-tree-select
                 v-else
-                v-model="ruleForm.publisher" :options="PubListTree" placeholder="选择组织机构"
+                v-model="ruleForm.publisher" :options="PubListTree" placeholder="请选择发布单位"
                 :tree-props="deptProps"
               />
             </el-form-item>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 44e3e4d..b45fbc3 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -324,22 +324,9 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <!-- <el-button type="primary" @click="batchImport">
-            批量导入
-          </el-button> -->
-          <!-- <el-button type="primary" @click="templateDownload">
-            模板下载
-          </el-button> -->
-          <!-- <el-button type="primary" @click="add">
-            新建
-          </el-button> -->
-          <el-button type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-print="printObj" type="primary">
-            打印
-          </el-button>
+          <!-- <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange"> -->
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 4677e48..7d4724b 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -204,13 +204,9 @@
     loading.close()
   })
 }
-// 打印
-const print = () => {
-
-}
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
-  // 原生上传图片
+  // 原生上传
   // console.log(event.target.files)
   // if (event.target.files[0].type === 'application/pdf') {
   if (event.target.files?.length !== 0) {
@@ -264,7 +260,7 @@
         <search-item>
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
-        <search-item>
+        <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
@@ -273,13 +269,13 @@
               :value="item.value"
             />
           </el-select>
-        </search-item>
+        </search-item> -->
         <search-item>
           <el-date-picker
             v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 155px;"
+            style="width: 185px;"
           />
         </search-item>
         <search-item>
@@ -287,19 +283,19 @@
             v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 155px;"
+            style="width: 185px;"
           />
         </search-item>
         <search-item>
-          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select> -->
-          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
+          </el-select>
+          <!-- <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" /> -->
         </search-item>
       </search-area>
       <table-container>
@@ -310,7 +306,7 @@
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
-          <icon-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" @click="print" />
+          <icon-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index cf0dd4f..5ca3275 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -3,11 +3,11 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { detailType } from '../measureDept-interface'
-import { getUserList } from '@/api/system/user'
+// import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
+import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import type { userType } from '@/views/system/user/user-interface'
 import { listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
-import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
 const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -31,11 +31,20 @@
   technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
+// 获取计量人员列表
 const getuser = () => {
-  getUserList({ offset: 1, limit: 99999 }).then((res) => {
-    userList.value = res.data.rows
+  getStaffList({
+    staffNo: '', // 人员编号
+    name: '', // 姓名
+    deptId: ruleForm.value.deptId, // 所在部门
+    limit: 999999,
+    offset: 1,
+  }).then((res) => {
+    if (res.code === 200) {
+      userList.value = res.data.records
+    }
   })
-} // 获取用户列表
+}
 const technologyJobList = ref<{ id: string;name: string;value: string }[]>([])
 // 获取技术职务列表
 const getTechnologyJobList = () => {
@@ -50,7 +59,16 @@
     administrationJobList.value = response.data
   })
 }
-
+// 选择负责人自动填充职务信息
+const directorChange = (val: string) => {
+  const selectUser = userList.value.filter(item => item.name === val)[0]
+  getStaffDetail(selectUser).then((res) => {
+    if (res.code === 200) {
+      ruleForm.value.administrationJob = res.data.administrationJob
+      ruleForm.value.technologyJob = res.data.technologyJob
+    }
+  })
+}
 // 提交
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
@@ -95,12 +113,6 @@
 const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
-// const searchQuery = ref({
-//   limit: 10,
-//   offset: 1,
-//   total: 0,
-//   pageSizes: [10, 20, 30],
-// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -410,20 +422,6 @@
     }
   })
 }
-// const handleSizeChange = (val: number) => {
-//   searchQuery.value.limit = val
-//   getDepartmentList()
-//   getuserInfoList()
-//   getInstrumentInfo()
-//   getDeviceInfo()
-// }
-// const handleCurrentChange = (val: number) => {
-//   searchQuery.value.offset = val
-//   getDepartmentList()
-//   getuserInfoList()
-//   getInstrumentInfo()
-//   getDeviceInfo()
-// }
 // 弹窗初始化
 const initDialog = (row: any) => {
   reset()
@@ -460,22 +458,17 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title.split('-')[2] === '编辑'" type="primary" @click="submitForm(ruleFormRef)">
-            提交
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="title">
+      <template #btns>
+        <el-button v-if="title.split('-')[2] === '编辑'" type="primary" @click="submitForm(ruleFormRef)">
+          提交
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title.split('-')[2] === '详情' ? 'isDetail' : '']">
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item :label=" `${title.split('-')[1]}编号`" prop="organizeNo">
               <el-input v-model.trim="ruleForm.organizeNo" placeholder="系统自动生成" disabled />
@@ -487,7 +480,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="title.split('-')[1] === '工程组'" :gutter="24" class="marg">
+        <el-row v-if="title.split('-')[1] === '工程组'" :gutter="24">
           <el-col :span="6">
             <el-form-item label="科室编号">
               <el-input v-model.trim="ruleForm.pDeptId" disabled />
@@ -509,10 +502,10 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
-              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" @change="directorChange">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.name" />
               </el-select>
             </el-form-item>
@@ -532,7 +525,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="24">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
               <el-input v-model.trim="ruleForm.remark" :placeholder="title.split('-')[2] === '详情' ? '' : '备注'" :disabled="title.split('-')[2] === '详情'" />
@@ -540,85 +533,24 @@
           </el-col>
         </el-row>
       </el-form>
-      <!-- 科室信息-人员信息等列表切换 -->
-      <div>
-        <div class="header" style="margin-top: 10px;">
-          <!-- 切换 -->
-          <el-radio-group v-model="current" class="change-btn">
-            <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
-              {{ item.name }}
-            </el-radio-button>
-          </el-radio-group>
-          <div class="title">
-            {{ current }}
-          </div>
-          <span class="btns">
-          <!-- <el-button type="info" :disabled="title === '详情'" @click="removeRow">
-            删除行
-          </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
-            添加行
-          </el-button> -->
-          </span>
-        </div>
-        <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <el-table-column type="index" label="序号" width="55" align="center" />
-          <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
-        </el-table>
-        <!-- <div style="width: 100%;margin-top: 10px;">
-          <el-pagination
-            :current-page="searchQuery.offset"
-            :page-sizes="searchQuery.pageSizes"
-            :page-size="searchQuery.limit"
-            :total="searchQuery.total"
-            layout="total, sizes, prev, pager, next"
-            hide-on-single-page
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-          />
-        </div> -->
-      </div>
-    </div>
+    </detail-page>
+    <detail-block-switch :title="current">
+      <template #menu>
+        <el-radio-group v-model="current" class="change-btn">
+          <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
+            {{ item.name }}
+          </el-radio-button>
+        </el-radio-group>
+      </template>
+      <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
+        <el-table-column type="index" label="序号" width="55" align="center" />
+        <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </detail-block-switch>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-    position: relative;
-
-    .change-btn {
-      position: absolute;
-      left: 40px;
-      top: 4px;
-    }
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 4px;
-    }
-  }
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
@@ -628,8 +560,4 @@
     }
   }
 }
-
-.marg {
-  margin-top: 10px;
-}
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 9ad87af..aac1ef2 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -231,12 +231,14 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
+          <!-- <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
           <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
+          <icon-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 2e3322a..3f472eb 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -41,7 +41,7 @@
   { text: '证书号', value: 'certificateNo', align: 'center' },
   { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
   { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'validDate', align: 'center', width: '200' },
   { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
 ]) // 表格
 const certificateStatusList = ref([
@@ -90,7 +90,7 @@
   loadingTable.value = true
   getCertificateList(searchQuery).then((res) => {
     if (res.code === 200) {
-      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效' }))
+      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效', validDate: item.validDate.split(' ')[0], certificateDate: item.certificateDate.split(' ')[0] }))
       list.value = res.data.records
       total.value = Number(res.data.total)
     }
@@ -115,6 +115,7 @@
   addRef.value.initDialog({
     ...row,
     title: '详情',
+    name: props.isRemind ? '证书状况' : '证书记录',
   })
 }
 // 编辑
@@ -123,6 +124,7 @@
   addRef.value.initDialog({
     ...row,
     title: '编辑',
+    name: props.isRemind ? '证书状况' : '证书记录',
   })
 }
 
@@ -193,6 +195,7 @@
   dialogVisible.value = true
   addRef.value.initDialog({
     title: '新建',
+    name: props.isRemind ? '证书状况' : '证书记录',
   })
 }
 // 导出
@@ -292,21 +295,11 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
-            模板下载
-          </el-button>
-          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
-            打印
-          </el-button>
+          <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
@@ -325,7 +318,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column fixed="right" label="操作" align="center" width="150">
+            <el-table-column fixed="right" label="操作" align="center" width="180">
               <template #default="{ row }">
                 <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
                   提醒
@@ -336,7 +329,7 @@
                 <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 4dc1b17..4352604 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -69,7 +69,16 @@
     const IdCard = ruleForm.value.idCard
     const birthday = `${IdCard.substring(6, 10)}-${IdCard.substring(10, 12)}`
     ruleForm.value.birthday = birthday
-    console.log(ruleForm.value)
+    // 获取性别 第17位  奇数为男 偶数为女
+    // ruleForm.value.sex
+    if (Number(IdCard.substring(16, 17)) % 2) {
+      // 男
+      ruleForm.value.sex = '1'
+    }
+    else {
+      //  女
+      ruleForm.value.sex = '2'
+    }
   })
 }
 const dialogVisible = ref<boolean>(false) // 弹窗显示
@@ -130,7 +139,6 @@
     technologyExam: '', // 技术考核
     remark: '', // 备注
     certificateList: [], // 证书列表
-
   }
 }
 const technologyJobList = ref<technologyJobType[]>([])
@@ -309,7 +317,7 @@
           }
           (title.value === '新建'
             ? getStaffAdd
-            : getStaffupdate) ({ ...ruleForm.value, certificateList: changeList.value[0].data }).then((res) => {
+            : getStaffupdate) ({ ...ruleForm.value, certificateList: changeList.value[0].data, birthday: `${ruleForm.value.idCard.substring(6, 10)}-${ruleForm.value.idCard.substring(10, 12)}-${ruleForm.value.idCard.substring(12, 14)}` }).then((res) => {
             if (res.code == 200) {
               formEl?.resetFields()
               ElMessage.success('提交成功')
@@ -332,12 +340,14 @@
   emits('resetData')
   resetFormData()
 }
+const selectTreeRef = ref()
 // 弹窗初始化
 const initDialog = (row: any) => {
   changeList.value[0].data = []
   dialogVisible.value = true
   title.value = row.title
   resetFormData()
+  selectTreeRef.value?.clearSelected()
   getuser()
   getPubList()
   getSexList()
@@ -370,20 +380,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          计量人员-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
-            完成
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`计量人员-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+          完成
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
         <el-row :gutter="24" class="marg">
           <el-col :span="5">
@@ -394,6 +399,7 @@
                 :http-request="uploadQuarterlyEvaluateFile"
                 :before-upload="beforeAvatarUpload"
                 :disabled="title === '详情'"
+                accept="image/png, image/jpeg,image/jpg"
               >
                 <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
                 <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
@@ -425,8 +431,8 @@
               </el-select>
               <com-tree-select
                 v-else
-                v-model="ruleForm.deptId" :options="PubListTree" placeholder="选择组织机构"
-                :tree-props="deptProps"
+                ref="selectTreeRef" v-model="ruleForm.deptId" :options="PubListTree"
+                placeholder="选择组织机构" :tree-props="deptProps"
               />
             </el-form-item>
             <el-form-item label="计量专业" prop="major" class="marg-item">
@@ -489,29 +495,19 @@
           </el-col>
         </el-row>
       </el-form>
-      <!-- 证书基本信息 -->
-      <!-- 切换 -->
-      <!-- <el-radio-group v-model="current" style="margin-bottom: -15px;">
-          <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
-            {{ item.name }}
-          </el-radio-button>
-        </el-radio-group> -->
-      <div class="header" style="margin-top: 10px;">
-        <div class="title">
-          {{ current }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="info" @click="removeRow">
-            删除行
-          </el-button>
-          <el-button v-if="title !== '详情'" type="primary" @click="addRow">
-            添加行
-          </el-button>
-          <el-button v-if="title !== '详情'" type="primary" @click="editRow">
-            编辑行
-          </el-button>
-        </span>
-      </div>
+    </detail-page>
+    <detail-block :title="current">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="info" @click="removeRow">
+          删除行
+        </el-button>
+        <el-button v-if="title !== '详情'" type="primary" @click="addRow">
+          添加行
+        </el-button>
+        <el-button v-if="title !== '详情'" type="primary" @click="editRow">
+          编辑行
+        </el-button>
+      </template>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
         <el-table-column width="55" align="center">
           <template #default="scope">
@@ -523,7 +519,7 @@
         <el-table-column type="index" label="序号" width="55" />
         <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
       </el-table>
-    </div>
+    </detail-block>
     <!-- 添加证书信息组件 -->
     <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
     <!-- 选择用户列表组件 -->
@@ -532,77 +528,38 @@
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    background-color: #fff;
-    border-radius: 8px;
-    padding-top: 10px;
-    margin-top: 10px;
-    padding-right: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    display: flex;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    position: relative;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 5px;
-    }
-  }
-
-  :deep(.el-radio__label) {
-    display: none;
-  }
-
-  :deep(.el-icon.avatar-uploader-icon) {
-    font-size: 28px;
-    color: #8c939d;
-    width: 190px;
-    height: 250px;
-    text-align: center;
-  }
-
-  :deep(.avatar-uploader .avatar) {
-    width: 190px;
-    height: 250px;
-    display: block;
-  }
-
-  .isDetail {
-    ::v-deep {
-      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-        display: none;
-      }
-    }
-  }
+:deep(.el-radio__label) {
+  display: none;
 }
 
-.marg {
-  margin-top: 20px;
+:deep(.el-icon.avatar-uploader-icon) {
+  font-size: 28px;
+  color: #8c939d;
+  width: 190px;
+  height: 250px;
+  text-align: center;
 }
 
-.marg-item {
-  margin-top: 20px;
+:deep(.avatar-uploader .avatar) {
+  width: 190px;
+  height: 250px;
+  display: block;
+}
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
 }
 </style>
 
 <style scoped>
 .avatar-uploader .avatar {
-  width: 220px;
-  height: 320px;
+  width: 190px;
+  height: 250px;
   display: block;
 }
 </style>
@@ -624,8 +581,8 @@
 .el-icon.avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
-  width: 220px;
-  height: 320px;
+  width: 190px;
+  height: 250px;
   text-align: center;
 }
 </style>
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index ae48f11..042636e 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -4,7 +4,6 @@
 import dayjs from 'dayjs'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import type { technologyJobType } from '../person-interface'
-import certificateAddDialog from './certificateAddDialog.vue'
 import personListDialog from './personListDialog.vue'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
@@ -14,7 +13,8 @@
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
-const ruleFormRef = ref<FormInstance>() // from组件
+const ruleFormRef1 = ref<FormInstance>() // from组件
+const ruleFormRef2 = ref<FormInstance>() // from组件
 const meterStaff = ref({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -28,26 +28,43 @@
   workDate: '', // 从事日期
   id: '',
 })
+const baseInfo = ref({
+  certificateCompany: '',
+  certificateDate: '',
+  certificateName: '',
+  certificateNo: '',
+  validDate: '',
+  id: '',
+  isDel: 0,
+  minioFileName: '',
+  remark: '',
+})
 const ruleForm = ref({
   meterStaff: {}, // 人员信息
   staffId: '', // 计量人员id
 }) // 表单
-const multipleTableRef = ref<InstanceType<typeof ElTable>>()
 const title = ref('')
+const name = ref('')
 // 身份证号码验证规则
-const validateIDcard = (rule: any, value: any, callback: any) => {
-  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
-  if (rr.test(value)) {
-    callback()
-  }
-  else {
-    callback(new Error('验证失败'))
-  }
-}
+// const validateIDcard = (rule: any, value: any, callback: any) => {
+//   const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+//   if (rr.test(value)) {
+//     callback()
+//   }
+//   else {
+//     callback(new Error('验证失败'))
+//   }
+// }
 const rules = ref({
   staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
   // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
-
+}) // 表单验证规则
+const rules2 = ref({
+  certificateCompany: [{ required: true, message: '发证单位不能为空', trigger: 'blur' }],
+  certificateDate: [{ required: true, message: '发证日期不能为空', trigger: 'blur' }],
+  certificateName: [{ required: true, message: '证书名称不能为空', trigger: 'blur' }],
+  certificateNo: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
+  validDate: [{ required: true, message: '有效日期不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
 const userList = ref<userType[]>([]) // 可使用人列表
@@ -96,6 +113,17 @@
   meterStaff.value.major = ''
   meterStaff.value.workDate = ''
   meterStaff.value.id = ''
+  baseInfo.value = {
+    certificateCompany: '',
+    certificateDate: '',
+    certificateName: '',
+    certificateNo: '',
+    validDate: '',
+    id: '',
+    isDel: 0,
+    minioFileName: '',
+    remark: '',
+  }
 }
 const technologyJobList = ref<technologyJobType[]>([])
 // 获取技术职务列表
@@ -120,98 +148,14 @@
 const confirmPerson = (row: any) => {
   ruleForm.value.staffId = row.staffNo
   meterStaff.value = row
-  ruleFormRef.value?.clearValidate('staffNo')
+  ruleFormRef1.value?.clearValidate('staffNo')
 }
-const changeList = ref([
-  {
-    name: '证书基本信息',
-    data: [] as any[],
-    column: [
-      {
-        label: '证书号',
-        data: 'certificateNo',
-        id: 'zs02',
-      },
-      {
-        label: '证书名称',
-        data: 'certificateName',
-        id: 'zs03',
-      },
-      {
-        label: '发证日期',
-        data: 'certificateDate',
-        id: 'zs04',
-      },
-      {
-        label: '发证单位',
-        data: 'certificateCompany',
-        id: 'zs01',
-      },
-      {
-        label: '有效日期',
-        data: 'validDate',
-        id: 'zs05',
-      },
-    ],
-  },
-  {
-    name: '计量工作培训记录',
-    data: [],
-    column: [],
-  },
-  {
-    name: '业务记录',
-    data: [],
-    column: [],
-  },
-])
-const current = ref('证书基本信息')
-const currentShow = computed(() => {
-  return changeList.value.filter(item => item.name === current.value)[0]
-})
-const certificateRef = ref() // 添加证书信息弹窗
-// 添加行
-const addRow = () => {
-  certificateRef.value.initDialog({ title: '添加' })
-}
-// 编辑行
-const editRow = () => {
-  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
-}
-// 证书信息行内添加数据
-const addRowcertificate = (row: any, flag: string) => {
-  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
-  if (flag === 'update') {
-    changeList.value[0].data = [{
-      ...changeList.value[0].data[0],
-      ...row,
-      certificateStatus: diff < 0 ? '1' : '0',
-      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-    }]
-  }
-  else {
-    changeList.value[0].data.push(
-      {
-        ...row,
-        certificateStatus: diff < 0 ? '1' : '0',
-        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-        id: null,
-        isDel: 0,
-        minioFileName: '',
-        remark: '',
-        staffId: meterStaff.value.id,
-        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-      })
-  }
-}
-const currenSelect = ref<number>(-1) // 当前选中行
-// 删除行
-const removeRow = () => {
-  console.log(currenSelect.value)
-  if (currenSelect.value >= 0) {
+// 提交
+const submitForm = async (formEl1: FormInstance | undefined, formEl2: FormInstance | undefined) => {
+  if (!formEl1 || !formEl2) { return }
+  Promise.all([formEl1.validate(), formEl2.validate()]).then((res) => {
     ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
+      '确认提交吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -219,78 +163,49 @@
         type: 'warning',
       },
     ).then(() => {
-      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
-      currenSelect.value = -1
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 提交
-const submitForm = async (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  await formEl.validate((valid, fields) => {
-    if (valid) {
-      ElMessageBox.confirm(
-        '确认提交吗？',
-        '提示',
-        {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        },
-      ).then(() => {
-        let params
-        if (changeList.value[0].data.length) {
-          params = changeList.value[0].data
-        }
-        else {
-          params = [
-            {
-              certificateCompany: '',
-              certificateDate: '',
-              certificateName: '',
-              certificateNo: '',
-              certificateStatus: '',
-              createTime: '',
-              id: null,
-              isDel: 0,
-              minioFileName: '',
-              remark: '',
-              staffId: meterStaff.value.id,
-              updateTime: '',
-              validDate: '',
-            },
-          ]
-        }
-        (title.value === '新建'
-          ? addCertificateList
-          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
-          formEl?.resetFields()
-          ElMessage.success('提交成功')
-          emits('resetData')
-          resetFormData()
-        })
+      (title.value === '新建'
+        ? addCertificateList
+        : getCertificateUpdate)(title.value === '新建'
+        ? [{
+            ...baseInfo.value,
+            staffId: meterStaff.value.id,
+            createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+            updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+            certificateStatus: dayjs(baseInfo.value.validDate).diff(baseInfo.value.certificateDate, 'day') < 0 ? '1' : '0',
+            meterStaff: undefined,
+          }]
+        : {
+            ...baseInfo.value,
+            staffId: meterStaff.value.id,
+            createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+            updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+            certificateStatus: dayjs(baseInfo.value.validDate).diff(baseInfo.value.certificateDate, 'day') < 0 ? '1' : '0',
+            meterStaff: undefined,
+          }).then((res) => {
+        formEl1?.resetFields()
+        formEl2?.resetFields()
+        ElMessage.success('提交成功')
+        emits('resetData')
+        resetFormData()
       })
-    }
+    })
   })
 }
 // 取消
-const resetForm = (formEl: FormInstance | undefined) => {
+const resetForm = (formEl: FormInstance | undefined, formEl2: FormInstance | undefined) => {
   formEl?.resetFields()
-  changeList.value[0].data = []
+  formEl2?.resetFields()
   emits('resetData')
   resetFormData()
 }
+const selectTreeRef = ref()
 // 弹窗初始化
 const initDialog = (row: any) => {
-  changeList.value[0].data = []
   resetFormData()
   dialogVisible.value = true
   title.value = row.title
-  resetFormData()
+  name.value = row.name
+  selectTreeRef.value?.clearSelected()
   getuser()
   getPubList()
   getSexList()
@@ -303,8 +218,9 @@
   else {
     getCertificateDetail({ id: row.id }).then((res) => {
       if (res.code === 200) {
+        console.log(res, '证书记录')
         meterStaff.value = res.data.meterStaff
-        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+        baseInfo.value = res.data
       }
     })
   }
@@ -314,21 +230,16 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          证书记录-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
-            完成
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
-      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+    <detail-page :title=" `${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
+          完成
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef1, ruleFormRef2)">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef1" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="人员编号" prop="staffNo">
@@ -390,7 +301,8 @@
               </el-select>
               <com-tree-select
                 v-else
-                v-model="meterStaff.deptId" :options="PubListTree" placeholder="选择组织机构"
+                ref="selectTreeRef" v-model="meterStaff.deptId" :options="PubListTree"
+                placeholder="选择组织机构"
                 :tree-props="deptProps"
               />
             </el-form-item>
@@ -410,71 +322,52 @@
           </el-col>
         </el-row>
       </el-form>
-      <div class="header" style="margin-top: 10px;">
-        <div class="title">
-          {{ current }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title === '新建'" type="info" @click="removeRow">
-            删除行
-          </el-button>
-          <el-button v-if="title === '新建'" type="primary" @click="addRow">
-            添加行
-          </el-button>
-          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
-            编辑行
-          </el-button>
-        </span>
-      </div>
-      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
-        <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column>
-        <el-table-column type="index" label="序号" width="55" />
-        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
-      </el-table>
-    </div>
-    <!-- 添加证书信息组件 -->
-    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    </detail-page>
+    <detail-block title="证书基本信息">
+      <el-form ref="ruleFormRef2" :model="baseInfo" :rules="rules2" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="证书号" prop="certificateNo">
+              <el-input v-model.trim="baseInfo.certificateNo" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书名称" prop="certificateName">
+              <el-input v-model.trim="baseInfo.certificateName" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证单位" prop="certificateCompany">
+              <el-input v-model.trim="baseInfo.certificateCompany" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发证日期" prop="certificateDate">
+              <el-date-picker
+                v-model="baseInfo.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择发证日期"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书有效日期" prop="validDate">
+              <el-date-picker
+                v-model="baseInfo.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择有效日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block>
     <!-- 选择用户列表组件 -->
     <person-list-dialog ref="personListRef" @add="confirmPerson" />
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    background-color: #fff;
-    border-radius: 8px;
-    padding-top: 10px;
-    margin-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    display: flex;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    position: relative;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 5px;
-    }
-  }
-
   :deep(.el-radio__label) {
     display: none;
   }
@@ -487,40 +380,5 @@
       }
     }
   }
-}
-
-.marg {
-  margin-top: 20px;
-}
 </style>
 
-<style scoped>
-.avatar-uploader .avatar {
-  width: 178px;
-  height: 178px;
-  display: block;
-}
-</style>
-
-<style>
-.avatar-uploader .el-upload {
-  border: 1px dashed var(--el-border-color);
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-  transition: var(--el-transition-duration-fast);
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: var(--el-color-primary);
-}
-
-.el-icon.avatar-uploader-icon {
-  font-size: 28px;
-  color: #8c939d;
-  width: 178px;
-  height: 178px;
-  text-align: center;
-}
-</style>
diff --git a/src/views/measure/person/components/addRecordCancel.vue b/src/views/measure/person/components/addRecordCancel.vue
new file mode 100644
index 0000000..c32ac43
--- /dev/null
+++ b/src/views/measure/person/components/addRecordCancel.vue
@@ -0,0 +1,459 @@
+<!-- 计量人员新增  证书基本信息table表格   作废 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import type { technologyJobType } from '../person-interface'
+import certificateAddDialog from './certificateAddDialog.vue'
+import personListDialog from './personListDialog.vue'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import type { TreeStructure, userType } from '@/views/system/user/user-interface'
+import { getDictByCode } from '@/api/system/dict'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const meterStaff = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  idCard: '', // 身份证号
+  sex: '', // 性别
+  education: '', // 文化程度
+  technologyJob: '', // 技术职务
+  administrationJob: '', // 行政职务
+  deptId: '', // 工作部门
+  major: '', // 专业
+  workDate: '', // 从事日期
+  id: '',
+})
+const ruleForm = ref({
+  meterStaff: {}, // 人员信息
+  staffId: '', // 计量人员id
+}) // 表单
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const title = ref('')
+const name = ref('')
+// 身份证号码验证规则
+const validateIDcard = (rule: any, value: any, callback: any) => {
+  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+  if (rr.test(value)) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+const rules = ref({
+  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
+
+}) // 表单验证规则
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref<TreeStructure[]>([])
+const PubListTree = ref([])
+// 获取组织列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
+  })
+}
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sex').then((response) => {
+    sexList.value = response.data
+  })
+}
+const educationList = ref<technologyJobType[]>([])
+// 获取文化程度列表
+const geteducationList = () => {
+  getDictByCode('education').then((response) => {
+    educationList.value = response.data
+  })
+}
+// 重置表单内容
+const resetFormData = () => {
+  meterStaff.value.staffNo = ''
+  meterStaff.value.name = ''
+  meterStaff.value.idCard = ''
+  meterStaff.value.sex = ''
+  meterStaff.value.education = ''
+  meterStaff.value.technologyJob = ''
+  meterStaff.value.administrationJob = ''
+  meterStaff.value.deptId = ''
+  meterStaff.value.major = ''
+  meterStaff.value.workDate = ''
+  meterStaff.value.id = ''
+}
+const technologyJobList = ref<technologyJobType[]>([])
+// 获取技术职务列表
+const getTechnologyJobList = () => {
+  getDictByCode('technologyJob').then((response) => {
+    technologyJobList.value = response.data
+  })
+}
+const administrationJobList = ref<technologyJobType[]>([])
+// 获取行政职务列表
+const getAdministrationJob = () => {
+  getDictByCode('administrationJob').then((response) => {
+    administrationJobList.value = response.data
+  })
+}
+const personListRef = ref()
+// 选择人员
+const selectPerson = () => {
+  personListRef.value.initDialog()
+}
+// 保存选择人员信息
+const confirmPerson = (row: any) => {
+  ruleForm.value.staffId = row.staffNo
+  meterStaff.value = row
+  ruleFormRef.value?.clearValidate('staffNo')
+}
+const changeList = ref([
+  {
+    name: '证书基本信息',
+    data: [] as any[],
+    column: [
+      {
+        label: '证书号',
+        data: 'certificateNo',
+        id: 'zs02',
+      },
+      {
+        label: '证书名称',
+        data: 'certificateName',
+        id: 'zs03',
+      },
+      {
+        label: '发证日期',
+        data: 'certificateDate',
+        id: 'zs04',
+      },
+      {
+        label: '发证单位',
+        data: 'certificateCompany',
+        id: 'zs01',
+      },
+      {
+        label: '有效日期',
+        data: 'validDate',
+        id: 'zs05',
+      },
+    ],
+  },
+  {
+    name: '计量工作培训记录',
+    data: [],
+    column: [],
+  },
+  {
+    name: '业务记录',
+    data: [],
+    column: [],
+  },
+])
+const current = ref('证书基本信息')
+const currentShow = computed(() => {
+  return changeList.value.filter(item => item.name === current.value)[0]
+})
+const certificateRef = ref() // 添加证书信息弹窗
+// 添加行
+const addRow = () => {
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
+}
+// 证书信息行内添加数据
+const addRowcertificate = (row: any, flag: string) => {
+  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
+  if (flag === 'update') {
+    changeList.value[0].data = [{
+      ...changeList.value[0].data[0],
+      ...row,
+      certificateStatus: diff < 0 ? '1' : '0',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    }]
+  }
+  else {
+    changeList.value[0].data.push(
+      {
+        ...row,
+        certificateStatus: diff < 0 ? '1' : '0',
+        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        id: null,
+        isDel: 0,
+        minioFileName: '',
+        remark: '',
+        staffId: meterStaff.value.id,
+        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
+  }
+}
+const currenSelect = ref<number>(-1) // 当前选中行
+// 删除行
+const removeRow = () => {
+  console.log(currenSelect.value)
+  if (currenSelect.value >= 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
+      currenSelect.value = -1
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        let params
+        if (changeList.value[0].data.length) {
+          params = changeList.value[0].data
+        }
+        else {
+          params = [
+            {
+              certificateCompany: '',
+              certificateDate: '',
+              certificateName: '',
+              certificateNo: '',
+              certificateStatus: '',
+              createTime: '',
+              id: null,
+              isDel: 0,
+              minioFileName: '',
+              remark: '',
+              staffId: meterStaff.value.id,
+              updateTime: '',
+              validDate: '',
+            },
+          ]
+        }
+        (title.value === '新建'
+          ? addCertificateList
+          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
+          formEl?.resetFields()
+          ElMessage.success('提交成功')
+          emits('resetData')
+          resetFormData()
+        })
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  changeList.value[0].data = []
+  emits('resetData')
+  resetFormData()
+}
+const selectTreeRef = ref()
+// 弹窗初始化
+const initDialog = (row: any) => {
+  changeList.value[0].data = []
+  resetFormData()
+  dialogVisible.value = true
+  title.value = row.title
+  name.value = row.name
+  selectTreeRef.value.clearSelected()
+  resetFormData()
+  getuser()
+  getPubList()
+  getSexList()
+  geteducationList()
+  getTechnologyJobList()
+  getAdministrationJob()
+  if (row.title === '新建') {
+    console.log()
+  }
+  else {
+    getCertificateDetail({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        meterStaff.value = res.data.meterStaff
+        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+      }
+    })
+  }
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <detail-page :title=" `${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+          完成
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="人员编号" prop="staffNo">
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="selectPerson">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="meterStaff.name">
+              <el-input v-model.trim="meterStaff.name" placeholder="姓名" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="性别" prop="meterStaff.sex">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="文化程度" prop="meterStaff.education">
+              <el-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="技术职务" prop="meterStaff.technologyJob">
+              <el-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="行政职务" prop="meterStaff.administrationJob">
+              <el-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="工作部门" prop="deptId">
+              <el-select v-if="title === '详情'" v-model="meterStaff.deptId" disabled>
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+              <com-tree-select
+                v-else
+                ref="selectTreeRef" v-model="meterStaff.deptId" :options="PubListTree"
+                placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业" prop="major">
+              <el-input v-model.trim="meterStaff.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="从事日期" prop="workDate">
+              <el-date-picker
+                v-model="meterStaff.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择从事日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block :title="current">
+      <template #btns>
+        <el-button v-if="title === '新建'" type="info" @click="removeRow">
+          删除行
+        </el-button>
+        <el-button v-if="title === '新建'" type="primary" @click="addRow">
+          添加行
+        </el-button>
+        <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+          编辑行
+        </el-button>
+      </template>
+      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
+        <el-table-column width="55" align="center">
+          <template #default="scope">
+            <el-radio-group v-model="currenSelect" class="ml-4">
+              <el-radio :label="scope.$index" />
+            </el-radio-group>
+          </template>
+        </el-table-column>
+        <el-table-column type="index" label="序号" width="55" />
+        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </detail-block>
+    <!-- 添加证书信息组件 -->
+    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    <!-- 选择用户列表组件 -->
+    <person-list-dialog ref="personListRef" @add="confirmPerson" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        display: none;
+      }
+    }
+  }
+</style>
+
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 332c73c..178fc12 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -32,6 +32,7 @@
   form.validDate = ''
 }
 const initDialog = (row: any) => {
+  resetData()
   title.value = row.title
   if (row.title === '编辑') {
     form.certificateNo = row.certificateNo
@@ -50,10 +51,12 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       if (title.value === '编辑') {
-        emits('add', form, 'update')
+        const deptRow = JSON.parse(JSON.stringify(form))
+        emits('add', deptRow, 'update')
       }
       else {
-        emits('add', form, '')
+        const deptRow = JSON.parse(JSON.stringify(form))
+        emits('add', deptRow, '')
       }
       dialogFormVisible.value = false
     }
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 592d810..9c6f65d 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -30,7 +30,7 @@
   { text: '技术职务', value: 'technologyJob', align: 'center', width: '140' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '100' },
   { text: '计量专业', value: 'major', align: 'center', width: '100' },
-  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '180' },
   { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '技术考核', value: 'technologyExam', align: 'center', width: '85' },
 ]) // 表格
@@ -63,7 +63,7 @@
   loadingTable.value = true
   getStaffList(searchQuery).then((res) => {
     if (res.code === 200) {
-      res.data.records = res.data.records.map((item: StaffType) => ({ ...item, sex: item.sex == '1' ? '男' : '女', technologyExam: item.technologyExam == '0' ? '已考核' : '未考核' }))
+      res.data.records = res.data.records.map((item: StaffType) => ({ ...item, sex: item.sex == '1' ? '男' : '女', technologyExam: item.technologyExam == '0' ? '已考核' : '未考核', certificateDate: item.certificateDate.split(' ')[0] }))
       list.value = res.data.records
       total.value = Number(res.data.total)
     }
@@ -236,21 +236,11 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="proxy.hasPerm(`/measure/person/list/import`)" type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" type="primary" @click="templateDownload">
-            模板下载
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/list/add`)" type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/list/export`)" type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" type="primary" @click="print">
-            打印
-          </el-button>
+          <icon-button v-if="proxy.hasPerm(`/measure/person/list/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/list/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/list/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table

diff --git a/src/components.d.ts b/src/components.d.ts
index 6e85584..815d62f 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -16,14 +16,13 @@
     BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default']
     BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
-    Benchcol: typeof import('./components/benchcol/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/DetailPage/index copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
+    DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
diff --git a/src/components/DetailPage/DetailBlockSwitch.vue b/src/components/DetailPage/DetailBlockSwitch.vue
new file mode 100644
index 0000000..4d92074
--- /dev/null
+++ b/src/components/DetailPage/DetailBlockSwitch.vue
@@ -0,0 +1,71 @@
+<script lang="ts" setup name="DetailBlock">
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+})
+
+const slots = useSlots()
+</script>
+
+<template>
+  <div class="detail-main">
+    <div class="header">
+      <div class="menu">
+        <slot name="menu" />
+      </div>
+      <div class="title">
+        {{ title }}
+      </div>
+      <div class="btns">
+        <slot name="btns" />
+      </div>
+    </div>
+    <div v-if="slots.default" class="content">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-main {
+  background-color: #fff;
+  border-radius: 8px;
+  margin-top: 10px;
+  padding-top: 10px;
+
+  .header {
+    position: relative;
+    height: 40px;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+
+    .title {
+      font-weight: 500;
+    }
+
+    .btns {
+      position: absolute;
+      right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+
+    .menu {
+      position: absolute;
+      left: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+
+  .content {
+    background-color: #fff;
+    padding: 0 10px 20px;
+    margin-top: 10px;
+  }
+}
+</style>
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d6c1c91..1644a80 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -314,6 +314,39 @@
       },
     ],
   },
+  {
+    path: '/borrow',
+    component: Layout,
+    redirect: '/device/borrow/borrowapply',
+    name: 'Borrow',
+    meta: {
+      title: '设备领用',
+      icon: 'ep:key',
+      auth: '/device/borrow',
+    },
+    children: [
+      {
+        path: 'borrowapply',
+        name: 'borroWapply',
+        component: () => import('@/views/device/borrow/borrwoApply.vue'),
+        meta: {
+          title: '设备借用申请',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowapply',
+        },
+      },
+      {
+        path: 'borrowhandle',
+        name: 'borrowHandle',
+        component: () => import('@/views/device/borrow/borrowHandle.vue'),
+        meta: {
+          title: '设备借用处理',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowhandle',
+        },
+      },
+    ],
+  },
 
 ]
 
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
new file mode 100644
index 0000000..1c2405e
--- /dev/null
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="borrowHandle">
+// 逻辑代码
+</script>
+
+<template>
+  <app-container>
+    设备借用处理
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
new file mode 100644
index 0000000..03d414b
--- /dev/null
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="borrowApply">
+// 逻辑代码
+</script>
+
+<template>
+  <app-container>
+    设备借用申请
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index c2682fc..5f7b347 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -339,381 +339,374 @@
 
 <template>
   <div class="body-container">
-    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资产编号" prop="assetNo">
-            <el-input v-model.trim="ruleForm.assetNo" placeholder="系统自动生成" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="资产类型" prop="assetType">
-            <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备编号" prop="equipmentNo">
-            <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备名称" prop="equipmentName">
-            <el-input v-model.trim="ruleForm.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="生产厂家" prop="manufacturer">
-            <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="厂家国别" prop="manufacturerCountry">
-            <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="出厂编号" prop="manufacturingNo">
-            <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="出厂年月" prop="manufacturingDate">
-            <el-date-picker
-              v-model="ruleForm.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '出厂年月'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="型号" prop="modelNo">
-            <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="管理状态" prop="managerState">
-            <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="ABC" prop="abc">
-            <el-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'">
-              <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="标签绑定" prop="labelBind">
-            <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === '详情' ? '' : '标签'" :disabled="title === '详情'" clearable>
-              <template #append>
-                <el-button type="primary" size="small">
-                  扫描
-                </el-button>
-              </template>
-            </el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="立卡年月" prop="cardEstablishmentDate">
-            <el-date-picker
-              v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '立卡年月'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="启用日期" prop="enableDate">
-            <el-date-picker
-              v-model="ruleForm.enableDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '启用日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定方式" prop="mesureType">
-            <el-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'">
-              <el-option v-for="item in mesureTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定周期" prop="mesureCycle">
-            <el-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="12">
-          <el-form-item label="测量范围" prop="mesureRange">
-            <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === '详情' ? '' : '测量范围'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="不确定度" prop="uncertainty">
-            <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === '详情' ? '' : '不确定度'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="使用部门" prop="useDept">
-            <com-tree-select
-              v-if="title !== '详情'"
-              v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-              :tree-props="deptProps"
-            />
-            <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
-              <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="使用人" prop="usePerson">
-            <el-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'">
-              <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="专业分类" prop="majorCategory">
-            <el-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'">
-              <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="检定部门" prop="mesureDept">
-            <com-tree-select
-              v-if="title !== '详情'"
-              v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-              :tree-props="deptProps"
-            />
-            <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
-              <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定日期" prop="mesureDate">
-            <el-date-picker
-              v-model="ruleForm.mesureDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '检定日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="有效日期" prop="validDate">
-            <el-date-picker
-              v-model="ruleForm.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '有效日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定结果" prop="mesureResult">
-            <el-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'">
-              <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="8">
-          <el-form-item label="是否是技术指标需要校准/检定的设备" prop="isCalibrationTestEquipment" label-width="260px">
-            <el-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否是测量工装台账" prop="isMeasureAccount" label-width="260px">
-            <el-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否标准配套设备" prop="isStandardSupportEquipment" label-width="260px">
-            <el-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
+    <detail-block-switch title="基本信息">
+      <template #menu>
+        <slot name="menuswitch" />
+      </template>
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资产编号" prop="assetNo">
+              <el-input v-model.trim="ruleForm.assetNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="资产类型" prop="assetType">
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备编号" prop="equipmentNo">
+              <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="生产厂家" prop="manufacturer">
+              <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="厂家国别" prop="manufacturerCountry">
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号" prop="manufacturingNo">
+              <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂年月" prop="manufacturingDate">
+              <el-date-picker
+                v-model="ruleForm.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '出厂年月'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="型号" prop="modelNo">
+              <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="管理状态" prop="managerState">
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="ABC" prop="abc">
+              <el-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'">
+                <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标签绑定" prop="labelBind">
+              <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === '详情' ? '' : '标签'" :disabled="title === '详情'" clearable>
+                <template #append>
+                  <el-button type="primary" size="small">
+                    扫描
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="立卡年月" prop="cardEstablishmentDate">
+              <el-date-picker
+                v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '立卡年月'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="启用日期" prop="enableDate">
+              <el-date-picker
+                v-model="ruleForm.enableDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '启用日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定方式" prop="mesureType">
+              <el-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'">
+                <el-option v-for="item in mesureTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定周期" prop="mesureCycle">
+              <el-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="测量范围" prop="mesureRange">
+              <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === '详情' ? '' : '测量范围'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="不确定度" prop="uncertainty">
+              <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === '详情' ? '' : '不确定度'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="使用部门" prop="useDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
+                :tree-props="deptProps"
+              />
+              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="使用人" prop="usePerson">
+              <el-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'">
+                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="专业分类" prop="majorCategory">
+              <el-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'">
+                <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="检定部门" prop="mesureDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                :tree-props="deptProps"
+              />
+              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定日期" prop="mesureDate">
+              <el-date-picker
+                v-model="ruleForm.mesureDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '检定日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="有效日期" prop="validDate">
+              <el-date-picker
+                v-model="ruleForm.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '有效日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定结果" prop="mesureResult">
+              <el-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'">
+                <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="8">
+            <el-form-item label="是否是技术指标需要校准/检定的设备" prop="isCalibrationTestEquipment" label-width="260px">
+              <el-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否是测量工装台账" prop="isMeasureAccount" label-width="260px">
+              <el-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否标准配套设备" prop="isStandardSupportEquipment" label-width="260px">
+              <el-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资产来源" prop="assetSource">
-            <el-input v-model.trim="ruleForm.assetSource" :placeholder="title === '详情' ? '' : '资产来源'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备规格" prop="equipmentSpecifications">
-            <el-input v-model.trim="ruleForm.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备类别" prop="equipmentCategory">
-            <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
-              <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备类型" prop="equipmentType">
-            <el-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'">
-              <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资本来源" prop="capitalSource">
-            <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
-              <el-option v-for="item in capitalSourceList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="管理级别" prop="managerLevel">
-            <el-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'">
-              <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="用途" prop="purpose">
-            <el-input v-model.trim="ruleForm.purpose" :placeholder="title === '详情' ? '' : '用途'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="技术水平" prop="technicalLevel">
-            <el-input v-model.trim="ruleForm.technicalLevel" :placeholder="title === '详情' ? '' : '技术水平'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="完好状态" prop="intactState">
-            <el-input v-model.trim="ruleForm.intactState" :placeholder="title === '详情' ? '' : '完好状态'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="外形尺寸" prop="overallDimension">
-            <el-input v-model.trim="ruleForm.overallDimension" :placeholder="title === '详情' ? '' : '外形尺寸'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="重量(吨)" prop="weight">
-            <el-input v-model.trim="ruleForm.weight" :placeholder="title === '详情' ? '' : '重量'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="单价" prop="singlePrice">
-            <el-input v-model.trim="ruleForm.singlePrice" :placeholder="title === '详情' ? '' : '单价'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="安装及杂费" prop="installIncidentalExpenses">
-            <el-input v-model.trim="ruleForm.installIncidentalExpenses" :placeholder="title === '详情' ? '' : '安装及杂费'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="安装地点" prop="installPlace">
-            <el-input v-model.trim="ruleForm.installPlace" :placeholder="title === '详情' ? '' : '安装地点'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="原值" prop="originValue">
-            <el-input v-model.trim="ruleForm.originValue" :placeholder="title === '详情' ? '' : '原值'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="目前原值" prop="presentOriginValue">
-            <el-input v-model.trim="ruleForm.presentOriginValue" :placeholder="title === '详情' ? '' : '目前原值'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="折旧年限" prop="depreciationPeriod">
-            <el-input v-model.trim="ruleForm.depreciationPeriod" :placeholder="title === '详情' ? '' : '折旧年限'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="折旧方法" prop="depreciationMethod">
-            <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
-              <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="属性" prop="attribute">
-            <el-input v-model.trim="ruleForm.attribute" placeholder="属性" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="12">
-          <el-form-item label="说明书" prop="minioFileName">
-            <show-photo :minio-file-name="ruleForm.fileList[0]?.minioFileName || ''" />
-            <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
-            <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
-              {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
-            </el-button>
-            <span v-if="title === '详情' && !ruleForm.fileList[0]?.minioFileName">暂无</span>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="24">
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" placeholder="备注" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资产来源" prop="assetSource">
+              <el-input v-model.trim="ruleForm.assetSource" :placeholder="title === '详情' ? '' : '资产来源'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备规格" prop="equipmentSpecifications">
+              <el-input v-model.trim="ruleForm.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备类别" prop="equipmentCategory">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+                <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备类型" prop="equipmentType">
+              <el-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'">
+                <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资本来源" prop="capitalSource">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+                <el-option v-for="item in capitalSourceList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="管理级别" prop="managerLevel">
+              <el-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'">
+                <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="用途" prop="purpose">
+              <el-input v-model.trim="ruleForm.purpose" :placeholder="title === '详情' ? '' : '用途'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="技术水平" prop="technicalLevel">
+              <el-input v-model.trim="ruleForm.technicalLevel" :placeholder="title === '详情' ? '' : '技术水平'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="完好状态" prop="intactState">
+              <el-input v-model.trim="ruleForm.intactState" :placeholder="title === '详情' ? '' : '完好状态'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="外形尺寸" prop="overallDimension">
+              <el-input v-model.trim="ruleForm.overallDimension" :placeholder="title === '详情' ? '' : '外形尺寸'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="重量(吨)" prop="weight">
+              <el-input v-model.trim="ruleForm.weight" :placeholder="title === '详情' ? '' : '重量'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="单价" prop="singlePrice">
+              <el-input v-model.trim="ruleForm.singlePrice" :placeholder="title === '详情' ? '' : '单价'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="安装及杂费" prop="installIncidentalExpenses">
+              <el-input v-model.trim="ruleForm.installIncidentalExpenses" :placeholder="title === '详情' ? '' : '安装及杂费'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="安装地点" prop="installPlace">
+              <el-input v-model.trim="ruleForm.installPlace" :placeholder="title === '详情' ? '' : '安装地点'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="原值" prop="originValue">
+              <el-input v-model.trim="ruleForm.originValue" :placeholder="title === '详情' ? '' : '原值'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="目前原值" prop="presentOriginValue">
+              <el-input v-model.trim="ruleForm.presentOriginValue" :placeholder="title === '详情' ? '' : '目前原值'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="折旧年限" prop="depreciationPeriod">
+              <el-input v-model.trim="ruleForm.depreciationPeriod" :placeholder="title === '详情' ? '' : '折旧年限'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="折旧方法" prop="depreciationMethod">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+                <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="属性" prop="attribute">
+              <el-input v-model.trim="ruleForm.attribute" placeholder="属性" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="说明书" prop="minioFileName">
+              <show-photo :minio-file-name="ruleForm.fileList[0]?.minioFileName || ''" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
+                {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
+              </el-button>
+              <span v-if="title === '详情' && !ruleForm.fileList[0]?.minioFileName">暂无</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" placeholder="备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block-switch>
   </div>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    padding-top: 20px;
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index f46553a..fc3fd54 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -360,20 +360,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          固定资产-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`固定资产-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -763,44 +758,11 @@
           </el-row>
         </div> -->
       </el-form>
-    </div>
+    </detail-page>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index 0abbdb1..6e88e96 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -74,33 +74,29 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ name }} -{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm">
-            关闭
-          </el-button>
-        </span>
-      </div>
-      <div class="body">
-        <!-- 三级菜单 -->
-        <el-radio-group v-model="current">
-          <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
-            {{ item.name }}
-          </el-radio-button>
-        </el-radio-group>
-      </div>
-      <!-- 展示区域 -->
-      <keep-alive>
-        <component :is="currentComp" ref="currentCompRef" :name="current" :title="title" :row="row" />
-      </keep-alive>
-    </div>
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <!-- 展示区域 -->
+    <keep-alive>
+      <component :is="currentComp" ref="currentCompRef" :name="current" :title="title" :row="row">
+        <template #menuswitch>
+          <!-- 三级菜单 -->
+          <el-radio-group v-model="current">
+            <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+              {{ item.name }}
+            </el-radio-button>
+          </el-radio-group>
+        </template>
+      </component>
+    </keep-alive>
   </app-container>
 </template>
 
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f9cdcd0..f653095 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -256,7 +256,7 @@
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
-  // 原生上传图片
+  // 原生上传
   // console.log(event.target.files)
   // if (event.target.files[0].type === 'application/pdf') {
   if (event.target.files?.length !== 0) {
@@ -354,7 +354,7 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" type="primary" @click="identify">
+          <!-- <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" type="primary" @click="identify">
             标签识别
           </el-button>
           <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/import`)" type="primary" @click="batchImport">
@@ -371,7 +371,13 @@
           </el-button>
           <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/print`)" v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/device/standingBook/components/templateTable.vue b/src/views/device/standingBook/components/templateTable.vue
index 8a928f0..7aa563f 100644
--- a/src/views/device/standingBook/components/templateTable.vue
+++ b/src/views/device/standingBook/components/templateTable.vue
@@ -245,11 +245,11 @@
   <div>
     <!-- 添加证书信息组件 -->
     <add-row ref="addRowRef" @add="addRowData" />
-    <div class="header">
-      <div class="title">
-        <!-- {{ $props.name }} -->
-      </div>
-      <span class="btns">
+    <detail-block-switch :title="name">
+      <template #menu>
+        <slot name="menuswitch" />
+      </template>
+      <template #btns>
         <el-button v-if="title !== '详情'" type="info" @click="removeRow">
           删除行
         </el-button>
@@ -259,55 +259,33 @@
         <el-button v-if="title !== '详情'" type="primary" @click="editRow">
           编辑行
         </el-button>
-      </span>
-    </div>
-    <!-- 表格区域 -->
-    <normal-table
-      id="print"
-      :data="list" :total="total" :columns="columns as any"
-      :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-      :list-loading="loadingTable"
-      style="padding-top: 20px;background-color: #fff;"
-      @change="changePage"
-    >
-      <template #preColumns>
-        <el-table-column label="" width="55" align="center">
-          <template #default="scope">
-            <el-radio v-model="select" :label="scope.$index" class="radio" />
-          </template>
-        </el-table-column>
-        <el-table-column label="序号" width="55" align="center">
-          <template #default="scope">
-            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-          </template>
-        </el-table-column>
       </template>
-    </normal-table>
+      <!-- 表格区域 -->
+      <normal-table
+        id="print"
+        :data="list" :total="total" :columns="columns as any"
+        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+        :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </detail-block-switch>
   </div>
 </template>
 
 <style lang="scss" scoped>
-.header {
-  background-color: #fff;
-  // height: 40px;
-  border-radius: 8px;
-  display: flex;
-  align-items: center;
-  flex-direction: column;
-  justify-content: center;
-  position: relative;
-
-  .title {
-    // font-weight: 700;
-  }
-
-  .btns {
-    position: absolute;
-    right: 40px;
-    top: -22px;
-  }
-}
-
 :deep(.el-radio__label) {
   display: none;
 }
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 7538bc8..78a3800 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -272,24 +272,12 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/identify`)" type="primary" @click="identify">
-            标签识别
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/import`)" type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/mould`)" type="primary" @click="templateDownload">
-            模板下载
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/add`)" type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/export`)" type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/print`)" v-print="printObj" type="primary">
-            打印
-          </el-button>
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/identify`)" icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index fc364c8..e74d70e 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -361,20 +361,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ name }} - {{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -458,73 +453,33 @@
           </el-col>
         </el-row>
       </el-form>
-      <div v-if="title !== '新建' ">
-        <div class="header" style="margin-top: 10px;">
-          <div class="title">
-            审批流程
-          </div>
-        </div>
-        <div class="timeline">
-          <el-timeline>
-            <el-timeline-item timestamp="2018/4/12" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/12 20:46</p>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="2018/4/3" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/3 20:46</p>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="2018/4/2" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/2 20:46</p>
-              </el-card>
-            </el-timeline-item>
-          </el-timeline>
-        </div>
-      </div>
-    </div>
+    </detail-page>
+    <detail-block v-if="title !== '新建' " title="审批流程">
+      <el-timeline>
+        <el-timeline-item timestamp="2018/4/12" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/12 20:46</p>
+          </el-card>
+        </el-timeline-item>
+        <el-timeline-item timestamp="2018/4/3" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/3 20:46</p>
+          </el-card>
+        </el-timeline-item>
+        <el-timeline-item timestamp="2018/4/2" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/2 20:46</p>
+          </el-card>
+        </el-timeline-item>
+      </el-timeline>
+    </detail-block>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .timeline {
   background-color: #fff;
 }
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index aa3963f..737568d 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -1,6 +1,6 @@
 <!-- 状态管理公共列表组件 -->
 <script lang="ts" setup>
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessageBox } from 'element-plus'
 import approve from './approvalActionDialog.vue'
 import addDialog from './templateAdd.vue'
 const props = defineProps({
@@ -142,7 +142,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: any) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     title: '详情',
@@ -150,7 +150,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: any) => {
   dialogVisible.value = true
   // addRef.value.initDialog({
   //   title: '编辑',
@@ -158,7 +158,7 @@
   // })
 }
 // 删除
-const remove = (row) => {
+const remove = (row: any) => {
   ElMessageBox.confirm(
     `确认删除${row.equipmentName}吗？`,
     '提示',
@@ -181,20 +181,20 @@
   // })
 }
 // 同意
-const agree = (row) => {
+const agree = (row: any) => {
   console.log(approveRef.value)
   approveRef.value.initDialog({
     radio: '1',
   })
 }
 // 驳回
-const reject = (row) => {
+const reject = (row: any) => {
   approveRef.value.initDialog({
     radio: '3',
   })
 }
 // 拒绝
-const refuse = (row) => {
+const refuse = (row: any) => {
   approveRef.value.initDialog(
     {
       radio: '2',
@@ -202,7 +202,7 @@
   )
 }
 // 取消
-const cancel = (row) => {
+const cancel = (rowrow: any) => {
   ElMessageBox.confirm(
     '确认取消吗？',
     '提示',
@@ -301,20 +301,20 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+          <el-input placeholder="申请编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="设备编号" clearable class="w-50 m-2" />
+          <el-input placeholder="设备编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.modelNo" placeholder="设备名称" clearable class="w-50 m-2" />
+          <el-input placeholder="设备名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请单位" clearable class="w-50 m-2" />
+          <el-input placeholder="申请单位" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.publisher" placeholder="申请状态" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" />
+          <el-select placeholder="申请状态" clearable>
+            <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" /> -->
           </el-select>
         </search-item>
       </search-area>
@@ -328,7 +328,10 @@
           <el-button type="primary" @click="templateDownload">
             模板下载
           </el-button> -->
-          <el-button type="primary" @click="add">
+          <icon-button icon="icon-add" title="新建" @click="add" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+          <!-- <el-button type="primary" @click="add">
             新建
           </el-button>
           <el-button type="primary" @click="exportExcelBtn">
@@ -336,7 +339,7 @@
           </el-button>
           <el-button v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
         </template>
         <!-- 表格区域 -->
         <normal-table
@@ -386,22 +389,3 @@
     </app-container>
   </div>
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 154px !important;
-}
-
-.normal-date {
-  width: 154px !important;
-}
-
-.normal-select {
-  width: 154px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
-
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 0763c5a..9ef0b93 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -19,7 +19,6 @@
 const effectiveStatusName = ref('')
 const title = ref('')
 const fileList = ref<UploadUserFile[]>([])
-console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -80,10 +79,9 @@
   if (row.title === '新建') {
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
-    ruleForm.publisher = ''
+    ruleForm.publisher = userInfo.$state.deptName
     ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 判断有无存储
-    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
     if (sessionStorage.getItem(fileTypeName.value)) {
       const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
       ruleForm.fileType = session.fileType
@@ -117,6 +115,8 @@
     ruleForm.remark = row.remark
     ruleForm.publishTime = row.publishTime
     ruleForm.minioFileName = row.minioFileName
+    // ruleForm.publisher = '0'
+    // ruleForm.createUserId = '1'
   }
 }
 defineExpose({ initDialog })
@@ -148,6 +148,9 @@
       type: 'warning',
     },
       ).then((res) => {
+        if (ruleForm.publisher === userInfo.$state.deptName) {
+          ruleForm.publisher === userInfo.$state.deptId
+        }
         if (flag == '提交') {
           addApi(ruleForm).then((res) => {
             if (res.code == 200) {
@@ -193,7 +196,6 @@
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        console.log(res.data[0])
         ruleForm.minioFileName = res.data[0]
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
@@ -216,7 +218,6 @@
 // ])
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
-  console.log(diffDat)
   if (diffDat < 0) {
     // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '在使用'
@@ -237,7 +238,7 @@
 
 <template>
   <app-container v-if="dialogVisible" style="overflow: hidden;">
-    <detail-page :title="`${title}${fileTypeName}`">
+    <detail-page :title="`${fileTypeName}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
           提交
@@ -278,12 +279,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="发布单位" prop="publisher">
-              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'" class="fill-input">
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled>
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
               <com-tree-select
                 v-else
-                v-model="ruleForm.publisher" :options="PubListTree" placeholder="选择组织机构"
+                v-model="ruleForm.publisher" :options="PubListTree" placeholder="请选择发布单位"
                 :tree-props="deptProps"
               />
             </el-form-item>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 44e3e4d..b45fbc3 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -324,22 +324,9 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <!-- <el-button type="primary" @click="batchImport">
-            批量导入
-          </el-button> -->
-          <!-- <el-button type="primary" @click="templateDownload">
-            模板下载
-          </el-button> -->
-          <!-- <el-button type="primary" @click="add">
-            新建
-          </el-button> -->
-          <el-button type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-print="printObj" type="primary">
-            打印
-          </el-button>
+          <!-- <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange"> -->
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 4677e48..7d4724b 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -204,13 +204,9 @@
     loading.close()
   })
 }
-// 打印
-const print = () => {
-
-}
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
-  // 原生上传图片
+  // 原生上传
   // console.log(event.target.files)
   // if (event.target.files[0].type === 'application/pdf') {
   if (event.target.files?.length !== 0) {
@@ -264,7 +260,7 @@
         <search-item>
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
-        <search-item>
+        <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
@@ -273,13 +269,13 @@
               :value="item.value"
             />
           </el-select>
-        </search-item>
+        </search-item> -->
         <search-item>
           <el-date-picker
             v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 155px;"
+            style="width: 185px;"
           />
         </search-item>
         <search-item>
@@ -287,19 +283,19 @@
             v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 155px;"
+            style="width: 185px;"
           />
         </search-item>
         <search-item>
-          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select> -->
-          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
+          </el-select>
+          <!-- <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" /> -->
         </search-item>
       </search-area>
       <table-container>
@@ -310,7 +306,7 @@
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
-          <icon-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" @click="print" />
+          <icon-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index cf0dd4f..5ca3275 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -3,11 +3,11 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { detailType } from '../measureDept-interface'
-import { getUserList } from '@/api/system/user'
+// import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
+import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import type { userType } from '@/views/system/user/user-interface'
 import { listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
-import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
 const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -31,11 +31,20 @@
   technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
+// 获取计量人员列表
 const getuser = () => {
-  getUserList({ offset: 1, limit: 99999 }).then((res) => {
-    userList.value = res.data.rows
+  getStaffList({
+    staffNo: '', // 人员编号
+    name: '', // 姓名
+    deptId: ruleForm.value.deptId, // 所在部门
+    limit: 999999,
+    offset: 1,
+  }).then((res) => {
+    if (res.code === 200) {
+      userList.value = res.data.records
+    }
   })
-} // 获取用户列表
+}
 const technologyJobList = ref<{ id: string;name: string;value: string }[]>([])
 // 获取技术职务列表
 const getTechnologyJobList = () => {
@@ -50,7 +59,16 @@
     administrationJobList.value = response.data
   })
 }
-
+// 选择负责人自动填充职务信息
+const directorChange = (val: string) => {
+  const selectUser = userList.value.filter(item => item.name === val)[0]
+  getStaffDetail(selectUser).then((res) => {
+    if (res.code === 200) {
+      ruleForm.value.administrationJob = res.data.administrationJob
+      ruleForm.value.technologyJob = res.data.technologyJob
+    }
+  })
+}
 // 提交
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
@@ -95,12 +113,6 @@
 const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
-// const searchQuery = ref({
-//   limit: 10,
-//   offset: 1,
-//   total: 0,
-//   pageSizes: [10, 20, 30],
-// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -410,20 +422,6 @@
     }
   })
 }
-// const handleSizeChange = (val: number) => {
-//   searchQuery.value.limit = val
-//   getDepartmentList()
-//   getuserInfoList()
-//   getInstrumentInfo()
-//   getDeviceInfo()
-// }
-// const handleCurrentChange = (val: number) => {
-//   searchQuery.value.offset = val
-//   getDepartmentList()
-//   getuserInfoList()
-//   getInstrumentInfo()
-//   getDeviceInfo()
-// }
 // 弹窗初始化
 const initDialog = (row: any) => {
   reset()
@@ -460,22 +458,17 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title.split('-')[2] === '编辑'" type="primary" @click="submitForm(ruleFormRef)">
-            提交
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="title">
+      <template #btns>
+        <el-button v-if="title.split('-')[2] === '编辑'" type="primary" @click="submitForm(ruleFormRef)">
+          提交
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title.split('-')[2] === '详情' ? 'isDetail' : '']">
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item :label=" `${title.split('-')[1]}编号`" prop="organizeNo">
               <el-input v-model.trim="ruleForm.organizeNo" placeholder="系统自动生成" disabled />
@@ -487,7 +480,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="title.split('-')[1] === '工程组'" :gutter="24" class="marg">
+        <el-row v-if="title.split('-')[1] === '工程组'" :gutter="24">
           <el-col :span="6">
             <el-form-item label="科室编号">
               <el-input v-model.trim="ruleForm.pDeptId" disabled />
@@ -509,10 +502,10 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
-              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" @change="directorChange">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.name" />
               </el-select>
             </el-form-item>
@@ -532,7 +525,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="24">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
               <el-input v-model.trim="ruleForm.remark" :placeholder="title.split('-')[2] === '详情' ? '' : '备注'" :disabled="title.split('-')[2] === '详情'" />
@@ -540,85 +533,24 @@
           </el-col>
         </el-row>
       </el-form>
-      <!-- 科室信息-人员信息等列表切换 -->
-      <div>
-        <div class="header" style="margin-top: 10px;">
-          <!-- 切换 -->
-          <el-radio-group v-model="current" class="change-btn">
-            <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
-              {{ item.name }}
-            </el-radio-button>
-          </el-radio-group>
-          <div class="title">
-            {{ current }}
-          </div>
-          <span class="btns">
-          <!-- <el-button type="info" :disabled="title === '详情'" @click="removeRow">
-            删除行
-          </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
-            添加行
-          </el-button> -->
-          </span>
-        </div>
-        <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <el-table-column type="index" label="序号" width="55" align="center" />
-          <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
-        </el-table>
-        <!-- <div style="width: 100%;margin-top: 10px;">
-          <el-pagination
-            :current-page="searchQuery.offset"
-            :page-sizes="searchQuery.pageSizes"
-            :page-size="searchQuery.limit"
-            :total="searchQuery.total"
-            layout="total, sizes, prev, pager, next"
-            hide-on-single-page
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-          />
-        </div> -->
-      </div>
-    </div>
+    </detail-page>
+    <detail-block-switch :title="current">
+      <template #menu>
+        <el-radio-group v-model="current" class="change-btn">
+          <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
+            {{ item.name }}
+          </el-radio-button>
+        </el-radio-group>
+      </template>
+      <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
+        <el-table-column type="index" label="序号" width="55" align="center" />
+        <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </detail-block-switch>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-    position: relative;
-
-    .change-btn {
-      position: absolute;
-      left: 40px;
-      top: 4px;
-    }
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 4px;
-    }
-  }
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
@@ -628,8 +560,4 @@
     }
   }
 }
-
-.marg {
-  margin-top: 10px;
-}
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 9ad87af..aac1ef2 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -231,12 +231,14 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
+          <!-- <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
           <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
+          <icon-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 2e3322a..3f472eb 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -41,7 +41,7 @@
   { text: '证书号', value: 'certificateNo', align: 'center' },
   { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
   { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'validDate', align: 'center', width: '200' },
   { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
 ]) // 表格
 const certificateStatusList = ref([
@@ -90,7 +90,7 @@
   loadingTable.value = true
   getCertificateList(searchQuery).then((res) => {
     if (res.code === 200) {
-      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效' }))
+      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效', validDate: item.validDate.split(' ')[0], certificateDate: item.certificateDate.split(' ')[0] }))
       list.value = res.data.records
       total.value = Number(res.data.total)
     }
@@ -115,6 +115,7 @@
   addRef.value.initDialog({
     ...row,
     title: '详情',
+    name: props.isRemind ? '证书状况' : '证书记录',
   })
 }
 // 编辑
@@ -123,6 +124,7 @@
   addRef.value.initDialog({
     ...row,
     title: '编辑',
+    name: props.isRemind ? '证书状况' : '证书记录',
   })
 }
 
@@ -193,6 +195,7 @@
   dialogVisible.value = true
   addRef.value.initDialog({
     title: '新建',
+    name: props.isRemind ? '证书状况' : '证书记录',
   })
 }
 // 导出
@@ -292,21 +295,11 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
-            模板下载
-          </el-button>
-          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
-            打印
-          </el-button>
+          <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
@@ -325,7 +318,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column fixed="right" label="操作" align="center" width="150">
+            <el-table-column fixed="right" label="操作" align="center" width="180">
               <template #default="{ row }">
                 <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
                   提醒
@@ -336,7 +329,7 @@
                 <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 4dc1b17..4352604 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -69,7 +69,16 @@
     const IdCard = ruleForm.value.idCard
     const birthday = `${IdCard.substring(6, 10)}-${IdCard.substring(10, 12)}`
     ruleForm.value.birthday = birthday
-    console.log(ruleForm.value)
+    // 获取性别 第17位  奇数为男 偶数为女
+    // ruleForm.value.sex
+    if (Number(IdCard.substring(16, 17)) % 2) {
+      // 男
+      ruleForm.value.sex = '1'
+    }
+    else {
+      //  女
+      ruleForm.value.sex = '2'
+    }
   })
 }
 const dialogVisible = ref<boolean>(false) // 弹窗显示
@@ -130,7 +139,6 @@
     technologyExam: '', // 技术考核
     remark: '', // 备注
     certificateList: [], // 证书列表
-
   }
 }
 const technologyJobList = ref<technologyJobType[]>([])
@@ -309,7 +317,7 @@
           }
           (title.value === '新建'
             ? getStaffAdd
-            : getStaffupdate) ({ ...ruleForm.value, certificateList: changeList.value[0].data }).then((res) => {
+            : getStaffupdate) ({ ...ruleForm.value, certificateList: changeList.value[0].data, birthday: `${ruleForm.value.idCard.substring(6, 10)}-${ruleForm.value.idCard.substring(10, 12)}-${ruleForm.value.idCard.substring(12, 14)}` }).then((res) => {
             if (res.code == 200) {
               formEl?.resetFields()
               ElMessage.success('提交成功')
@@ -332,12 +340,14 @@
   emits('resetData')
   resetFormData()
 }
+const selectTreeRef = ref()
 // 弹窗初始化
 const initDialog = (row: any) => {
   changeList.value[0].data = []
   dialogVisible.value = true
   title.value = row.title
   resetFormData()
+  selectTreeRef.value?.clearSelected()
   getuser()
   getPubList()
   getSexList()
@@ -370,20 +380,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          计量人员-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
-            完成
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`计量人员-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+          完成
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
         <el-row :gutter="24" class="marg">
           <el-col :span="5">
@@ -394,6 +399,7 @@
                 :http-request="uploadQuarterlyEvaluateFile"
                 :before-upload="beforeAvatarUpload"
                 :disabled="title === '详情'"
+                accept="image/png, image/jpeg,image/jpg"
               >
                 <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
                 <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
@@ -425,8 +431,8 @@
               </el-select>
               <com-tree-select
                 v-else
-                v-model="ruleForm.deptId" :options="PubListTree" placeholder="选择组织机构"
-                :tree-props="deptProps"
+                ref="selectTreeRef" v-model="ruleForm.deptId" :options="PubListTree"
+                placeholder="选择组织机构" :tree-props="deptProps"
               />
             </el-form-item>
             <el-form-item label="计量专业" prop="major" class="marg-item">
@@ -489,29 +495,19 @@
           </el-col>
         </el-row>
       </el-form>
-      <!-- 证书基本信息 -->
-      <!-- 切换 -->
-      <!-- <el-radio-group v-model="current" style="margin-bottom: -15px;">
-          <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
-            {{ item.name }}
-          </el-radio-button>
-        </el-radio-group> -->
-      <div class="header" style="margin-top: 10px;">
-        <div class="title">
-          {{ current }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="info" @click="removeRow">
-            删除行
-          </el-button>
-          <el-button v-if="title !== '详情'" type="primary" @click="addRow">
-            添加行
-          </el-button>
-          <el-button v-if="title !== '详情'" type="primary" @click="editRow">
-            编辑行
-          </el-button>
-        </span>
-      </div>
+    </detail-page>
+    <detail-block :title="current">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="info" @click="removeRow">
+          删除行
+        </el-button>
+        <el-button v-if="title !== '详情'" type="primary" @click="addRow">
+          添加行
+        </el-button>
+        <el-button v-if="title !== '详情'" type="primary" @click="editRow">
+          编辑行
+        </el-button>
+      </template>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
         <el-table-column width="55" align="center">
           <template #default="scope">
@@ -523,7 +519,7 @@
         <el-table-column type="index" label="序号" width="55" />
         <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
       </el-table>
-    </div>
+    </detail-block>
     <!-- 添加证书信息组件 -->
     <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
     <!-- 选择用户列表组件 -->
@@ -532,77 +528,38 @@
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    background-color: #fff;
-    border-radius: 8px;
-    padding-top: 10px;
-    margin-top: 10px;
-    padding-right: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    display: flex;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    position: relative;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 5px;
-    }
-  }
-
-  :deep(.el-radio__label) {
-    display: none;
-  }
-
-  :deep(.el-icon.avatar-uploader-icon) {
-    font-size: 28px;
-    color: #8c939d;
-    width: 190px;
-    height: 250px;
-    text-align: center;
-  }
-
-  :deep(.avatar-uploader .avatar) {
-    width: 190px;
-    height: 250px;
-    display: block;
-  }
-
-  .isDetail {
-    ::v-deep {
-      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-        display: none;
-      }
-    }
-  }
+:deep(.el-radio__label) {
+  display: none;
 }
 
-.marg {
-  margin-top: 20px;
+:deep(.el-icon.avatar-uploader-icon) {
+  font-size: 28px;
+  color: #8c939d;
+  width: 190px;
+  height: 250px;
+  text-align: center;
 }
 
-.marg-item {
-  margin-top: 20px;
+:deep(.avatar-uploader .avatar) {
+  width: 190px;
+  height: 250px;
+  display: block;
+}
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
 }
 </style>
 
 <style scoped>
 .avatar-uploader .avatar {
-  width: 220px;
-  height: 320px;
+  width: 190px;
+  height: 250px;
   display: block;
 }
 </style>
@@ -624,8 +581,8 @@
 .el-icon.avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
-  width: 220px;
-  height: 320px;
+  width: 190px;
+  height: 250px;
   text-align: center;
 }
 </style>
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index ae48f11..042636e 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -4,7 +4,6 @@
 import dayjs from 'dayjs'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import type { technologyJobType } from '../person-interface'
-import certificateAddDialog from './certificateAddDialog.vue'
 import personListDialog from './personListDialog.vue'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
@@ -14,7 +13,8 @@
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
-const ruleFormRef = ref<FormInstance>() // from组件
+const ruleFormRef1 = ref<FormInstance>() // from组件
+const ruleFormRef2 = ref<FormInstance>() // from组件
 const meterStaff = ref({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -28,26 +28,43 @@
   workDate: '', // 从事日期
   id: '',
 })
+const baseInfo = ref({
+  certificateCompany: '',
+  certificateDate: '',
+  certificateName: '',
+  certificateNo: '',
+  validDate: '',
+  id: '',
+  isDel: 0,
+  minioFileName: '',
+  remark: '',
+})
 const ruleForm = ref({
   meterStaff: {}, // 人员信息
   staffId: '', // 计量人员id
 }) // 表单
-const multipleTableRef = ref<InstanceType<typeof ElTable>>()
 const title = ref('')
+const name = ref('')
 // 身份证号码验证规则
-const validateIDcard = (rule: any, value: any, callback: any) => {
-  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
-  if (rr.test(value)) {
-    callback()
-  }
-  else {
-    callback(new Error('验证失败'))
-  }
-}
+// const validateIDcard = (rule: any, value: any, callback: any) => {
+//   const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+//   if (rr.test(value)) {
+//     callback()
+//   }
+//   else {
+//     callback(new Error('验证失败'))
+//   }
+// }
 const rules = ref({
   staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
   // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
-
+}) // 表单验证规则
+const rules2 = ref({
+  certificateCompany: [{ required: true, message: '发证单位不能为空', trigger: 'blur' }],
+  certificateDate: [{ required: true, message: '发证日期不能为空', trigger: 'blur' }],
+  certificateName: [{ required: true, message: '证书名称不能为空', trigger: 'blur' }],
+  certificateNo: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
+  validDate: [{ required: true, message: '有效日期不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
 const userList = ref<userType[]>([]) // 可使用人列表
@@ -96,6 +113,17 @@
   meterStaff.value.major = ''
   meterStaff.value.workDate = ''
   meterStaff.value.id = ''
+  baseInfo.value = {
+    certificateCompany: '',
+    certificateDate: '',
+    certificateName: '',
+    certificateNo: '',
+    validDate: '',
+    id: '',
+    isDel: 0,
+    minioFileName: '',
+    remark: '',
+  }
 }
 const technologyJobList = ref<technologyJobType[]>([])
 // 获取技术职务列表
@@ -120,98 +148,14 @@
 const confirmPerson = (row: any) => {
   ruleForm.value.staffId = row.staffNo
   meterStaff.value = row
-  ruleFormRef.value?.clearValidate('staffNo')
+  ruleFormRef1.value?.clearValidate('staffNo')
 }
-const changeList = ref([
-  {
-    name: '证书基本信息',
-    data: [] as any[],
-    column: [
-      {
-        label: '证书号',
-        data: 'certificateNo',
-        id: 'zs02',
-      },
-      {
-        label: '证书名称',
-        data: 'certificateName',
-        id: 'zs03',
-      },
-      {
-        label: '发证日期',
-        data: 'certificateDate',
-        id: 'zs04',
-      },
-      {
-        label: '发证单位',
-        data: 'certificateCompany',
-        id: 'zs01',
-      },
-      {
-        label: '有效日期',
-        data: 'validDate',
-        id: 'zs05',
-      },
-    ],
-  },
-  {
-    name: '计量工作培训记录',
-    data: [],
-    column: [],
-  },
-  {
-    name: '业务记录',
-    data: [],
-    column: [],
-  },
-])
-const current = ref('证书基本信息')
-const currentShow = computed(() => {
-  return changeList.value.filter(item => item.name === current.value)[0]
-})
-const certificateRef = ref() // 添加证书信息弹窗
-// 添加行
-const addRow = () => {
-  certificateRef.value.initDialog({ title: '添加' })
-}
-// 编辑行
-const editRow = () => {
-  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
-}
-// 证书信息行内添加数据
-const addRowcertificate = (row: any, flag: string) => {
-  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
-  if (flag === 'update') {
-    changeList.value[0].data = [{
-      ...changeList.value[0].data[0],
-      ...row,
-      certificateStatus: diff < 0 ? '1' : '0',
-      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-    }]
-  }
-  else {
-    changeList.value[0].data.push(
-      {
-        ...row,
-        certificateStatus: diff < 0 ? '1' : '0',
-        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-        id: null,
-        isDel: 0,
-        minioFileName: '',
-        remark: '',
-        staffId: meterStaff.value.id,
-        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-      })
-  }
-}
-const currenSelect = ref<number>(-1) // 当前选中行
-// 删除行
-const removeRow = () => {
-  console.log(currenSelect.value)
-  if (currenSelect.value >= 0) {
+// 提交
+const submitForm = async (formEl1: FormInstance | undefined, formEl2: FormInstance | undefined) => {
+  if (!formEl1 || !formEl2) { return }
+  Promise.all([formEl1.validate(), formEl2.validate()]).then((res) => {
     ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
+      '确认提交吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -219,78 +163,49 @@
         type: 'warning',
       },
     ).then(() => {
-      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
-      currenSelect.value = -1
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 提交
-const submitForm = async (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  await formEl.validate((valid, fields) => {
-    if (valid) {
-      ElMessageBox.confirm(
-        '确认提交吗？',
-        '提示',
-        {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        },
-      ).then(() => {
-        let params
-        if (changeList.value[0].data.length) {
-          params = changeList.value[0].data
-        }
-        else {
-          params = [
-            {
-              certificateCompany: '',
-              certificateDate: '',
-              certificateName: '',
-              certificateNo: '',
-              certificateStatus: '',
-              createTime: '',
-              id: null,
-              isDel: 0,
-              minioFileName: '',
-              remark: '',
-              staffId: meterStaff.value.id,
-              updateTime: '',
-              validDate: '',
-            },
-          ]
-        }
-        (title.value === '新建'
-          ? addCertificateList
-          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
-          formEl?.resetFields()
-          ElMessage.success('提交成功')
-          emits('resetData')
-          resetFormData()
-        })
+      (title.value === '新建'
+        ? addCertificateList
+        : getCertificateUpdate)(title.value === '新建'
+        ? [{
+            ...baseInfo.value,
+            staffId: meterStaff.value.id,
+            createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+            updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+            certificateStatus: dayjs(baseInfo.value.validDate).diff(baseInfo.value.certificateDate, 'day') < 0 ? '1' : '0',
+            meterStaff: undefined,
+          }]
+        : {
+            ...baseInfo.value,
+            staffId: meterStaff.value.id,
+            createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+            updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+            certificateStatus: dayjs(baseInfo.value.validDate).diff(baseInfo.value.certificateDate, 'day') < 0 ? '1' : '0',
+            meterStaff: undefined,
+          }).then((res) => {
+        formEl1?.resetFields()
+        formEl2?.resetFields()
+        ElMessage.success('提交成功')
+        emits('resetData')
+        resetFormData()
       })
-    }
+    })
   })
 }
 // 取消
-const resetForm = (formEl: FormInstance | undefined) => {
+const resetForm = (formEl: FormInstance | undefined, formEl2: FormInstance | undefined) => {
   formEl?.resetFields()
-  changeList.value[0].data = []
+  formEl2?.resetFields()
   emits('resetData')
   resetFormData()
 }
+const selectTreeRef = ref()
 // 弹窗初始化
 const initDialog = (row: any) => {
-  changeList.value[0].data = []
   resetFormData()
   dialogVisible.value = true
   title.value = row.title
-  resetFormData()
+  name.value = row.name
+  selectTreeRef.value?.clearSelected()
   getuser()
   getPubList()
   getSexList()
@@ -303,8 +218,9 @@
   else {
     getCertificateDetail({ id: row.id }).then((res) => {
       if (res.code === 200) {
+        console.log(res, '证书记录')
         meterStaff.value = res.data.meterStaff
-        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+        baseInfo.value = res.data
       }
     })
   }
@@ -314,21 +230,16 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          证书记录-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
-            完成
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
-      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+    <detail-page :title=" `${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
+          完成
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef1, ruleFormRef2)">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef1" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="人员编号" prop="staffNo">
@@ -390,7 +301,8 @@
               </el-select>
               <com-tree-select
                 v-else
-                v-model="meterStaff.deptId" :options="PubListTree" placeholder="选择组织机构"
+                ref="selectTreeRef" v-model="meterStaff.deptId" :options="PubListTree"
+                placeholder="选择组织机构"
                 :tree-props="deptProps"
               />
             </el-form-item>
@@ -410,71 +322,52 @@
           </el-col>
         </el-row>
       </el-form>
-      <div class="header" style="margin-top: 10px;">
-        <div class="title">
-          {{ current }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title === '新建'" type="info" @click="removeRow">
-            删除行
-          </el-button>
-          <el-button v-if="title === '新建'" type="primary" @click="addRow">
-            添加行
-          </el-button>
-          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
-            编辑行
-          </el-button>
-        </span>
-      </div>
-      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
-        <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column>
-        <el-table-column type="index" label="序号" width="55" />
-        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
-      </el-table>
-    </div>
-    <!-- 添加证书信息组件 -->
-    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    </detail-page>
+    <detail-block title="证书基本信息">
+      <el-form ref="ruleFormRef2" :model="baseInfo" :rules="rules2" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="证书号" prop="certificateNo">
+              <el-input v-model.trim="baseInfo.certificateNo" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书名称" prop="certificateName">
+              <el-input v-model.trim="baseInfo.certificateName" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证单位" prop="certificateCompany">
+              <el-input v-model.trim="baseInfo.certificateCompany" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发证日期" prop="certificateDate">
+              <el-date-picker
+                v-model="baseInfo.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择发证日期"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书有效日期" prop="validDate">
+              <el-date-picker
+                v-model="baseInfo.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择有效日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block>
     <!-- 选择用户列表组件 -->
     <person-list-dialog ref="personListRef" @add="confirmPerson" />
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    background-color: #fff;
-    border-radius: 8px;
-    padding-top: 10px;
-    margin-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    display: flex;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    position: relative;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 5px;
-    }
-  }
-
   :deep(.el-radio__label) {
     display: none;
   }
@@ -487,40 +380,5 @@
       }
     }
   }
-}
-
-.marg {
-  margin-top: 20px;
-}
 </style>
 
-<style scoped>
-.avatar-uploader .avatar {
-  width: 178px;
-  height: 178px;
-  display: block;
-}
-</style>
-
-<style>
-.avatar-uploader .el-upload {
-  border: 1px dashed var(--el-border-color);
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-  transition: var(--el-transition-duration-fast);
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: var(--el-color-primary);
-}
-
-.el-icon.avatar-uploader-icon {
-  font-size: 28px;
-  color: #8c939d;
-  width: 178px;
-  height: 178px;
-  text-align: center;
-}
-</style>
diff --git a/src/views/measure/person/components/addRecordCancel.vue b/src/views/measure/person/components/addRecordCancel.vue
new file mode 100644
index 0000000..c32ac43
--- /dev/null
+++ b/src/views/measure/person/components/addRecordCancel.vue
@@ -0,0 +1,459 @@
+<!-- 计量人员新增  证书基本信息table表格   作废 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import type { technologyJobType } from '../person-interface'
+import certificateAddDialog from './certificateAddDialog.vue'
+import personListDialog from './personListDialog.vue'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import type { TreeStructure, userType } from '@/views/system/user/user-interface'
+import { getDictByCode } from '@/api/system/dict'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const meterStaff = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  idCard: '', // 身份证号
+  sex: '', // 性别
+  education: '', // 文化程度
+  technologyJob: '', // 技术职务
+  administrationJob: '', // 行政职务
+  deptId: '', // 工作部门
+  major: '', // 专业
+  workDate: '', // 从事日期
+  id: '',
+})
+const ruleForm = ref({
+  meterStaff: {}, // 人员信息
+  staffId: '', // 计量人员id
+}) // 表单
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const title = ref('')
+const name = ref('')
+// 身份证号码验证规则
+const validateIDcard = (rule: any, value: any, callback: any) => {
+  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+  if (rr.test(value)) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+const rules = ref({
+  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
+
+}) // 表单验证规则
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref<TreeStructure[]>([])
+const PubListTree = ref([])
+// 获取组织列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
+  })
+}
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sex').then((response) => {
+    sexList.value = response.data
+  })
+}
+const educationList = ref<technologyJobType[]>([])
+// 获取文化程度列表
+const geteducationList = () => {
+  getDictByCode('education').then((response) => {
+    educationList.value = response.data
+  })
+}
+// 重置表单内容
+const resetFormData = () => {
+  meterStaff.value.staffNo = ''
+  meterStaff.value.name = ''
+  meterStaff.value.idCard = ''
+  meterStaff.value.sex = ''
+  meterStaff.value.education = ''
+  meterStaff.value.technologyJob = ''
+  meterStaff.value.administrationJob = ''
+  meterStaff.value.deptId = ''
+  meterStaff.value.major = ''
+  meterStaff.value.workDate = ''
+  meterStaff.value.id = ''
+}
+const technologyJobList = ref<technologyJobType[]>([])
+// 获取技术职务列表
+const getTechnologyJobList = () => {
+  getDictByCode('technologyJob').then((response) => {
+    technologyJobList.value = response.data
+  })
+}
+const administrationJobList = ref<technologyJobType[]>([])
+// 获取行政职务列表
+const getAdministrationJob = () => {
+  getDictByCode('administrationJob').then((response) => {
+    administrationJobList.value = response.data
+  })
+}
+const personListRef = ref()
+// 选择人员
+const selectPerson = () => {
+  personListRef.value.initDialog()
+}
+// 保存选择人员信息
+const confirmPerson = (row: any) => {
+  ruleForm.value.staffId = row.staffNo
+  meterStaff.value = row
+  ruleFormRef.value?.clearValidate('staffNo')
+}
+const changeList = ref([
+  {
+    name: '证书基本信息',
+    data: [] as any[],
+    column: [
+      {
+        label: '证书号',
+        data: 'certificateNo',
+        id: 'zs02',
+      },
+      {
+        label: '证书名称',
+        data: 'certificateName',
+        id: 'zs03',
+      },
+      {
+        label: '发证日期',
+        data: 'certificateDate',
+        id: 'zs04',
+      },
+      {
+        label: '发证单位',
+        data: 'certificateCompany',
+        id: 'zs01',
+      },
+      {
+        label: '有效日期',
+        data: 'validDate',
+        id: 'zs05',
+      },
+    ],
+  },
+  {
+    name: '计量工作培训记录',
+    data: [],
+    column: [],
+  },
+  {
+    name: '业务记录',
+    data: [],
+    column: [],
+  },
+])
+const current = ref('证书基本信息')
+const currentShow = computed(() => {
+  return changeList.value.filter(item => item.name === current.value)[0]
+})
+const certificateRef = ref() // 添加证书信息弹窗
+// 添加行
+const addRow = () => {
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
+}
+// 证书信息行内添加数据
+const addRowcertificate = (row: any, flag: string) => {
+  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
+  if (flag === 'update') {
+    changeList.value[0].data = [{
+      ...changeList.value[0].data[0],
+      ...row,
+      certificateStatus: diff < 0 ? '1' : '0',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    }]
+  }
+  else {
+    changeList.value[0].data.push(
+      {
+        ...row,
+        certificateStatus: diff < 0 ? '1' : '0',
+        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        id: null,
+        isDel: 0,
+        minioFileName: '',
+        remark: '',
+        staffId: meterStaff.value.id,
+        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
+  }
+}
+const currenSelect = ref<number>(-1) // 当前选中行
+// 删除行
+const removeRow = () => {
+  console.log(currenSelect.value)
+  if (currenSelect.value >= 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
+      currenSelect.value = -1
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        let params
+        if (changeList.value[0].data.length) {
+          params = changeList.value[0].data
+        }
+        else {
+          params = [
+            {
+              certificateCompany: '',
+              certificateDate: '',
+              certificateName: '',
+              certificateNo: '',
+              certificateStatus: '',
+              createTime: '',
+              id: null,
+              isDel: 0,
+              minioFileName: '',
+              remark: '',
+              staffId: meterStaff.value.id,
+              updateTime: '',
+              validDate: '',
+            },
+          ]
+        }
+        (title.value === '新建'
+          ? addCertificateList
+          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
+          formEl?.resetFields()
+          ElMessage.success('提交成功')
+          emits('resetData')
+          resetFormData()
+        })
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  changeList.value[0].data = []
+  emits('resetData')
+  resetFormData()
+}
+const selectTreeRef = ref()
+// 弹窗初始化
+const initDialog = (row: any) => {
+  changeList.value[0].data = []
+  resetFormData()
+  dialogVisible.value = true
+  title.value = row.title
+  name.value = row.name
+  selectTreeRef.value.clearSelected()
+  resetFormData()
+  getuser()
+  getPubList()
+  getSexList()
+  geteducationList()
+  getTechnologyJobList()
+  getAdministrationJob()
+  if (row.title === '新建') {
+    console.log()
+  }
+  else {
+    getCertificateDetail({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        meterStaff.value = res.data.meterStaff
+        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+      }
+    })
+  }
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <detail-page :title=" `${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+          完成
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="人员编号" prop="staffNo">
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="selectPerson">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="meterStaff.name">
+              <el-input v-model.trim="meterStaff.name" placeholder="姓名" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="性别" prop="meterStaff.sex">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="文化程度" prop="meterStaff.education">
+              <el-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="技术职务" prop="meterStaff.technologyJob">
+              <el-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="行政职务" prop="meterStaff.administrationJob">
+              <el-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="工作部门" prop="deptId">
+              <el-select v-if="title === '详情'" v-model="meterStaff.deptId" disabled>
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+              <com-tree-select
+                v-else
+                ref="selectTreeRef" v-model="meterStaff.deptId" :options="PubListTree"
+                placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业" prop="major">
+              <el-input v-model.trim="meterStaff.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="从事日期" prop="workDate">
+              <el-date-picker
+                v-model="meterStaff.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择从事日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block :title="current">
+      <template #btns>
+        <el-button v-if="title === '新建'" type="info" @click="removeRow">
+          删除行
+        </el-button>
+        <el-button v-if="title === '新建'" type="primary" @click="addRow">
+          添加行
+        </el-button>
+        <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+          编辑行
+        </el-button>
+      </template>
+      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
+        <el-table-column width="55" align="center">
+          <template #default="scope">
+            <el-radio-group v-model="currenSelect" class="ml-4">
+              <el-radio :label="scope.$index" />
+            </el-radio-group>
+          </template>
+        </el-table-column>
+        <el-table-column type="index" label="序号" width="55" />
+        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </detail-block>
+    <!-- 添加证书信息组件 -->
+    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    <!-- 选择用户列表组件 -->
+    <person-list-dialog ref="personListRef" @add="confirmPerson" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        display: none;
+      }
+    }
+  }
+</style>
+
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 332c73c..178fc12 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -32,6 +32,7 @@
   form.validDate = ''
 }
 const initDialog = (row: any) => {
+  resetData()
   title.value = row.title
   if (row.title === '编辑') {
     form.certificateNo = row.certificateNo
@@ -50,10 +51,12 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       if (title.value === '编辑') {
-        emits('add', form, 'update')
+        const deptRow = JSON.parse(JSON.stringify(form))
+        emits('add', deptRow, 'update')
       }
       else {
-        emits('add', form, '')
+        const deptRow = JSON.parse(JSON.stringify(form))
+        emits('add', deptRow, '')
       }
       dialogFormVisible.value = false
     }
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 592d810..9c6f65d 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -30,7 +30,7 @@
   { text: '技术职务', value: 'technologyJob', align: 'center', width: '140' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '100' },
   { text: '计量专业', value: 'major', align: 'center', width: '100' },
-  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '180' },
   { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '技术考核', value: 'technologyExam', align: 'center', width: '85' },
 ]) // 表格
@@ -63,7 +63,7 @@
   loadingTable.value = true
   getStaffList(searchQuery).then((res) => {
     if (res.code === 200) {
-      res.data.records = res.data.records.map((item: StaffType) => ({ ...item, sex: item.sex == '1' ? '男' : '女', technologyExam: item.technologyExam == '0' ? '已考核' : '未考核' }))
+      res.data.records = res.data.records.map((item: StaffType) => ({ ...item, sex: item.sex == '1' ? '男' : '女', technologyExam: item.technologyExam == '0' ? '已考核' : '未考核', certificateDate: item.certificateDate.split(' ')[0] }))
       list.value = res.data.records
       total.value = Number(res.data.total)
     }
@@ -236,21 +236,11 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="proxy.hasPerm(`/measure/person/list/import`)" type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" type="primary" @click="templateDownload">
-            模板下载
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/list/add`)" type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/list/export`)" type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" type="primary" @click="print">
-            打印
-          </el-button>
+          <icon-button v-if="proxy.hasPerm(`/measure/person/list/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/list/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/list/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index 17b92d3..e44001a 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -295,15 +295,17 @@
         </el-button>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
-      <el-form-item>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer footer">
         <el-button type="primary" @click="submitForm(ruleFormRef)">
           发布
         </el-button>
         <el-button @click="resetForm(ruleFormRef)">
           关闭
         </el-button>
-      </el-form-item>
-    </el-form>
+      </div>
+    </template>
   </el-dialog>
 </template>
 

diff --git a/src/components.d.ts b/src/components.d.ts
index 6e85584..815d62f 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -16,14 +16,13 @@
     BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default']
     BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
-    Benchcol: typeof import('./components/benchcol/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/DetailPage/index copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
+    DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
diff --git a/src/components/DetailPage/DetailBlockSwitch.vue b/src/components/DetailPage/DetailBlockSwitch.vue
new file mode 100644
index 0000000..4d92074
--- /dev/null
+++ b/src/components/DetailPage/DetailBlockSwitch.vue
@@ -0,0 +1,71 @@
+<script lang="ts" setup name="DetailBlock">
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+})
+
+const slots = useSlots()
+</script>
+
+<template>
+  <div class="detail-main">
+    <div class="header">
+      <div class="menu">
+        <slot name="menu" />
+      </div>
+      <div class="title">
+        {{ title }}
+      </div>
+      <div class="btns">
+        <slot name="btns" />
+      </div>
+    </div>
+    <div v-if="slots.default" class="content">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-main {
+  background-color: #fff;
+  border-radius: 8px;
+  margin-top: 10px;
+  padding-top: 10px;
+
+  .header {
+    position: relative;
+    height: 40px;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+
+    .title {
+      font-weight: 500;
+    }
+
+    .btns {
+      position: absolute;
+      right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+
+    .menu {
+      position: absolute;
+      left: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+
+  .content {
+    background-color: #fff;
+    padding: 0 10px 20px;
+    margin-top: 10px;
+  }
+}
+</style>
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d6c1c91..1644a80 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -314,6 +314,39 @@
       },
     ],
   },
+  {
+    path: '/borrow',
+    component: Layout,
+    redirect: '/device/borrow/borrowapply',
+    name: 'Borrow',
+    meta: {
+      title: '设备领用',
+      icon: 'ep:key',
+      auth: '/device/borrow',
+    },
+    children: [
+      {
+        path: 'borrowapply',
+        name: 'borroWapply',
+        component: () => import('@/views/device/borrow/borrwoApply.vue'),
+        meta: {
+          title: '设备借用申请',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowapply',
+        },
+      },
+      {
+        path: 'borrowhandle',
+        name: 'borrowHandle',
+        component: () => import('@/views/device/borrow/borrowHandle.vue'),
+        meta: {
+          title: '设备借用处理',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowhandle',
+        },
+      },
+    ],
+  },
 
 ]
 
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
new file mode 100644
index 0000000..1c2405e
--- /dev/null
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="borrowHandle">
+// 逻辑代码
+</script>
+
+<template>
+  <app-container>
+    设备借用处理
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
new file mode 100644
index 0000000..03d414b
--- /dev/null
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="borrowApply">
+// 逻辑代码
+</script>
+
+<template>
+  <app-container>
+    设备借用申请
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index c2682fc..5f7b347 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -339,381 +339,374 @@
 
 <template>
   <div class="body-container">
-    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资产编号" prop="assetNo">
-            <el-input v-model.trim="ruleForm.assetNo" placeholder="系统自动生成" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="资产类型" prop="assetType">
-            <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备编号" prop="equipmentNo">
-            <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备名称" prop="equipmentName">
-            <el-input v-model.trim="ruleForm.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="生产厂家" prop="manufacturer">
-            <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="厂家国别" prop="manufacturerCountry">
-            <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="出厂编号" prop="manufacturingNo">
-            <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="出厂年月" prop="manufacturingDate">
-            <el-date-picker
-              v-model="ruleForm.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '出厂年月'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="型号" prop="modelNo">
-            <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="管理状态" prop="managerState">
-            <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="ABC" prop="abc">
-            <el-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'">
-              <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="标签绑定" prop="labelBind">
-            <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === '详情' ? '' : '标签'" :disabled="title === '详情'" clearable>
-              <template #append>
-                <el-button type="primary" size="small">
-                  扫描
-                </el-button>
-              </template>
-            </el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="立卡年月" prop="cardEstablishmentDate">
-            <el-date-picker
-              v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '立卡年月'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="启用日期" prop="enableDate">
-            <el-date-picker
-              v-model="ruleForm.enableDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '启用日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定方式" prop="mesureType">
-            <el-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'">
-              <el-option v-for="item in mesureTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定周期" prop="mesureCycle">
-            <el-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="12">
-          <el-form-item label="测量范围" prop="mesureRange">
-            <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === '详情' ? '' : '测量范围'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="不确定度" prop="uncertainty">
-            <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === '详情' ? '' : '不确定度'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="使用部门" prop="useDept">
-            <com-tree-select
-              v-if="title !== '详情'"
-              v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-              :tree-props="deptProps"
-            />
-            <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
-              <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="使用人" prop="usePerson">
-            <el-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'">
-              <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="专业分类" prop="majorCategory">
-            <el-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'">
-              <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="检定部门" prop="mesureDept">
-            <com-tree-select
-              v-if="title !== '详情'"
-              v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-              :tree-props="deptProps"
-            />
-            <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
-              <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定日期" prop="mesureDate">
-            <el-date-picker
-              v-model="ruleForm.mesureDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '检定日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="有效日期" prop="validDate">
-            <el-date-picker
-              v-model="ruleForm.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '有效日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定结果" prop="mesureResult">
-            <el-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'">
-              <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="8">
-          <el-form-item label="是否是技术指标需要校准/检定的设备" prop="isCalibrationTestEquipment" label-width="260px">
-            <el-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否是测量工装台账" prop="isMeasureAccount" label-width="260px">
-            <el-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否标准配套设备" prop="isStandardSupportEquipment" label-width="260px">
-            <el-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
+    <detail-block-switch title="基本信息">
+      <template #menu>
+        <slot name="menuswitch" />
+      </template>
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资产编号" prop="assetNo">
+              <el-input v-model.trim="ruleForm.assetNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="资产类型" prop="assetType">
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备编号" prop="equipmentNo">
+              <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="生产厂家" prop="manufacturer">
+              <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="厂家国别" prop="manufacturerCountry">
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号" prop="manufacturingNo">
+              <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂年月" prop="manufacturingDate">
+              <el-date-picker
+                v-model="ruleForm.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '出厂年月'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="型号" prop="modelNo">
+              <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="管理状态" prop="managerState">
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="ABC" prop="abc">
+              <el-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'">
+                <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标签绑定" prop="labelBind">
+              <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === '详情' ? '' : '标签'" :disabled="title === '详情'" clearable>
+                <template #append>
+                  <el-button type="primary" size="small">
+                    扫描
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="立卡年月" prop="cardEstablishmentDate">
+              <el-date-picker
+                v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '立卡年月'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="启用日期" prop="enableDate">
+              <el-date-picker
+                v-model="ruleForm.enableDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '启用日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定方式" prop="mesureType">
+              <el-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'">
+                <el-option v-for="item in mesureTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定周期" prop="mesureCycle">
+              <el-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="测量范围" prop="mesureRange">
+              <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === '详情' ? '' : '测量范围'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="不确定度" prop="uncertainty">
+              <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === '详情' ? '' : '不确定度'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="使用部门" prop="useDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
+                :tree-props="deptProps"
+              />
+              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="使用人" prop="usePerson">
+              <el-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'">
+                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="专业分类" prop="majorCategory">
+              <el-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'">
+                <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="检定部门" prop="mesureDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                :tree-props="deptProps"
+              />
+              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定日期" prop="mesureDate">
+              <el-date-picker
+                v-model="ruleForm.mesureDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '检定日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="有效日期" prop="validDate">
+              <el-date-picker
+                v-model="ruleForm.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '有效日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定结果" prop="mesureResult">
+              <el-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'">
+                <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="8">
+            <el-form-item label="是否是技术指标需要校准/检定的设备" prop="isCalibrationTestEquipment" label-width="260px">
+              <el-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否是测量工装台账" prop="isMeasureAccount" label-width="260px">
+              <el-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否标准配套设备" prop="isStandardSupportEquipment" label-width="260px">
+              <el-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资产来源" prop="assetSource">
-            <el-input v-model.trim="ruleForm.assetSource" :placeholder="title === '详情' ? '' : '资产来源'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备规格" prop="equipmentSpecifications">
-            <el-input v-model.trim="ruleForm.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备类别" prop="equipmentCategory">
-            <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
-              <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备类型" prop="equipmentType">
-            <el-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'">
-              <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资本来源" prop="capitalSource">
-            <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
-              <el-option v-for="item in capitalSourceList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="管理级别" prop="managerLevel">
-            <el-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'">
-              <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="用途" prop="purpose">
-            <el-input v-model.trim="ruleForm.purpose" :placeholder="title === '详情' ? '' : '用途'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="技术水平" prop="technicalLevel">
-            <el-input v-model.trim="ruleForm.technicalLevel" :placeholder="title === '详情' ? '' : '技术水平'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="完好状态" prop="intactState">
-            <el-input v-model.trim="ruleForm.intactState" :placeholder="title === '详情' ? '' : '完好状态'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="外形尺寸" prop="overallDimension">
-            <el-input v-model.trim="ruleForm.overallDimension" :placeholder="title === '详情' ? '' : '外形尺寸'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="重量(吨)" prop="weight">
-            <el-input v-model.trim="ruleForm.weight" :placeholder="title === '详情' ? '' : '重量'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="单价" prop="singlePrice">
-            <el-input v-model.trim="ruleForm.singlePrice" :placeholder="title === '详情' ? '' : '单价'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="安装及杂费" prop="installIncidentalExpenses">
-            <el-input v-model.trim="ruleForm.installIncidentalExpenses" :placeholder="title === '详情' ? '' : '安装及杂费'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="安装地点" prop="installPlace">
-            <el-input v-model.trim="ruleForm.installPlace" :placeholder="title === '详情' ? '' : '安装地点'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="原值" prop="originValue">
-            <el-input v-model.trim="ruleForm.originValue" :placeholder="title === '详情' ? '' : '原值'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="目前原值" prop="presentOriginValue">
-            <el-input v-model.trim="ruleForm.presentOriginValue" :placeholder="title === '详情' ? '' : '目前原值'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="折旧年限" prop="depreciationPeriod">
-            <el-input v-model.trim="ruleForm.depreciationPeriod" :placeholder="title === '详情' ? '' : '折旧年限'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="折旧方法" prop="depreciationMethod">
-            <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
-              <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="属性" prop="attribute">
-            <el-input v-model.trim="ruleForm.attribute" placeholder="属性" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="12">
-          <el-form-item label="说明书" prop="minioFileName">
-            <show-photo :minio-file-name="ruleForm.fileList[0]?.minioFileName || ''" />
-            <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
-            <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
-              {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
-            </el-button>
-            <span v-if="title === '详情' && !ruleForm.fileList[0]?.minioFileName">暂无</span>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="24">
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" placeholder="备注" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资产来源" prop="assetSource">
+              <el-input v-model.trim="ruleForm.assetSource" :placeholder="title === '详情' ? '' : '资产来源'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备规格" prop="equipmentSpecifications">
+              <el-input v-model.trim="ruleForm.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备类别" prop="equipmentCategory">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+                <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备类型" prop="equipmentType">
+              <el-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'">
+                <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资本来源" prop="capitalSource">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+                <el-option v-for="item in capitalSourceList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="管理级别" prop="managerLevel">
+              <el-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'">
+                <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="用途" prop="purpose">
+              <el-input v-model.trim="ruleForm.purpose" :placeholder="title === '详情' ? '' : '用途'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="技术水平" prop="technicalLevel">
+              <el-input v-model.trim="ruleForm.technicalLevel" :placeholder="title === '详情' ? '' : '技术水平'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="完好状态" prop="intactState">
+              <el-input v-model.trim="ruleForm.intactState" :placeholder="title === '详情' ? '' : '完好状态'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="外形尺寸" prop="overallDimension">
+              <el-input v-model.trim="ruleForm.overallDimension" :placeholder="title === '详情' ? '' : '外形尺寸'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="重量(吨)" prop="weight">
+              <el-input v-model.trim="ruleForm.weight" :placeholder="title === '详情' ? '' : '重量'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="单价" prop="singlePrice">
+              <el-input v-model.trim="ruleForm.singlePrice" :placeholder="title === '详情' ? '' : '单价'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="安装及杂费" prop="installIncidentalExpenses">
+              <el-input v-model.trim="ruleForm.installIncidentalExpenses" :placeholder="title === '详情' ? '' : '安装及杂费'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="安装地点" prop="installPlace">
+              <el-input v-model.trim="ruleForm.installPlace" :placeholder="title === '详情' ? '' : '安装地点'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="原值" prop="originValue">
+              <el-input v-model.trim="ruleForm.originValue" :placeholder="title === '详情' ? '' : '原值'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="目前原值" prop="presentOriginValue">
+              <el-input v-model.trim="ruleForm.presentOriginValue" :placeholder="title === '详情' ? '' : '目前原值'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="折旧年限" prop="depreciationPeriod">
+              <el-input v-model.trim="ruleForm.depreciationPeriod" :placeholder="title === '详情' ? '' : '折旧年限'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="折旧方法" prop="depreciationMethod">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+                <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="属性" prop="attribute">
+              <el-input v-model.trim="ruleForm.attribute" placeholder="属性" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="说明书" prop="minioFileName">
+              <show-photo :minio-file-name="ruleForm.fileList[0]?.minioFileName || ''" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
+                {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
+              </el-button>
+              <span v-if="title === '详情' && !ruleForm.fileList[0]?.minioFileName">暂无</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" placeholder="备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block-switch>
   </div>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    padding-top: 20px;
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index f46553a..fc3fd54 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -360,20 +360,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          固定资产-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`固定资产-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -763,44 +758,11 @@
           </el-row>
         </div> -->
       </el-form>
-    </div>
+    </detail-page>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index 0abbdb1..6e88e96 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -74,33 +74,29 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ name }} -{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm">
-            关闭
-          </el-button>
-        </span>
-      </div>
-      <div class="body">
-        <!-- 三级菜单 -->
-        <el-radio-group v-model="current">
-          <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
-            {{ item.name }}
-          </el-radio-button>
-        </el-radio-group>
-      </div>
-      <!-- 展示区域 -->
-      <keep-alive>
-        <component :is="currentComp" ref="currentCompRef" :name="current" :title="title" :row="row" />
-      </keep-alive>
-    </div>
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <!-- 展示区域 -->
+    <keep-alive>
+      <component :is="currentComp" ref="currentCompRef" :name="current" :title="title" :row="row">
+        <template #menuswitch>
+          <!-- 三级菜单 -->
+          <el-radio-group v-model="current">
+            <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+              {{ item.name }}
+            </el-radio-button>
+          </el-radio-group>
+        </template>
+      </component>
+    </keep-alive>
   </app-container>
 </template>
 
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f9cdcd0..f653095 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -256,7 +256,7 @@
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
-  // 原生上传图片
+  // 原生上传
   // console.log(event.target.files)
   // if (event.target.files[0].type === 'application/pdf') {
   if (event.target.files?.length !== 0) {
@@ -354,7 +354,7 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" type="primary" @click="identify">
+          <!-- <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" type="primary" @click="identify">
             标签识别
           </el-button>
           <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/import`)" type="primary" @click="batchImport">
@@ -371,7 +371,13 @@
           </el-button>
           <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/print`)" v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/device/standingBook/components/templateTable.vue b/src/views/device/standingBook/components/templateTable.vue
index 8a928f0..7aa563f 100644
--- a/src/views/device/standingBook/components/templateTable.vue
+++ b/src/views/device/standingBook/components/templateTable.vue
@@ -245,11 +245,11 @@
   <div>
     <!-- 添加证书信息组件 -->
     <add-row ref="addRowRef" @add="addRowData" />
-    <div class="header">
-      <div class="title">
-        <!-- {{ $props.name }} -->
-      </div>
-      <span class="btns">
+    <detail-block-switch :title="name">
+      <template #menu>
+        <slot name="menuswitch" />
+      </template>
+      <template #btns>
         <el-button v-if="title !== '详情'" type="info" @click="removeRow">
           删除行
         </el-button>
@@ -259,55 +259,33 @@
         <el-button v-if="title !== '详情'" type="primary" @click="editRow">
           编辑行
         </el-button>
-      </span>
-    </div>
-    <!-- 表格区域 -->
-    <normal-table
-      id="print"
-      :data="list" :total="total" :columns="columns as any"
-      :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-      :list-loading="loadingTable"
-      style="padding-top: 20px;background-color: #fff;"
-      @change="changePage"
-    >
-      <template #preColumns>
-        <el-table-column label="" width="55" align="center">
-          <template #default="scope">
-            <el-radio v-model="select" :label="scope.$index" class="radio" />
-          </template>
-        </el-table-column>
-        <el-table-column label="序号" width="55" align="center">
-          <template #default="scope">
-            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-          </template>
-        </el-table-column>
       </template>
-    </normal-table>
+      <!-- 表格区域 -->
+      <normal-table
+        id="print"
+        :data="list" :total="total" :columns="columns as any"
+        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+        :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </detail-block-switch>
   </div>
 </template>
 
 <style lang="scss" scoped>
-.header {
-  background-color: #fff;
-  // height: 40px;
-  border-radius: 8px;
-  display: flex;
-  align-items: center;
-  flex-direction: column;
-  justify-content: center;
-  position: relative;
-
-  .title {
-    // font-weight: 700;
-  }
-
-  .btns {
-    position: absolute;
-    right: 40px;
-    top: -22px;
-  }
-}
-
 :deep(.el-radio__label) {
   display: none;
 }
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 7538bc8..78a3800 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -272,24 +272,12 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/identify`)" type="primary" @click="identify">
-            标签识别
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/import`)" type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/mould`)" type="primary" @click="templateDownload">
-            模板下载
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/add`)" type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/export`)" type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/print`)" v-print="printObj" type="primary">
-            打印
-          </el-button>
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/identify`)" icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index fc364c8..e74d70e 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -361,20 +361,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ name }} - {{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -458,73 +453,33 @@
           </el-col>
         </el-row>
       </el-form>
-      <div v-if="title !== '新建' ">
-        <div class="header" style="margin-top: 10px;">
-          <div class="title">
-            审批流程
-          </div>
-        </div>
-        <div class="timeline">
-          <el-timeline>
-            <el-timeline-item timestamp="2018/4/12" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/12 20:46</p>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="2018/4/3" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/3 20:46</p>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="2018/4/2" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/2 20:46</p>
-              </el-card>
-            </el-timeline-item>
-          </el-timeline>
-        </div>
-      </div>
-    </div>
+    </detail-page>
+    <detail-block v-if="title !== '新建' " title="审批流程">
+      <el-timeline>
+        <el-timeline-item timestamp="2018/4/12" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/12 20:46</p>
+          </el-card>
+        </el-timeline-item>
+        <el-timeline-item timestamp="2018/4/3" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/3 20:46</p>
+          </el-card>
+        </el-timeline-item>
+        <el-timeline-item timestamp="2018/4/2" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/2 20:46</p>
+          </el-card>
+        </el-timeline-item>
+      </el-timeline>
+    </detail-block>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .timeline {
   background-color: #fff;
 }
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index aa3963f..737568d 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -1,6 +1,6 @@
 <!-- 状态管理公共列表组件 -->
 <script lang="ts" setup>
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessageBox } from 'element-plus'
 import approve from './approvalActionDialog.vue'
 import addDialog from './templateAdd.vue'
 const props = defineProps({
@@ -142,7 +142,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: any) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     title: '详情',
@@ -150,7 +150,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: any) => {
   dialogVisible.value = true
   // addRef.value.initDialog({
   //   title: '编辑',
@@ -158,7 +158,7 @@
   // })
 }
 // 删除
-const remove = (row) => {
+const remove = (row: any) => {
   ElMessageBox.confirm(
     `确认删除${row.equipmentName}吗？`,
     '提示',
@@ -181,20 +181,20 @@
   // })
 }
 // 同意
-const agree = (row) => {
+const agree = (row: any) => {
   console.log(approveRef.value)
   approveRef.value.initDialog({
     radio: '1',
   })
 }
 // 驳回
-const reject = (row) => {
+const reject = (row: any) => {
   approveRef.value.initDialog({
     radio: '3',
   })
 }
 // 拒绝
-const refuse = (row) => {
+const refuse = (row: any) => {
   approveRef.value.initDialog(
     {
       radio: '2',
@@ -202,7 +202,7 @@
   )
 }
 // 取消
-const cancel = (row) => {
+const cancel = (rowrow: any) => {
   ElMessageBox.confirm(
     '确认取消吗？',
     '提示',
@@ -301,20 +301,20 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+          <el-input placeholder="申请编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="设备编号" clearable class="w-50 m-2" />
+          <el-input placeholder="设备编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.modelNo" placeholder="设备名称" clearable class="w-50 m-2" />
+          <el-input placeholder="设备名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请单位" clearable class="w-50 m-2" />
+          <el-input placeholder="申请单位" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.publisher" placeholder="申请状态" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" />
+          <el-select placeholder="申请状态" clearable>
+            <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" /> -->
           </el-select>
         </search-item>
       </search-area>
@@ -328,7 +328,10 @@
           <el-button type="primary" @click="templateDownload">
             模板下载
           </el-button> -->
-          <el-button type="primary" @click="add">
+          <icon-button icon="icon-add" title="新建" @click="add" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+          <!-- <el-button type="primary" @click="add">
             新建
           </el-button>
           <el-button type="primary" @click="exportExcelBtn">
@@ -336,7 +339,7 @@
           </el-button>
           <el-button v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
         </template>
         <!-- 表格区域 -->
         <normal-table
@@ -386,22 +389,3 @@
     </app-container>
   </div>
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 154px !important;
-}
-
-.normal-date {
-  width: 154px !important;
-}
-
-.normal-select {
-  width: 154px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
-
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 0763c5a..9ef0b93 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -19,7 +19,6 @@
 const effectiveStatusName = ref('')
 const title = ref('')
 const fileList = ref<UploadUserFile[]>([])
-console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -80,10 +79,9 @@
   if (row.title === '新建') {
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
-    ruleForm.publisher = ''
+    ruleForm.publisher = userInfo.$state.deptName
     ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 判断有无存储
-    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
     if (sessionStorage.getItem(fileTypeName.value)) {
       const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
       ruleForm.fileType = session.fileType
@@ -117,6 +115,8 @@
     ruleForm.remark = row.remark
     ruleForm.publishTime = row.publishTime
     ruleForm.minioFileName = row.minioFileName
+    // ruleForm.publisher = '0'
+    // ruleForm.createUserId = '1'
   }
 }
 defineExpose({ initDialog })
@@ -148,6 +148,9 @@
       type: 'warning',
     },
       ).then((res) => {
+        if (ruleForm.publisher === userInfo.$state.deptName) {
+          ruleForm.publisher === userInfo.$state.deptId
+        }
         if (flag == '提交') {
           addApi(ruleForm).then((res) => {
             if (res.code == 200) {
@@ -193,7 +196,6 @@
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        console.log(res.data[0])
         ruleForm.minioFileName = res.data[0]
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
@@ -216,7 +218,6 @@
 // ])
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
-  console.log(diffDat)
   if (diffDat < 0) {
     // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '在使用'
@@ -237,7 +238,7 @@
 
 <template>
   <app-container v-if="dialogVisible" style="overflow: hidden;">
-    <detail-page :title="`${title}${fileTypeName}`">
+    <detail-page :title="`${fileTypeName}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
           提交
@@ -278,12 +279,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="发布单位" prop="publisher">
-              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'" class="fill-input">
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled>
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
               <com-tree-select
                 v-else
-                v-model="ruleForm.publisher" :options="PubListTree" placeholder="选择组织机构"
+                v-model="ruleForm.publisher" :options="PubListTree" placeholder="请选择发布单位"
                 :tree-props="deptProps"
               />
             </el-form-item>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 44e3e4d..b45fbc3 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -324,22 +324,9 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <!-- <el-button type="primary" @click="batchImport">
-            批量导入
-          </el-button> -->
-          <!-- <el-button type="primary" @click="templateDownload">
-            模板下载
-          </el-button> -->
-          <!-- <el-button type="primary" @click="add">
-            新建
-          </el-button> -->
-          <el-button type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-print="printObj" type="primary">
-            打印
-          </el-button>
+          <!-- <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange"> -->
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 4677e48..7d4724b 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -204,13 +204,9 @@
     loading.close()
   })
 }
-// 打印
-const print = () => {
-
-}
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
-  // 原生上传图片
+  // 原生上传
   // console.log(event.target.files)
   // if (event.target.files[0].type === 'application/pdf') {
   if (event.target.files?.length !== 0) {
@@ -264,7 +260,7 @@
         <search-item>
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
-        <search-item>
+        <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
@@ -273,13 +269,13 @@
               :value="item.value"
             />
           </el-select>
-        </search-item>
+        </search-item> -->
         <search-item>
           <el-date-picker
             v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 155px;"
+            style="width: 185px;"
           />
         </search-item>
         <search-item>
@@ -287,19 +283,19 @@
             v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 155px;"
+            style="width: 185px;"
           />
         </search-item>
         <search-item>
-          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select> -->
-          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
+          </el-select>
+          <!-- <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" /> -->
         </search-item>
       </search-area>
       <table-container>
@@ -310,7 +306,7 @@
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
-          <icon-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" @click="print" />
+          <icon-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index cf0dd4f..5ca3275 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -3,11 +3,11 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { detailType } from '../measureDept-interface'
-import { getUserList } from '@/api/system/user'
+// import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
+import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import type { userType } from '@/views/system/user/user-interface'
 import { listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
-import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
 const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -31,11 +31,20 @@
   technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
+// 获取计量人员列表
 const getuser = () => {
-  getUserList({ offset: 1, limit: 99999 }).then((res) => {
-    userList.value = res.data.rows
+  getStaffList({
+    staffNo: '', // 人员编号
+    name: '', // 姓名
+    deptId: ruleForm.value.deptId, // 所在部门
+    limit: 999999,
+    offset: 1,
+  }).then((res) => {
+    if (res.code === 200) {
+      userList.value = res.data.records
+    }
   })
-} // 获取用户列表
+}
 const technologyJobList = ref<{ id: string;name: string;value: string }[]>([])
 // 获取技术职务列表
 const getTechnologyJobList = () => {
@@ -50,7 +59,16 @@
     administrationJobList.value = response.data
   })
 }
-
+// 选择负责人自动填充职务信息
+const directorChange = (val: string) => {
+  const selectUser = userList.value.filter(item => item.name === val)[0]
+  getStaffDetail(selectUser).then((res) => {
+    if (res.code === 200) {
+      ruleForm.value.administrationJob = res.data.administrationJob
+      ruleForm.value.technologyJob = res.data.technologyJob
+    }
+  })
+}
 // 提交
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
@@ -95,12 +113,6 @@
 const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
-// const searchQuery = ref({
-//   limit: 10,
-//   offset: 1,
-//   total: 0,
-//   pageSizes: [10, 20, 30],
-// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -410,20 +422,6 @@
     }
   })
 }
-// const handleSizeChange = (val: number) => {
-//   searchQuery.value.limit = val
-//   getDepartmentList()
-//   getuserInfoList()
-//   getInstrumentInfo()
-//   getDeviceInfo()
-// }
-// const handleCurrentChange = (val: number) => {
-//   searchQuery.value.offset = val
-//   getDepartmentList()
-//   getuserInfoList()
-//   getInstrumentInfo()
-//   getDeviceInfo()
-// }
 // 弹窗初始化
 const initDialog = (row: any) => {
   reset()
@@ -460,22 +458,17 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title.split('-')[2] === '编辑'" type="primary" @click="submitForm(ruleFormRef)">
-            提交
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="title">
+      <template #btns>
+        <el-button v-if="title.split('-')[2] === '编辑'" type="primary" @click="submitForm(ruleFormRef)">
+          提交
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title.split('-')[2] === '详情' ? 'isDetail' : '']">
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item :label=" `${title.split('-')[1]}编号`" prop="organizeNo">
               <el-input v-model.trim="ruleForm.organizeNo" placeholder="系统自动生成" disabled />
@@ -487,7 +480,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="title.split('-')[1] === '工程组'" :gutter="24" class="marg">
+        <el-row v-if="title.split('-')[1] === '工程组'" :gutter="24">
           <el-col :span="6">
             <el-form-item label="科室编号">
               <el-input v-model.trim="ruleForm.pDeptId" disabled />
@@ -509,10 +502,10 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
-              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" @change="directorChange">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.name" />
               </el-select>
             </el-form-item>
@@ -532,7 +525,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="24">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
               <el-input v-model.trim="ruleForm.remark" :placeholder="title.split('-')[2] === '详情' ? '' : '备注'" :disabled="title.split('-')[2] === '详情'" />
@@ -540,85 +533,24 @@
           </el-col>
         </el-row>
       </el-form>
-      <!-- 科室信息-人员信息等列表切换 -->
-      <div>
-        <div class="header" style="margin-top: 10px;">
-          <!-- 切换 -->
-          <el-radio-group v-model="current" class="change-btn">
-            <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
-              {{ item.name }}
-            </el-radio-button>
-          </el-radio-group>
-          <div class="title">
-            {{ current }}
-          </div>
-          <span class="btns">
-          <!-- <el-button type="info" :disabled="title === '详情'" @click="removeRow">
-            删除行
-          </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
-            添加行
-          </el-button> -->
-          </span>
-        </div>
-        <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <el-table-column type="index" label="序号" width="55" align="center" />
-          <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
-        </el-table>
-        <!-- <div style="width: 100%;margin-top: 10px;">
-          <el-pagination
-            :current-page="searchQuery.offset"
-            :page-sizes="searchQuery.pageSizes"
-            :page-size="searchQuery.limit"
-            :total="searchQuery.total"
-            layout="total, sizes, prev, pager, next"
-            hide-on-single-page
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-          />
-        </div> -->
-      </div>
-    </div>
+    </detail-page>
+    <detail-block-switch :title="current">
+      <template #menu>
+        <el-radio-group v-model="current" class="change-btn">
+          <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
+            {{ item.name }}
+          </el-radio-button>
+        </el-radio-group>
+      </template>
+      <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
+        <el-table-column type="index" label="序号" width="55" align="center" />
+        <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </detail-block-switch>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-    position: relative;
-
-    .change-btn {
-      position: absolute;
-      left: 40px;
-      top: 4px;
-    }
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 4px;
-    }
-  }
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
@@ -628,8 +560,4 @@
     }
   }
 }
-
-.marg {
-  margin-top: 10px;
-}
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 9ad87af..aac1ef2 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -231,12 +231,14 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
+          <!-- <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
           <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
+          <icon-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 2e3322a..3f472eb 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -41,7 +41,7 @@
   { text: '证书号', value: 'certificateNo', align: 'center' },
   { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
   { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'validDate', align: 'center', width: '200' },
   { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
 ]) // 表格
 const certificateStatusList = ref([
@@ -90,7 +90,7 @@
   loadingTable.value = true
   getCertificateList(searchQuery).then((res) => {
     if (res.code === 200) {
-      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效' }))
+      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效', validDate: item.validDate.split(' ')[0], certificateDate: item.certificateDate.split(' ')[0] }))
       list.value = res.data.records
       total.value = Number(res.data.total)
     }
@@ -115,6 +115,7 @@
   addRef.value.initDialog({
     ...row,
     title: '详情',
+    name: props.isRemind ? '证书状况' : '证书记录',
   })
 }
 // 编辑
@@ -123,6 +124,7 @@
   addRef.value.initDialog({
     ...row,
     title: '编辑',
+    name: props.isRemind ? '证书状况' : '证书记录',
   })
 }
 
@@ -193,6 +195,7 @@
   dialogVisible.value = true
   addRef.value.initDialog({
     title: '新建',
+    name: props.isRemind ? '证书状况' : '证书记录',
   })
 }
 // 导出
@@ -292,21 +295,11 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
-            模板下载
-          </el-button>
-          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
-            打印
-          </el-button>
+          <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
@@ -325,7 +318,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column fixed="right" label="操作" align="center" width="150">
+            <el-table-column fixed="right" label="操作" align="center" width="180">
               <template #default="{ row }">
                 <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
                   提醒
@@ -336,7 +329,7 @@
                 <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 4dc1b17..4352604 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -69,7 +69,16 @@
     const IdCard = ruleForm.value.idCard
     const birthday = `${IdCard.substring(6, 10)}-${IdCard.substring(10, 12)}`
     ruleForm.value.birthday = birthday
-    console.log(ruleForm.value)
+    // 获取性别 第17位  奇数为男 偶数为女
+    // ruleForm.value.sex
+    if (Number(IdCard.substring(16, 17)) % 2) {
+      // 男
+      ruleForm.value.sex = '1'
+    }
+    else {
+      //  女
+      ruleForm.value.sex = '2'
+    }
   })
 }
 const dialogVisible = ref<boolean>(false) // 弹窗显示
@@ -130,7 +139,6 @@
     technologyExam: '', // 技术考核
     remark: '', // 备注
     certificateList: [], // 证书列表
-
   }
 }
 const technologyJobList = ref<technologyJobType[]>([])
@@ -309,7 +317,7 @@
           }
           (title.value === '新建'
             ? getStaffAdd
-            : getStaffupdate) ({ ...ruleForm.value, certificateList: changeList.value[0].data }).then((res) => {
+            : getStaffupdate) ({ ...ruleForm.value, certificateList: changeList.value[0].data, birthday: `${ruleForm.value.idCard.substring(6, 10)}-${ruleForm.value.idCard.substring(10, 12)}-${ruleForm.value.idCard.substring(12, 14)}` }).then((res) => {
             if (res.code == 200) {
               formEl?.resetFields()
               ElMessage.success('提交成功')
@@ -332,12 +340,14 @@
   emits('resetData')
   resetFormData()
 }
+const selectTreeRef = ref()
 // 弹窗初始化
 const initDialog = (row: any) => {
   changeList.value[0].data = []
   dialogVisible.value = true
   title.value = row.title
   resetFormData()
+  selectTreeRef.value?.clearSelected()
   getuser()
   getPubList()
   getSexList()
@@ -370,20 +380,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          计量人员-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
-            完成
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`计量人员-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+          完成
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
         <el-row :gutter="24" class="marg">
           <el-col :span="5">
@@ -394,6 +399,7 @@
                 :http-request="uploadQuarterlyEvaluateFile"
                 :before-upload="beforeAvatarUpload"
                 :disabled="title === '详情'"
+                accept="image/png, image/jpeg,image/jpg"
               >
                 <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
                 <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
@@ -425,8 +431,8 @@
               </el-select>
               <com-tree-select
                 v-else
-                v-model="ruleForm.deptId" :options="PubListTree" placeholder="选择组织机构"
-                :tree-props="deptProps"
+                ref="selectTreeRef" v-model="ruleForm.deptId" :options="PubListTree"
+                placeholder="选择组织机构" :tree-props="deptProps"
               />
             </el-form-item>
             <el-form-item label="计量专业" prop="major" class="marg-item">
@@ -489,29 +495,19 @@
           </el-col>
         </el-row>
       </el-form>
-      <!-- 证书基本信息 -->
-      <!-- 切换 -->
-      <!-- <el-radio-group v-model="current" style="margin-bottom: -15px;">
-          <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
-            {{ item.name }}
-          </el-radio-button>
-        </el-radio-group> -->
-      <div class="header" style="margin-top: 10px;">
-        <div class="title">
-          {{ current }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="info" @click="removeRow">
-            删除行
-          </el-button>
-          <el-button v-if="title !== '详情'" type="primary" @click="addRow">
-            添加行
-          </el-button>
-          <el-button v-if="title !== '详情'" type="primary" @click="editRow">
-            编辑行
-          </el-button>
-        </span>
-      </div>
+    </detail-page>
+    <detail-block :title="current">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="info" @click="removeRow">
+          删除行
+        </el-button>
+        <el-button v-if="title !== '详情'" type="primary" @click="addRow">
+          添加行
+        </el-button>
+        <el-button v-if="title !== '详情'" type="primary" @click="editRow">
+          编辑行
+        </el-button>
+      </template>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
         <el-table-column width="55" align="center">
           <template #default="scope">
@@ -523,7 +519,7 @@
         <el-table-column type="index" label="序号" width="55" />
         <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
       </el-table>
-    </div>
+    </detail-block>
     <!-- 添加证书信息组件 -->
     <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
     <!-- 选择用户列表组件 -->
@@ -532,77 +528,38 @@
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    background-color: #fff;
-    border-radius: 8px;
-    padding-top: 10px;
-    margin-top: 10px;
-    padding-right: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    display: flex;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    position: relative;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 5px;
-    }
-  }
-
-  :deep(.el-radio__label) {
-    display: none;
-  }
-
-  :deep(.el-icon.avatar-uploader-icon) {
-    font-size: 28px;
-    color: #8c939d;
-    width: 190px;
-    height: 250px;
-    text-align: center;
-  }
-
-  :deep(.avatar-uploader .avatar) {
-    width: 190px;
-    height: 250px;
-    display: block;
-  }
-
-  .isDetail {
-    ::v-deep {
-      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-        display: none;
-      }
-    }
-  }
+:deep(.el-radio__label) {
+  display: none;
 }
 
-.marg {
-  margin-top: 20px;
+:deep(.el-icon.avatar-uploader-icon) {
+  font-size: 28px;
+  color: #8c939d;
+  width: 190px;
+  height: 250px;
+  text-align: center;
 }
 
-.marg-item {
-  margin-top: 20px;
+:deep(.avatar-uploader .avatar) {
+  width: 190px;
+  height: 250px;
+  display: block;
+}
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
 }
 </style>
 
 <style scoped>
 .avatar-uploader .avatar {
-  width: 220px;
-  height: 320px;
+  width: 190px;
+  height: 250px;
   display: block;
 }
 </style>
@@ -624,8 +581,8 @@
 .el-icon.avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
-  width: 220px;
-  height: 320px;
+  width: 190px;
+  height: 250px;
   text-align: center;
 }
 </style>
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index ae48f11..042636e 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -4,7 +4,6 @@
 import dayjs from 'dayjs'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import type { technologyJobType } from '../person-interface'
-import certificateAddDialog from './certificateAddDialog.vue'
 import personListDialog from './personListDialog.vue'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
@@ -14,7 +13,8 @@
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
-const ruleFormRef = ref<FormInstance>() // from组件
+const ruleFormRef1 = ref<FormInstance>() // from组件
+const ruleFormRef2 = ref<FormInstance>() // from组件
 const meterStaff = ref({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -28,26 +28,43 @@
   workDate: '', // 从事日期
   id: '',
 })
+const baseInfo = ref({
+  certificateCompany: '',
+  certificateDate: '',
+  certificateName: '',
+  certificateNo: '',
+  validDate: '',
+  id: '',
+  isDel: 0,
+  minioFileName: '',
+  remark: '',
+})
 const ruleForm = ref({
   meterStaff: {}, // 人员信息
   staffId: '', // 计量人员id
 }) // 表单
-const multipleTableRef = ref<InstanceType<typeof ElTable>>()
 const title = ref('')
+const name = ref('')
 // 身份证号码验证规则
-const validateIDcard = (rule: any, value: any, callback: any) => {
-  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
-  if (rr.test(value)) {
-    callback()
-  }
-  else {
-    callback(new Error('验证失败'))
-  }
-}
+// const validateIDcard = (rule: any, value: any, callback: any) => {
+//   const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+//   if (rr.test(value)) {
+//     callback()
+//   }
+//   else {
+//     callback(new Error('验证失败'))
+//   }
+// }
 const rules = ref({
   staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
   // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
-
+}) // 表单验证规则
+const rules2 = ref({
+  certificateCompany: [{ required: true, message: '发证单位不能为空', trigger: 'blur' }],
+  certificateDate: [{ required: true, message: '发证日期不能为空', trigger: 'blur' }],
+  certificateName: [{ required: true, message: '证书名称不能为空', trigger: 'blur' }],
+  certificateNo: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
+  validDate: [{ required: true, message: '有效日期不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
 const userList = ref<userType[]>([]) // 可使用人列表
@@ -96,6 +113,17 @@
   meterStaff.value.major = ''
   meterStaff.value.workDate = ''
   meterStaff.value.id = ''
+  baseInfo.value = {
+    certificateCompany: '',
+    certificateDate: '',
+    certificateName: '',
+    certificateNo: '',
+    validDate: '',
+    id: '',
+    isDel: 0,
+    minioFileName: '',
+    remark: '',
+  }
 }
 const technologyJobList = ref<technologyJobType[]>([])
 // 获取技术职务列表
@@ -120,98 +148,14 @@
 const confirmPerson = (row: any) => {
   ruleForm.value.staffId = row.staffNo
   meterStaff.value = row
-  ruleFormRef.value?.clearValidate('staffNo')
+  ruleFormRef1.value?.clearValidate('staffNo')
 }
-const changeList = ref([
-  {
-    name: '证书基本信息',
-    data: [] as any[],
-    column: [
-      {
-        label: '证书号',
-        data: 'certificateNo',
-        id: 'zs02',
-      },
-      {
-        label: '证书名称',
-        data: 'certificateName',
-        id: 'zs03',
-      },
-      {
-        label: '发证日期',
-        data: 'certificateDate',
-        id: 'zs04',
-      },
-      {
-        label: '发证单位',
-        data: 'certificateCompany',
-        id: 'zs01',
-      },
-      {
-        label: '有效日期',
-        data: 'validDate',
-        id: 'zs05',
-      },
-    ],
-  },
-  {
-    name: '计量工作培训记录',
-    data: [],
-    column: [],
-  },
-  {
-    name: '业务记录',
-    data: [],
-    column: [],
-  },
-])
-const current = ref('证书基本信息')
-const currentShow = computed(() => {
-  return changeList.value.filter(item => item.name === current.value)[0]
-})
-const certificateRef = ref() // 添加证书信息弹窗
-// 添加行
-const addRow = () => {
-  certificateRef.value.initDialog({ title: '添加' })
-}
-// 编辑行
-const editRow = () => {
-  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
-}
-// 证书信息行内添加数据
-const addRowcertificate = (row: any, flag: string) => {
-  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
-  if (flag === 'update') {
-    changeList.value[0].data = [{
-      ...changeList.value[0].data[0],
-      ...row,
-      certificateStatus: diff < 0 ? '1' : '0',
-      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-    }]
-  }
-  else {
-    changeList.value[0].data.push(
-      {
-        ...row,
-        certificateStatus: diff < 0 ? '1' : '0',
-        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-        id: null,
-        isDel: 0,
-        minioFileName: '',
-        remark: '',
-        staffId: meterStaff.value.id,
-        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-      })
-  }
-}
-const currenSelect = ref<number>(-1) // 当前选中行
-// 删除行
-const removeRow = () => {
-  console.log(currenSelect.value)
-  if (currenSelect.value >= 0) {
+// 提交
+const submitForm = async (formEl1: FormInstance | undefined, formEl2: FormInstance | undefined) => {
+  if (!formEl1 || !formEl2) { return }
+  Promise.all([formEl1.validate(), formEl2.validate()]).then((res) => {
     ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
+      '确认提交吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -219,78 +163,49 @@
         type: 'warning',
       },
     ).then(() => {
-      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
-      currenSelect.value = -1
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 提交
-const submitForm = async (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  await formEl.validate((valid, fields) => {
-    if (valid) {
-      ElMessageBox.confirm(
-        '确认提交吗？',
-        '提示',
-        {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        },
-      ).then(() => {
-        let params
-        if (changeList.value[0].data.length) {
-          params = changeList.value[0].data
-        }
-        else {
-          params = [
-            {
-              certificateCompany: '',
-              certificateDate: '',
-              certificateName: '',
-              certificateNo: '',
-              certificateStatus: '',
-              createTime: '',
-              id: null,
-              isDel: 0,
-              minioFileName: '',
-              remark: '',
-              staffId: meterStaff.value.id,
-              updateTime: '',
-              validDate: '',
-            },
-          ]
-        }
-        (title.value === '新建'
-          ? addCertificateList
-          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
-          formEl?.resetFields()
-          ElMessage.success('提交成功')
-          emits('resetData')
-          resetFormData()
-        })
+      (title.value === '新建'
+        ? addCertificateList
+        : getCertificateUpdate)(title.value === '新建'
+        ? [{
+            ...baseInfo.value,
+            staffId: meterStaff.value.id,
+            createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+            updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+            certificateStatus: dayjs(baseInfo.value.validDate).diff(baseInfo.value.certificateDate, 'day') < 0 ? '1' : '0',
+            meterStaff: undefined,
+          }]
+        : {
+            ...baseInfo.value,
+            staffId: meterStaff.value.id,
+            createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+            updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+            certificateStatus: dayjs(baseInfo.value.validDate).diff(baseInfo.value.certificateDate, 'day') < 0 ? '1' : '0',
+            meterStaff: undefined,
+          }).then((res) => {
+        formEl1?.resetFields()
+        formEl2?.resetFields()
+        ElMessage.success('提交成功')
+        emits('resetData')
+        resetFormData()
       })
-    }
+    })
   })
 }
 // 取消
-const resetForm = (formEl: FormInstance | undefined) => {
+const resetForm = (formEl: FormInstance | undefined, formEl2: FormInstance | undefined) => {
   formEl?.resetFields()
-  changeList.value[0].data = []
+  formEl2?.resetFields()
   emits('resetData')
   resetFormData()
 }
+const selectTreeRef = ref()
 // 弹窗初始化
 const initDialog = (row: any) => {
-  changeList.value[0].data = []
   resetFormData()
   dialogVisible.value = true
   title.value = row.title
-  resetFormData()
+  name.value = row.name
+  selectTreeRef.value?.clearSelected()
   getuser()
   getPubList()
   getSexList()
@@ -303,8 +218,9 @@
   else {
     getCertificateDetail({ id: row.id }).then((res) => {
       if (res.code === 200) {
+        console.log(res, '证书记录')
         meterStaff.value = res.data.meterStaff
-        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+        baseInfo.value = res.data
       }
     })
   }
@@ -314,21 +230,16 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          证书记录-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
-            完成
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
-      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+    <detail-page :title=" `${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
+          完成
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef1, ruleFormRef2)">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef1" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="人员编号" prop="staffNo">
@@ -390,7 +301,8 @@
               </el-select>
               <com-tree-select
                 v-else
-                v-model="meterStaff.deptId" :options="PubListTree" placeholder="选择组织机构"
+                ref="selectTreeRef" v-model="meterStaff.deptId" :options="PubListTree"
+                placeholder="选择组织机构"
                 :tree-props="deptProps"
               />
             </el-form-item>
@@ -410,71 +322,52 @@
           </el-col>
         </el-row>
       </el-form>
-      <div class="header" style="margin-top: 10px;">
-        <div class="title">
-          {{ current }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title === '新建'" type="info" @click="removeRow">
-            删除行
-          </el-button>
-          <el-button v-if="title === '新建'" type="primary" @click="addRow">
-            添加行
-          </el-button>
-          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
-            编辑行
-          </el-button>
-        </span>
-      </div>
-      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
-        <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column>
-        <el-table-column type="index" label="序号" width="55" />
-        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
-      </el-table>
-    </div>
-    <!-- 添加证书信息组件 -->
-    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    </detail-page>
+    <detail-block title="证书基本信息">
+      <el-form ref="ruleFormRef2" :model="baseInfo" :rules="rules2" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="证书号" prop="certificateNo">
+              <el-input v-model.trim="baseInfo.certificateNo" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书名称" prop="certificateName">
+              <el-input v-model.trim="baseInfo.certificateName" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证单位" prop="certificateCompany">
+              <el-input v-model.trim="baseInfo.certificateCompany" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发证日期" prop="certificateDate">
+              <el-date-picker
+                v-model="baseInfo.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择发证日期"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书有效日期" prop="validDate">
+              <el-date-picker
+                v-model="baseInfo.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择有效日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block>
     <!-- 选择用户列表组件 -->
     <person-list-dialog ref="personListRef" @add="confirmPerson" />
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    background-color: #fff;
-    border-radius: 8px;
-    padding-top: 10px;
-    margin-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    display: flex;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    position: relative;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 5px;
-    }
-  }
-
   :deep(.el-radio__label) {
     display: none;
   }
@@ -487,40 +380,5 @@
       }
     }
   }
-}
-
-.marg {
-  margin-top: 20px;
-}
 </style>
 
-<style scoped>
-.avatar-uploader .avatar {
-  width: 178px;
-  height: 178px;
-  display: block;
-}
-</style>
-
-<style>
-.avatar-uploader .el-upload {
-  border: 1px dashed var(--el-border-color);
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-  transition: var(--el-transition-duration-fast);
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: var(--el-color-primary);
-}
-
-.el-icon.avatar-uploader-icon {
-  font-size: 28px;
-  color: #8c939d;
-  width: 178px;
-  height: 178px;
-  text-align: center;
-}
-</style>
diff --git a/src/views/measure/person/components/addRecordCancel.vue b/src/views/measure/person/components/addRecordCancel.vue
new file mode 100644
index 0000000..c32ac43
--- /dev/null
+++ b/src/views/measure/person/components/addRecordCancel.vue
@@ -0,0 +1,459 @@
+<!-- 计量人员新增  证书基本信息table表格   作废 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import type { technologyJobType } from '../person-interface'
+import certificateAddDialog from './certificateAddDialog.vue'
+import personListDialog from './personListDialog.vue'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import type { TreeStructure, userType } from '@/views/system/user/user-interface'
+import { getDictByCode } from '@/api/system/dict'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const meterStaff = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  idCard: '', // 身份证号
+  sex: '', // 性别
+  education: '', // 文化程度
+  technologyJob: '', // 技术职务
+  administrationJob: '', // 行政职务
+  deptId: '', // 工作部门
+  major: '', // 专业
+  workDate: '', // 从事日期
+  id: '',
+})
+const ruleForm = ref({
+  meterStaff: {}, // 人员信息
+  staffId: '', // 计量人员id
+}) // 表单
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const title = ref('')
+const name = ref('')
+// 身份证号码验证规则
+const validateIDcard = (rule: any, value: any, callback: any) => {
+  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+  if (rr.test(value)) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+const rules = ref({
+  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
+
+}) // 表单验证规则
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref<TreeStructure[]>([])
+const PubListTree = ref([])
+// 获取组织列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
+  })
+}
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sex').then((response) => {
+    sexList.value = response.data
+  })
+}
+const educationList = ref<technologyJobType[]>([])
+// 获取文化程度列表
+const geteducationList = () => {
+  getDictByCode('education').then((response) => {
+    educationList.value = response.data
+  })
+}
+// 重置表单内容
+const resetFormData = () => {
+  meterStaff.value.staffNo = ''
+  meterStaff.value.name = ''
+  meterStaff.value.idCard = ''
+  meterStaff.value.sex = ''
+  meterStaff.value.education = ''
+  meterStaff.value.technologyJob = ''
+  meterStaff.value.administrationJob = ''
+  meterStaff.value.deptId = ''
+  meterStaff.value.major = ''
+  meterStaff.value.workDate = ''
+  meterStaff.value.id = ''
+}
+const technologyJobList = ref<technologyJobType[]>([])
+// 获取技术职务列表
+const getTechnologyJobList = () => {
+  getDictByCode('technologyJob').then((response) => {
+    technologyJobList.value = response.data
+  })
+}
+const administrationJobList = ref<technologyJobType[]>([])
+// 获取行政职务列表
+const getAdministrationJob = () => {
+  getDictByCode('administrationJob').then((response) => {
+    administrationJobList.value = response.data
+  })
+}
+const personListRef = ref()
+// 选择人员
+const selectPerson = () => {
+  personListRef.value.initDialog()
+}
+// 保存选择人员信息
+const confirmPerson = (row: any) => {
+  ruleForm.value.staffId = row.staffNo
+  meterStaff.value = row
+  ruleFormRef.value?.clearValidate('staffNo')
+}
+const changeList = ref([
+  {
+    name: '证书基本信息',
+    data: [] as any[],
+    column: [
+      {
+        label: '证书号',
+        data: 'certificateNo',
+        id: 'zs02',
+      },
+      {
+        label: '证书名称',
+        data: 'certificateName',
+        id: 'zs03',
+      },
+      {
+        label: '发证日期',
+        data: 'certificateDate',
+        id: 'zs04',
+      },
+      {
+        label: '发证单位',
+        data: 'certificateCompany',
+        id: 'zs01',
+      },
+      {
+        label: '有效日期',
+        data: 'validDate',
+        id: 'zs05',
+      },
+    ],
+  },
+  {
+    name: '计量工作培训记录',
+    data: [],
+    column: [],
+  },
+  {
+    name: '业务记录',
+    data: [],
+    column: [],
+  },
+])
+const current = ref('证书基本信息')
+const currentShow = computed(() => {
+  return changeList.value.filter(item => item.name === current.value)[0]
+})
+const certificateRef = ref() // 添加证书信息弹窗
+// 添加行
+const addRow = () => {
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
+}
+// 证书信息行内添加数据
+const addRowcertificate = (row: any, flag: string) => {
+  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
+  if (flag === 'update') {
+    changeList.value[0].data = [{
+      ...changeList.value[0].data[0],
+      ...row,
+      certificateStatus: diff < 0 ? '1' : '0',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    }]
+  }
+  else {
+    changeList.value[0].data.push(
+      {
+        ...row,
+        certificateStatus: diff < 0 ? '1' : '0',
+        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        id: null,
+        isDel: 0,
+        minioFileName: '',
+        remark: '',
+        staffId: meterStaff.value.id,
+        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
+  }
+}
+const currenSelect = ref<number>(-1) // 当前选中行
+// 删除行
+const removeRow = () => {
+  console.log(currenSelect.value)
+  if (currenSelect.value >= 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
+      currenSelect.value = -1
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        let params
+        if (changeList.value[0].data.length) {
+          params = changeList.value[0].data
+        }
+        else {
+          params = [
+            {
+              certificateCompany: '',
+              certificateDate: '',
+              certificateName: '',
+              certificateNo: '',
+              certificateStatus: '',
+              createTime: '',
+              id: null,
+              isDel: 0,
+              minioFileName: '',
+              remark: '',
+              staffId: meterStaff.value.id,
+              updateTime: '',
+              validDate: '',
+            },
+          ]
+        }
+        (title.value === '新建'
+          ? addCertificateList
+          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
+          formEl?.resetFields()
+          ElMessage.success('提交成功')
+          emits('resetData')
+          resetFormData()
+        })
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  changeList.value[0].data = []
+  emits('resetData')
+  resetFormData()
+}
+const selectTreeRef = ref()
+// 弹窗初始化
+const initDialog = (row: any) => {
+  changeList.value[0].data = []
+  resetFormData()
+  dialogVisible.value = true
+  title.value = row.title
+  name.value = row.name
+  selectTreeRef.value.clearSelected()
+  resetFormData()
+  getuser()
+  getPubList()
+  getSexList()
+  geteducationList()
+  getTechnologyJobList()
+  getAdministrationJob()
+  if (row.title === '新建') {
+    console.log()
+  }
+  else {
+    getCertificateDetail({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        meterStaff.value = res.data.meterStaff
+        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+      }
+    })
+  }
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <detail-page :title=" `${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+          完成
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="人员编号" prop="staffNo">
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="selectPerson">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="meterStaff.name">
+              <el-input v-model.trim="meterStaff.name" placeholder="姓名" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="性别" prop="meterStaff.sex">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="文化程度" prop="meterStaff.education">
+              <el-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="技术职务" prop="meterStaff.technologyJob">
+              <el-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="行政职务" prop="meterStaff.administrationJob">
+              <el-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="工作部门" prop="deptId">
+              <el-select v-if="title === '详情'" v-model="meterStaff.deptId" disabled>
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+              <com-tree-select
+                v-else
+                ref="selectTreeRef" v-model="meterStaff.deptId" :options="PubListTree"
+                placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业" prop="major">
+              <el-input v-model.trim="meterStaff.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="从事日期" prop="workDate">
+              <el-date-picker
+                v-model="meterStaff.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择从事日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block :title="current">
+      <template #btns>
+        <el-button v-if="title === '新建'" type="info" @click="removeRow">
+          删除行
+        </el-button>
+        <el-button v-if="title === '新建'" type="primary" @click="addRow">
+          添加行
+        </el-button>
+        <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+          编辑行
+        </el-button>
+      </template>
+      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
+        <el-table-column width="55" align="center">
+          <template #default="scope">
+            <el-radio-group v-model="currenSelect" class="ml-4">
+              <el-radio :label="scope.$index" />
+            </el-radio-group>
+          </template>
+        </el-table-column>
+        <el-table-column type="index" label="序号" width="55" />
+        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </detail-block>
+    <!-- 添加证书信息组件 -->
+    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    <!-- 选择用户列表组件 -->
+    <person-list-dialog ref="personListRef" @add="confirmPerson" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        display: none;
+      }
+    }
+  }
+</style>
+
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 332c73c..178fc12 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -32,6 +32,7 @@
   form.validDate = ''
 }
 const initDialog = (row: any) => {
+  resetData()
   title.value = row.title
   if (row.title === '编辑') {
     form.certificateNo = row.certificateNo
@@ -50,10 +51,12 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       if (title.value === '编辑') {
-        emits('add', form, 'update')
+        const deptRow = JSON.parse(JSON.stringify(form))
+        emits('add', deptRow, 'update')
       }
       else {
-        emits('add', form, '')
+        const deptRow = JSON.parse(JSON.stringify(form))
+        emits('add', deptRow, '')
       }
       dialogFormVisible.value = false
     }
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 592d810..9c6f65d 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -30,7 +30,7 @@
   { text: '技术职务', value: 'technologyJob', align: 'center', width: '140' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '100' },
   { text: '计量专业', value: 'major', align: 'center', width: '100' },
-  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '180' },
   { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '技术考核', value: 'technologyExam', align: 'center', width: '85' },
 ]) // 表格
@@ -63,7 +63,7 @@
   loadingTable.value = true
   getStaffList(searchQuery).then((res) => {
     if (res.code === 200) {
-      res.data.records = res.data.records.map((item: StaffType) => ({ ...item, sex: item.sex == '1' ? '男' : '女', technologyExam: item.technologyExam == '0' ? '已考核' : '未考核' }))
+      res.data.records = res.data.records.map((item: StaffType) => ({ ...item, sex: item.sex == '1' ? '男' : '女', technologyExam: item.technologyExam == '0' ? '已考核' : '未考核', certificateDate: item.certificateDate.split(' ')[0] }))
       list.value = res.data.records
       total.value = Number(res.data.total)
     }
@@ -236,21 +236,11 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="proxy.hasPerm(`/measure/person/list/import`)" type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" type="primary" @click="templateDownload">
-            模板下载
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/list/add`)" type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/list/export`)" type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" type="primary" @click="print">
-            打印
-          </el-button>
+          <icon-button v-if="proxy.hasPerm(`/measure/person/list/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/list/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/list/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index 17b92d3..e44001a 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -295,15 +295,17 @@
         </el-button>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
-      <el-form-item>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer footer">
         <el-button type="primary" @click="submitForm(ruleFormRef)">
           发布
         </el-button>
         <el-button @click="resetForm(ruleFormRef)">
           关闭
         </el-button>
-      </el-form-item>
-    </el-form>
+      </div>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index 3d5c2e3..0926957 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -172,15 +172,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <el-button v-if="proxy.hasPerm('/sys/notice/list/add')" type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/sys/notice/list/export')" type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/sys/notice/list/print')" v-print="printObj" type="primary">
-          打印
-        </el-button>
+        <icon-button v-if="proxy.hasPerm('/sys/notice/list/add')" icon="icon-add" title="新建" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/sys/notice/list/export')" icon="icon-export" title="导出" @click="exportExcelBtn" />
+        <icon-button v-if="proxy.hasPerm('/sys/notice/list/print')" v-print="printObj" icon="icon-print" title="打印" />
       </template>
       <!-- 表格区域 -->
       <normal-table

diff --git a/src/components.d.ts b/src/components.d.ts
index 6e85584..815d62f 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -16,14 +16,13 @@
     BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default']
     BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
-    Benchcol: typeof import('./components/benchcol/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/DetailPage/index copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
+    DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
diff --git a/src/components/DetailPage/DetailBlockSwitch.vue b/src/components/DetailPage/DetailBlockSwitch.vue
new file mode 100644
index 0000000..4d92074
--- /dev/null
+++ b/src/components/DetailPage/DetailBlockSwitch.vue
@@ -0,0 +1,71 @@
+<script lang="ts" setup name="DetailBlock">
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+})
+
+const slots = useSlots()
+</script>
+
+<template>
+  <div class="detail-main">
+    <div class="header">
+      <div class="menu">
+        <slot name="menu" />
+      </div>
+      <div class="title">
+        {{ title }}
+      </div>
+      <div class="btns">
+        <slot name="btns" />
+      </div>
+    </div>
+    <div v-if="slots.default" class="content">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-main {
+  background-color: #fff;
+  border-radius: 8px;
+  margin-top: 10px;
+  padding-top: 10px;
+
+  .header {
+    position: relative;
+    height: 40px;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+
+    .title {
+      font-weight: 500;
+    }
+
+    .btns {
+      position: absolute;
+      right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+
+    .menu {
+      position: absolute;
+      left: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+
+  .content {
+    background-color: #fff;
+    padding: 0 10px 20px;
+    margin-top: 10px;
+  }
+}
+</style>
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d6c1c91..1644a80 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -314,6 +314,39 @@
       },
     ],
   },
+  {
+    path: '/borrow',
+    component: Layout,
+    redirect: '/device/borrow/borrowapply',
+    name: 'Borrow',
+    meta: {
+      title: '设备领用',
+      icon: 'ep:key',
+      auth: '/device/borrow',
+    },
+    children: [
+      {
+        path: 'borrowapply',
+        name: 'borroWapply',
+        component: () => import('@/views/device/borrow/borrwoApply.vue'),
+        meta: {
+          title: '设备借用申请',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowapply',
+        },
+      },
+      {
+        path: 'borrowhandle',
+        name: 'borrowHandle',
+        component: () => import('@/views/device/borrow/borrowHandle.vue'),
+        meta: {
+          title: '设备借用处理',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowhandle',
+        },
+      },
+    ],
+  },
 
 ]
 
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
new file mode 100644
index 0000000..1c2405e
--- /dev/null
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="borrowHandle">
+// 逻辑代码
+</script>
+
+<template>
+  <app-container>
+    设备借用处理
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
new file mode 100644
index 0000000..03d414b
--- /dev/null
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="borrowApply">
+// 逻辑代码
+</script>
+
+<template>
+  <app-container>
+    设备借用申请
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index c2682fc..5f7b347 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -339,381 +339,374 @@
 
 <template>
   <div class="body-container">
-    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资产编号" prop="assetNo">
-            <el-input v-model.trim="ruleForm.assetNo" placeholder="系统自动生成" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="资产类型" prop="assetType">
-            <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备编号" prop="equipmentNo">
-            <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备名称" prop="equipmentName">
-            <el-input v-model.trim="ruleForm.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="生产厂家" prop="manufacturer">
-            <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="厂家国别" prop="manufacturerCountry">
-            <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="出厂编号" prop="manufacturingNo">
-            <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="出厂年月" prop="manufacturingDate">
-            <el-date-picker
-              v-model="ruleForm.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '出厂年月'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="型号" prop="modelNo">
-            <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="管理状态" prop="managerState">
-            <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="ABC" prop="abc">
-            <el-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'">
-              <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="标签绑定" prop="labelBind">
-            <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === '详情' ? '' : '标签'" :disabled="title === '详情'" clearable>
-              <template #append>
-                <el-button type="primary" size="small">
-                  扫描
-                </el-button>
-              </template>
-            </el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="立卡年月" prop="cardEstablishmentDate">
-            <el-date-picker
-              v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '立卡年月'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="启用日期" prop="enableDate">
-            <el-date-picker
-              v-model="ruleForm.enableDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '启用日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定方式" prop="mesureType">
-            <el-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'">
-              <el-option v-for="item in mesureTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定周期" prop="mesureCycle">
-            <el-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="12">
-          <el-form-item label="测量范围" prop="mesureRange">
-            <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === '详情' ? '' : '测量范围'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="不确定度" prop="uncertainty">
-            <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === '详情' ? '' : '不确定度'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="使用部门" prop="useDept">
-            <com-tree-select
-              v-if="title !== '详情'"
-              v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-              :tree-props="deptProps"
-            />
-            <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
-              <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="使用人" prop="usePerson">
-            <el-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'">
-              <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="专业分类" prop="majorCategory">
-            <el-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'">
-              <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="检定部门" prop="mesureDept">
-            <com-tree-select
-              v-if="title !== '详情'"
-              v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-              :tree-props="deptProps"
-            />
-            <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
-              <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定日期" prop="mesureDate">
-            <el-date-picker
-              v-model="ruleForm.mesureDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '检定日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="有效日期" prop="validDate">
-            <el-date-picker
-              v-model="ruleForm.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '有效日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定结果" prop="mesureResult">
-            <el-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'">
-              <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="8">
-          <el-form-item label="是否是技术指标需要校准/检定的设备" prop="isCalibrationTestEquipment" label-width="260px">
-            <el-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否是测量工装台账" prop="isMeasureAccount" label-width="260px">
-            <el-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否标准配套设备" prop="isStandardSupportEquipment" label-width="260px">
-            <el-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
+    <detail-block-switch title="基本信息">
+      <template #menu>
+        <slot name="menuswitch" />
+      </template>
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资产编号" prop="assetNo">
+              <el-input v-model.trim="ruleForm.assetNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="资产类型" prop="assetType">
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备编号" prop="equipmentNo">
+              <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="生产厂家" prop="manufacturer">
+              <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="厂家国别" prop="manufacturerCountry">
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号" prop="manufacturingNo">
+              <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂年月" prop="manufacturingDate">
+              <el-date-picker
+                v-model="ruleForm.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '出厂年月'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="型号" prop="modelNo">
+              <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="管理状态" prop="managerState">
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="ABC" prop="abc">
+              <el-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'">
+                <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标签绑定" prop="labelBind">
+              <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === '详情' ? '' : '标签'" :disabled="title === '详情'" clearable>
+                <template #append>
+                  <el-button type="primary" size="small">
+                    扫描
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="立卡年月" prop="cardEstablishmentDate">
+              <el-date-picker
+                v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '立卡年月'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="启用日期" prop="enableDate">
+              <el-date-picker
+                v-model="ruleForm.enableDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '启用日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定方式" prop="mesureType">
+              <el-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'">
+                <el-option v-for="item in mesureTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定周期" prop="mesureCycle">
+              <el-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="测量范围" prop="mesureRange">
+              <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === '详情' ? '' : '测量范围'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="不确定度" prop="uncertainty">
+              <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === '详情' ? '' : '不确定度'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="使用部门" prop="useDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
+                :tree-props="deptProps"
+              />
+              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="使用人" prop="usePerson">
+              <el-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'">
+                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="专业分类" prop="majorCategory">
+              <el-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'">
+                <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="检定部门" prop="mesureDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                :tree-props="deptProps"
+              />
+              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定日期" prop="mesureDate">
+              <el-date-picker
+                v-model="ruleForm.mesureDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '检定日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="有效日期" prop="validDate">
+              <el-date-picker
+                v-model="ruleForm.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '有效日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定结果" prop="mesureResult">
+              <el-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'">
+                <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="8">
+            <el-form-item label="是否是技术指标需要校准/检定的设备" prop="isCalibrationTestEquipment" label-width="260px">
+              <el-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否是测量工装台账" prop="isMeasureAccount" label-width="260px">
+              <el-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否标准配套设备" prop="isStandardSupportEquipment" label-width="260px">
+              <el-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资产来源" prop="assetSource">
-            <el-input v-model.trim="ruleForm.assetSource" :placeholder="title === '详情' ? '' : '资产来源'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备规格" prop="equipmentSpecifications">
-            <el-input v-model.trim="ruleForm.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备类别" prop="equipmentCategory">
-            <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
-              <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备类型" prop="equipmentType">
-            <el-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'">
-              <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资本来源" prop="capitalSource">
-            <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
-              <el-option v-for="item in capitalSourceList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="管理级别" prop="managerLevel">
-            <el-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'">
-              <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="用途" prop="purpose">
-            <el-input v-model.trim="ruleForm.purpose" :placeholder="title === '详情' ? '' : '用途'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="技术水平" prop="technicalLevel">
-            <el-input v-model.trim="ruleForm.technicalLevel" :placeholder="title === '详情' ? '' : '技术水平'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="完好状态" prop="intactState">
-            <el-input v-model.trim="ruleForm.intactState" :placeholder="title === '详情' ? '' : '完好状态'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="外形尺寸" prop="overallDimension">
-            <el-input v-model.trim="ruleForm.overallDimension" :placeholder="title === '详情' ? '' : '外形尺寸'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="重量(吨)" prop="weight">
-            <el-input v-model.trim="ruleForm.weight" :placeholder="title === '详情' ? '' : '重量'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="单价" prop="singlePrice">
-            <el-input v-model.trim="ruleForm.singlePrice" :placeholder="title === '详情' ? '' : '单价'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="安装及杂费" prop="installIncidentalExpenses">
-            <el-input v-model.trim="ruleForm.installIncidentalExpenses" :placeholder="title === '详情' ? '' : '安装及杂费'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="安装地点" prop="installPlace">
-            <el-input v-model.trim="ruleForm.installPlace" :placeholder="title === '详情' ? '' : '安装地点'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="原值" prop="originValue">
-            <el-input v-model.trim="ruleForm.originValue" :placeholder="title === '详情' ? '' : '原值'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="目前原值" prop="presentOriginValue">
-            <el-input v-model.trim="ruleForm.presentOriginValue" :placeholder="title === '详情' ? '' : '目前原值'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="折旧年限" prop="depreciationPeriod">
-            <el-input v-model.trim="ruleForm.depreciationPeriod" :placeholder="title === '详情' ? '' : '折旧年限'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="折旧方法" prop="depreciationMethod">
-            <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
-              <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="属性" prop="attribute">
-            <el-input v-model.trim="ruleForm.attribute" placeholder="属性" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="12">
-          <el-form-item label="说明书" prop="minioFileName">
-            <show-photo :minio-file-name="ruleForm.fileList[0]?.minioFileName || ''" />
-            <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
-            <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
-              {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
-            </el-button>
-            <span v-if="title === '详情' && !ruleForm.fileList[0]?.minioFileName">暂无</span>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="24">
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" placeholder="备注" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资产来源" prop="assetSource">
+              <el-input v-model.trim="ruleForm.assetSource" :placeholder="title === '详情' ? '' : '资产来源'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备规格" prop="equipmentSpecifications">
+              <el-input v-model.trim="ruleForm.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备类别" prop="equipmentCategory">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+                <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备类型" prop="equipmentType">
+              <el-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'">
+                <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资本来源" prop="capitalSource">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+                <el-option v-for="item in capitalSourceList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="管理级别" prop="managerLevel">
+              <el-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'">
+                <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="用途" prop="purpose">
+              <el-input v-model.trim="ruleForm.purpose" :placeholder="title === '详情' ? '' : '用途'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="技术水平" prop="technicalLevel">
+              <el-input v-model.trim="ruleForm.technicalLevel" :placeholder="title === '详情' ? '' : '技术水平'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="完好状态" prop="intactState">
+              <el-input v-model.trim="ruleForm.intactState" :placeholder="title === '详情' ? '' : '完好状态'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="外形尺寸" prop="overallDimension">
+              <el-input v-model.trim="ruleForm.overallDimension" :placeholder="title === '详情' ? '' : '外形尺寸'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="重量(吨)" prop="weight">
+              <el-input v-model.trim="ruleForm.weight" :placeholder="title === '详情' ? '' : '重量'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="单价" prop="singlePrice">
+              <el-input v-model.trim="ruleForm.singlePrice" :placeholder="title === '详情' ? '' : '单价'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="安装及杂费" prop="installIncidentalExpenses">
+              <el-input v-model.trim="ruleForm.installIncidentalExpenses" :placeholder="title === '详情' ? '' : '安装及杂费'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="安装地点" prop="installPlace">
+              <el-input v-model.trim="ruleForm.installPlace" :placeholder="title === '详情' ? '' : '安装地点'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="原值" prop="originValue">
+              <el-input v-model.trim="ruleForm.originValue" :placeholder="title === '详情' ? '' : '原值'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="目前原值" prop="presentOriginValue">
+              <el-input v-model.trim="ruleForm.presentOriginValue" :placeholder="title === '详情' ? '' : '目前原值'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="折旧年限" prop="depreciationPeriod">
+              <el-input v-model.trim="ruleForm.depreciationPeriod" :placeholder="title === '详情' ? '' : '折旧年限'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="折旧方法" prop="depreciationMethod">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+                <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="属性" prop="attribute">
+              <el-input v-model.trim="ruleForm.attribute" placeholder="属性" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="说明书" prop="minioFileName">
+              <show-photo :minio-file-name="ruleForm.fileList[0]?.minioFileName || ''" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
+                {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
+              </el-button>
+              <span v-if="title === '详情' && !ruleForm.fileList[0]?.minioFileName">暂无</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" placeholder="备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block-switch>
   </div>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    padding-top: 20px;
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index f46553a..fc3fd54 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -360,20 +360,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          固定资产-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`固定资产-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -763,44 +758,11 @@
           </el-row>
         </div> -->
       </el-form>
-    </div>
+    </detail-page>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index 0abbdb1..6e88e96 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -74,33 +74,29 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ name }} -{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm">
-            关闭
-          </el-button>
-        </span>
-      </div>
-      <div class="body">
-        <!-- 三级菜单 -->
-        <el-radio-group v-model="current">
-          <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
-            {{ item.name }}
-          </el-radio-button>
-        </el-radio-group>
-      </div>
-      <!-- 展示区域 -->
-      <keep-alive>
-        <component :is="currentComp" ref="currentCompRef" :name="current" :title="title" :row="row" />
-      </keep-alive>
-    </div>
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <!-- 展示区域 -->
+    <keep-alive>
+      <component :is="currentComp" ref="currentCompRef" :name="current" :title="title" :row="row">
+        <template #menuswitch>
+          <!-- 三级菜单 -->
+          <el-radio-group v-model="current">
+            <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+              {{ item.name }}
+            </el-radio-button>
+          </el-radio-group>
+        </template>
+      </component>
+    </keep-alive>
   </app-container>
 </template>
 
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f9cdcd0..f653095 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -256,7 +256,7 @@
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
-  // 原生上传图片
+  // 原生上传
   // console.log(event.target.files)
   // if (event.target.files[0].type === 'application/pdf') {
   if (event.target.files?.length !== 0) {
@@ -354,7 +354,7 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" type="primary" @click="identify">
+          <!-- <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" type="primary" @click="identify">
             标签识别
           </el-button>
           <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/import`)" type="primary" @click="batchImport">
@@ -371,7 +371,13 @@
           </el-button>
           <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/print`)" v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/device/standingBook/components/templateTable.vue b/src/views/device/standingBook/components/templateTable.vue
index 8a928f0..7aa563f 100644
--- a/src/views/device/standingBook/components/templateTable.vue
+++ b/src/views/device/standingBook/components/templateTable.vue
@@ -245,11 +245,11 @@
   <div>
     <!-- 添加证书信息组件 -->
     <add-row ref="addRowRef" @add="addRowData" />
-    <div class="header">
-      <div class="title">
-        <!-- {{ $props.name }} -->
-      </div>
-      <span class="btns">
+    <detail-block-switch :title="name">
+      <template #menu>
+        <slot name="menuswitch" />
+      </template>
+      <template #btns>
         <el-button v-if="title !== '详情'" type="info" @click="removeRow">
           删除行
         </el-button>
@@ -259,55 +259,33 @@
         <el-button v-if="title !== '详情'" type="primary" @click="editRow">
           编辑行
         </el-button>
-      </span>
-    </div>
-    <!-- 表格区域 -->
-    <normal-table
-      id="print"
-      :data="list" :total="total" :columns="columns as any"
-      :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-      :list-loading="loadingTable"
-      style="padding-top: 20px;background-color: #fff;"
-      @change="changePage"
-    >
-      <template #preColumns>
-        <el-table-column label="" width="55" align="center">
-          <template #default="scope">
-            <el-radio v-model="select" :label="scope.$index" class="radio" />
-          </template>
-        </el-table-column>
-        <el-table-column label="序号" width="55" align="center">
-          <template #default="scope">
-            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-          </template>
-        </el-table-column>
       </template>
-    </normal-table>
+      <!-- 表格区域 -->
+      <normal-table
+        id="print"
+        :data="list" :total="total" :columns="columns as any"
+        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+        :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </detail-block-switch>
   </div>
 </template>
 
 <style lang="scss" scoped>
-.header {
-  background-color: #fff;
-  // height: 40px;
-  border-radius: 8px;
-  display: flex;
-  align-items: center;
-  flex-direction: column;
-  justify-content: center;
-  position: relative;
-
-  .title {
-    // font-weight: 700;
-  }
-
-  .btns {
-    position: absolute;
-    right: 40px;
-    top: -22px;
-  }
-}
-
 :deep(.el-radio__label) {
   display: none;
 }
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 7538bc8..78a3800 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -272,24 +272,12 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/identify`)" type="primary" @click="identify">
-            标签识别
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/import`)" type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/mould`)" type="primary" @click="templateDownload">
-            模板下载
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/add`)" type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/export`)" type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/print`)" v-print="printObj" type="primary">
-            打印
-          </el-button>
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/identify`)" icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index fc364c8..e74d70e 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -361,20 +361,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ name }} - {{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -458,73 +453,33 @@
           </el-col>
         </el-row>
       </el-form>
-      <div v-if="title !== '新建' ">
-        <div class="header" style="margin-top: 10px;">
-          <div class="title">
-            审批流程
-          </div>
-        </div>
-        <div class="timeline">
-          <el-timeline>
-            <el-timeline-item timestamp="2018/4/12" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/12 20:46</p>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="2018/4/3" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/3 20:46</p>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="2018/4/2" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/2 20:46</p>
-              </el-card>
-            </el-timeline-item>
-          </el-timeline>
-        </div>
-      </div>
-    </div>
+    </detail-page>
+    <detail-block v-if="title !== '新建' " title="审批流程">
+      <el-timeline>
+        <el-timeline-item timestamp="2018/4/12" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/12 20:46</p>
+          </el-card>
+        </el-timeline-item>
+        <el-timeline-item timestamp="2018/4/3" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/3 20:46</p>
+          </el-card>
+        </el-timeline-item>
+        <el-timeline-item timestamp="2018/4/2" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/2 20:46</p>
+          </el-card>
+        </el-timeline-item>
+      </el-timeline>
+    </detail-block>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .timeline {
   background-color: #fff;
 }
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index aa3963f..737568d 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -1,6 +1,6 @@
 <!-- 状态管理公共列表组件 -->
 <script lang="ts" setup>
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessageBox } from 'element-plus'
 import approve from './approvalActionDialog.vue'
 import addDialog from './templateAdd.vue'
 const props = defineProps({
@@ -142,7 +142,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: any) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     title: '详情',
@@ -150,7 +150,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: any) => {
   dialogVisible.value = true
   // addRef.value.initDialog({
   //   title: '编辑',
@@ -158,7 +158,7 @@
   // })
 }
 // 删除
-const remove = (row) => {
+const remove = (row: any) => {
   ElMessageBox.confirm(
     `确认删除${row.equipmentName}吗？`,
     '提示',
@@ -181,20 +181,20 @@
   // })
 }
 // 同意
-const agree = (row) => {
+const agree = (row: any) => {
   console.log(approveRef.value)
   approveRef.value.initDialog({
     radio: '1',
   })
 }
 // 驳回
-const reject = (row) => {
+const reject = (row: any) => {
   approveRef.value.initDialog({
     radio: '3',
   })
 }
 // 拒绝
-const refuse = (row) => {
+const refuse = (row: any) => {
   approveRef.value.initDialog(
     {
       radio: '2',
@@ -202,7 +202,7 @@
   )
 }
 // 取消
-const cancel = (row) => {
+const cancel = (rowrow: any) => {
   ElMessageBox.confirm(
     '确认取消吗？',
     '提示',
@@ -301,20 +301,20 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+          <el-input placeholder="申请编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="设备编号" clearable class="w-50 m-2" />
+          <el-input placeholder="设备编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.modelNo" placeholder="设备名称" clearable class="w-50 m-2" />
+          <el-input placeholder="设备名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请单位" clearable class="w-50 m-2" />
+          <el-input placeholder="申请单位" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.publisher" placeholder="申请状态" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" />
+          <el-select placeholder="申请状态" clearable>
+            <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" /> -->
           </el-select>
         </search-item>
       </search-area>
@@ -328,7 +328,10 @@
           <el-button type="primary" @click="templateDownload">
             模板下载
           </el-button> -->
-          <el-button type="primary" @click="add">
+          <icon-button icon="icon-add" title="新建" @click="add" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+          <!-- <el-button type="primary" @click="add">
             新建
           </el-button>
           <el-button type="primary" @click="exportExcelBtn">
@@ -336,7 +339,7 @@
           </el-button>
           <el-button v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
         </template>
         <!-- 表格区域 -->
         <normal-table
@@ -386,22 +389,3 @@
     </app-container>
   </div>
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 154px !important;
-}
-
-.normal-date {
-  width: 154px !important;
-}
-
-.normal-select {
-  width: 154px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
-
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 0763c5a..9ef0b93 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -19,7 +19,6 @@
 const effectiveStatusName = ref('')
 const title = ref('')
 const fileList = ref<UploadUserFile[]>([])
-console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -80,10 +79,9 @@
   if (row.title === '新建') {
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
-    ruleForm.publisher = ''
+    ruleForm.publisher = userInfo.$state.deptName
     ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 判断有无存储
-    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
     if (sessionStorage.getItem(fileTypeName.value)) {
       const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
       ruleForm.fileType = session.fileType
@@ -117,6 +115,8 @@
     ruleForm.remark = row.remark
     ruleForm.publishTime = row.publishTime
     ruleForm.minioFileName = row.minioFileName
+    // ruleForm.publisher = '0'
+    // ruleForm.createUserId = '1'
   }
 }
 defineExpose({ initDialog })
@@ -148,6 +148,9 @@
       type: 'warning',
     },
       ).then((res) => {
+        if (ruleForm.publisher === userInfo.$state.deptName) {
+          ruleForm.publisher === userInfo.$state.deptId
+        }
         if (flag == '提交') {
           addApi(ruleForm).then((res) => {
             if (res.code == 200) {
@@ -193,7 +196,6 @@
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        console.log(res.data[0])
         ruleForm.minioFileName = res.data[0]
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
@@ -216,7 +218,6 @@
 // ])
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
-  console.log(diffDat)
   if (diffDat < 0) {
     // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '在使用'
@@ -237,7 +238,7 @@
 
 <template>
   <app-container v-if="dialogVisible" style="overflow: hidden;">
-    <detail-page :title="`${title}${fileTypeName}`">
+    <detail-page :title="`${fileTypeName}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
           提交
@@ -278,12 +279,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="发布单位" prop="publisher">
-              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'" class="fill-input">
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled>
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
               <com-tree-select
                 v-else
-                v-model="ruleForm.publisher" :options="PubListTree" placeholder="选择组织机构"
+                v-model="ruleForm.publisher" :options="PubListTree" placeholder="请选择发布单位"
                 :tree-props="deptProps"
               />
             </el-form-item>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 44e3e4d..b45fbc3 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -324,22 +324,9 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <!-- <el-button type="primary" @click="batchImport">
-            批量导入
-          </el-button> -->
-          <!-- <el-button type="primary" @click="templateDownload">
-            模板下载
-          </el-button> -->
-          <!-- <el-button type="primary" @click="add">
-            新建
-          </el-button> -->
-          <el-button type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-print="printObj" type="primary">
-            打印
-          </el-button>
+          <!-- <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange"> -->
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 4677e48..7d4724b 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -204,13 +204,9 @@
     loading.close()
   })
 }
-// 打印
-const print = () => {
-
-}
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
-  // 原生上传图片
+  // 原生上传
   // console.log(event.target.files)
   // if (event.target.files[0].type === 'application/pdf') {
   if (event.target.files?.length !== 0) {
@@ -264,7 +260,7 @@
         <search-item>
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
-        <search-item>
+        <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
@@ -273,13 +269,13 @@
               :value="item.value"
             />
           </el-select>
-        </search-item>
+        </search-item> -->
         <search-item>
           <el-date-picker
             v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 155px;"
+            style="width: 185px;"
           />
         </search-item>
         <search-item>
@@ -287,19 +283,19 @@
             v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 155px;"
+            style="width: 185px;"
           />
         </search-item>
         <search-item>
-          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select> -->
-          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
+          </el-select>
+          <!-- <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" /> -->
         </search-item>
       </search-area>
       <table-container>
@@ -310,7 +306,7 @@
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
-          <icon-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" @click="print" />
+          <icon-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index cf0dd4f..5ca3275 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -3,11 +3,11 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { detailType } from '../measureDept-interface'
-import { getUserList } from '@/api/system/user'
+// import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
+import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import type { userType } from '@/views/system/user/user-interface'
 import { listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
-import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
 const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -31,11 +31,20 @@
   technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
+// 获取计量人员列表
 const getuser = () => {
-  getUserList({ offset: 1, limit: 99999 }).then((res) => {
-    userList.value = res.data.rows
+  getStaffList({
+    staffNo: '', // 人员编号
+    name: '', // 姓名
+    deptId: ruleForm.value.deptId, // 所在部门
+    limit: 999999,
+    offset: 1,
+  }).then((res) => {
+    if (res.code === 200) {
+      userList.value = res.data.records
+    }
   })
-} // 获取用户列表
+}
 const technologyJobList = ref<{ id: string;name: string;value: string }[]>([])
 // 获取技术职务列表
 const getTechnologyJobList = () => {
@@ -50,7 +59,16 @@
     administrationJobList.value = response.data
   })
 }
-
+// 选择负责人自动填充职务信息
+const directorChange = (val: string) => {
+  const selectUser = userList.value.filter(item => item.name === val)[0]
+  getStaffDetail(selectUser).then((res) => {
+    if (res.code === 200) {
+      ruleForm.value.administrationJob = res.data.administrationJob
+      ruleForm.value.technologyJob = res.data.technologyJob
+    }
+  })
+}
 // 提交
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
@@ -95,12 +113,6 @@
 const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
-// const searchQuery = ref({
-//   limit: 10,
-//   offset: 1,
-//   total: 0,
-//   pageSizes: [10, 20, 30],
-// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -410,20 +422,6 @@
     }
   })
 }
-// const handleSizeChange = (val: number) => {
-//   searchQuery.value.limit = val
-//   getDepartmentList()
-//   getuserInfoList()
-//   getInstrumentInfo()
-//   getDeviceInfo()
-// }
-// const handleCurrentChange = (val: number) => {
-//   searchQuery.value.offset = val
-//   getDepartmentList()
-//   getuserInfoList()
-//   getInstrumentInfo()
-//   getDeviceInfo()
-// }
 // 弹窗初始化
 const initDialog = (row: any) => {
   reset()
@@ -460,22 +458,17 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title.split('-')[2] === '编辑'" type="primary" @click="submitForm(ruleFormRef)">
-            提交
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="title">
+      <template #btns>
+        <el-button v-if="title.split('-')[2] === '编辑'" type="primary" @click="submitForm(ruleFormRef)">
+          提交
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title.split('-')[2] === '详情' ? 'isDetail' : '']">
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item :label=" `${title.split('-')[1]}编号`" prop="organizeNo">
               <el-input v-model.trim="ruleForm.organizeNo" placeholder="系统自动生成" disabled />
@@ -487,7 +480,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="title.split('-')[1] === '工程组'" :gutter="24" class="marg">
+        <el-row v-if="title.split('-')[1] === '工程组'" :gutter="24">
           <el-col :span="6">
             <el-form-item label="科室编号">
               <el-input v-model.trim="ruleForm.pDeptId" disabled />
@@ -509,10 +502,10 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
-              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" @change="directorChange">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.name" />
               </el-select>
             </el-form-item>
@@ -532,7 +525,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="24">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
               <el-input v-model.trim="ruleForm.remark" :placeholder="title.split('-')[2] === '详情' ? '' : '备注'" :disabled="title.split('-')[2] === '详情'" />
@@ -540,85 +533,24 @@
           </el-col>
         </el-row>
       </el-form>
-      <!-- 科室信息-人员信息等列表切换 -->
-      <div>
-        <div class="header" style="margin-top: 10px;">
-          <!-- 切换 -->
-          <el-radio-group v-model="current" class="change-btn">
-            <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
-              {{ item.name }}
-            </el-radio-button>
-          </el-radio-group>
-          <div class="title">
-            {{ current }}
-          </div>
-          <span class="btns">
-          <!-- <el-button type="info" :disabled="title === '详情'" @click="removeRow">
-            删除行
-          </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
-            添加行
-          </el-button> -->
-          </span>
-        </div>
-        <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <el-table-column type="index" label="序号" width="55" align="center" />
-          <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
-        </el-table>
-        <!-- <div style="width: 100%;margin-top: 10px;">
-          <el-pagination
-            :current-page="searchQuery.offset"
-            :page-sizes="searchQuery.pageSizes"
-            :page-size="searchQuery.limit"
-            :total="searchQuery.total"
-            layout="total, sizes, prev, pager, next"
-            hide-on-single-page
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-          />
-        </div> -->
-      </div>
-    </div>
+    </detail-page>
+    <detail-block-switch :title="current">
+      <template #menu>
+        <el-radio-group v-model="current" class="change-btn">
+          <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
+            {{ item.name }}
+          </el-radio-button>
+        </el-radio-group>
+      </template>
+      <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
+        <el-table-column type="index" label="序号" width="55" align="center" />
+        <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </detail-block-switch>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-    position: relative;
-
-    .change-btn {
-      position: absolute;
-      left: 40px;
-      top: 4px;
-    }
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 4px;
-    }
-  }
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
@@ -628,8 +560,4 @@
     }
   }
 }
-
-.marg {
-  margin-top: 10px;
-}
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 9ad87af..aac1ef2 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -231,12 +231,14 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
+          <!-- <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
           <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
+          <icon-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 2e3322a..3f472eb 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -41,7 +41,7 @@
   { text: '证书号', value: 'certificateNo', align: 'center' },
   { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
   { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'validDate', align: 'center', width: '200' },
   { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
 ]) // 表格
 const certificateStatusList = ref([
@@ -90,7 +90,7 @@
   loadingTable.value = true
   getCertificateList(searchQuery).then((res) => {
     if (res.code === 200) {
-      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效' }))
+      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效', validDate: item.validDate.split(' ')[0], certificateDate: item.certificateDate.split(' ')[0] }))
       list.value = res.data.records
       total.value = Number(res.data.total)
     }
@@ -115,6 +115,7 @@
   addRef.value.initDialog({
     ...row,
     title: '详情',
+    name: props.isRemind ? '证书状况' : '证书记录',
   })
 }
 // 编辑
@@ -123,6 +124,7 @@
   addRef.value.initDialog({
     ...row,
     title: '编辑',
+    name: props.isRemind ? '证书状况' : '证书记录',
   })
 }
 
@@ -193,6 +195,7 @@
   dialogVisible.value = true
   addRef.value.initDialog({
     title: '新建',
+    name: props.isRemind ? '证书状况' : '证书记录',
   })
 }
 // 导出
@@ -292,21 +295,11 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
-            模板下载
-          </el-button>
-          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
-            打印
-          </el-button>
+          <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
@@ -325,7 +318,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column fixed="right" label="操作" align="center" width="150">
+            <el-table-column fixed="right" label="操作" align="center" width="180">
               <template #default="{ row }">
                 <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
                   提醒
@@ -336,7 +329,7 @@
                 <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 4dc1b17..4352604 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -69,7 +69,16 @@
     const IdCard = ruleForm.value.idCard
     const birthday = `${IdCard.substring(6, 10)}-${IdCard.substring(10, 12)}`
     ruleForm.value.birthday = birthday
-    console.log(ruleForm.value)
+    // 获取性别 第17位  奇数为男 偶数为女
+    // ruleForm.value.sex
+    if (Number(IdCard.substring(16, 17)) % 2) {
+      // 男
+      ruleForm.value.sex = '1'
+    }
+    else {
+      //  女
+      ruleForm.value.sex = '2'
+    }
   })
 }
 const dialogVisible = ref<boolean>(false) // 弹窗显示
@@ -130,7 +139,6 @@
     technologyExam: '', // 技术考核
     remark: '', // 备注
     certificateList: [], // 证书列表
-
   }
 }
 const technologyJobList = ref<technologyJobType[]>([])
@@ -309,7 +317,7 @@
           }
           (title.value === '新建'
             ? getStaffAdd
-            : getStaffupdate) ({ ...ruleForm.value, certificateList: changeList.value[0].data }).then((res) => {
+            : getStaffupdate) ({ ...ruleForm.value, certificateList: changeList.value[0].data, birthday: `${ruleForm.value.idCard.substring(6, 10)}-${ruleForm.value.idCard.substring(10, 12)}-${ruleForm.value.idCard.substring(12, 14)}` }).then((res) => {
             if (res.code == 200) {
               formEl?.resetFields()
               ElMessage.success('提交成功')
@@ -332,12 +340,14 @@
   emits('resetData')
   resetFormData()
 }
+const selectTreeRef = ref()
 // 弹窗初始化
 const initDialog = (row: any) => {
   changeList.value[0].data = []
   dialogVisible.value = true
   title.value = row.title
   resetFormData()
+  selectTreeRef.value?.clearSelected()
   getuser()
   getPubList()
   getSexList()
@@ -370,20 +380,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          计量人员-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
-            完成
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`计量人员-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+          完成
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
         <el-row :gutter="24" class="marg">
           <el-col :span="5">
@@ -394,6 +399,7 @@
                 :http-request="uploadQuarterlyEvaluateFile"
                 :before-upload="beforeAvatarUpload"
                 :disabled="title === '详情'"
+                accept="image/png, image/jpeg,image/jpg"
               >
                 <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
                 <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
@@ -425,8 +431,8 @@
               </el-select>
               <com-tree-select
                 v-else
-                v-model="ruleForm.deptId" :options="PubListTree" placeholder="选择组织机构"
-                :tree-props="deptProps"
+                ref="selectTreeRef" v-model="ruleForm.deptId" :options="PubListTree"
+                placeholder="选择组织机构" :tree-props="deptProps"
               />
             </el-form-item>
             <el-form-item label="计量专业" prop="major" class="marg-item">
@@ -489,29 +495,19 @@
           </el-col>
         </el-row>
       </el-form>
-      <!-- 证书基本信息 -->
-      <!-- 切换 -->
-      <!-- <el-radio-group v-model="current" style="margin-bottom: -15px;">
-          <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
-            {{ item.name }}
-          </el-radio-button>
-        </el-radio-group> -->
-      <div class="header" style="margin-top: 10px;">
-        <div class="title">
-          {{ current }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="info" @click="removeRow">
-            删除行
-          </el-button>
-          <el-button v-if="title !== '详情'" type="primary" @click="addRow">
-            添加行
-          </el-button>
-          <el-button v-if="title !== '详情'" type="primary" @click="editRow">
-            编辑行
-          </el-button>
-        </span>
-      </div>
+    </detail-page>
+    <detail-block :title="current">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="info" @click="removeRow">
+          删除行
+        </el-button>
+        <el-button v-if="title !== '详情'" type="primary" @click="addRow">
+          添加行
+        </el-button>
+        <el-button v-if="title !== '详情'" type="primary" @click="editRow">
+          编辑行
+        </el-button>
+      </template>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
         <el-table-column width="55" align="center">
           <template #default="scope">
@@ -523,7 +519,7 @@
         <el-table-column type="index" label="序号" width="55" />
         <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
       </el-table>
-    </div>
+    </detail-block>
     <!-- 添加证书信息组件 -->
     <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
     <!-- 选择用户列表组件 -->
@@ -532,77 +528,38 @@
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    background-color: #fff;
-    border-radius: 8px;
-    padding-top: 10px;
-    margin-top: 10px;
-    padding-right: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    display: flex;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    position: relative;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 5px;
-    }
-  }
-
-  :deep(.el-radio__label) {
-    display: none;
-  }
-
-  :deep(.el-icon.avatar-uploader-icon) {
-    font-size: 28px;
-    color: #8c939d;
-    width: 190px;
-    height: 250px;
-    text-align: center;
-  }
-
-  :deep(.avatar-uploader .avatar) {
-    width: 190px;
-    height: 250px;
-    display: block;
-  }
-
-  .isDetail {
-    ::v-deep {
-      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-        display: none;
-      }
-    }
-  }
+:deep(.el-radio__label) {
+  display: none;
 }
 
-.marg {
-  margin-top: 20px;
+:deep(.el-icon.avatar-uploader-icon) {
+  font-size: 28px;
+  color: #8c939d;
+  width: 190px;
+  height: 250px;
+  text-align: center;
 }
 
-.marg-item {
-  margin-top: 20px;
+:deep(.avatar-uploader .avatar) {
+  width: 190px;
+  height: 250px;
+  display: block;
+}
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
 }
 </style>
 
 <style scoped>
 .avatar-uploader .avatar {
-  width: 220px;
-  height: 320px;
+  width: 190px;
+  height: 250px;
   display: block;
 }
 </style>
@@ -624,8 +581,8 @@
 .el-icon.avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
-  width: 220px;
-  height: 320px;
+  width: 190px;
+  height: 250px;
   text-align: center;
 }
 </style>
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index ae48f11..042636e 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -4,7 +4,6 @@
 import dayjs from 'dayjs'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import type { technologyJobType } from '../person-interface'
-import certificateAddDialog from './certificateAddDialog.vue'
 import personListDialog from './personListDialog.vue'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
@@ -14,7 +13,8 @@
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
-const ruleFormRef = ref<FormInstance>() // from组件
+const ruleFormRef1 = ref<FormInstance>() // from组件
+const ruleFormRef2 = ref<FormInstance>() // from组件
 const meterStaff = ref({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -28,26 +28,43 @@
   workDate: '', // 从事日期
   id: '',
 })
+const baseInfo = ref({
+  certificateCompany: '',
+  certificateDate: '',
+  certificateName: '',
+  certificateNo: '',
+  validDate: '',
+  id: '',
+  isDel: 0,
+  minioFileName: '',
+  remark: '',
+})
 const ruleForm = ref({
   meterStaff: {}, // 人员信息
   staffId: '', // 计量人员id
 }) // 表单
-const multipleTableRef = ref<InstanceType<typeof ElTable>>()
 const title = ref('')
+const name = ref('')
 // 身份证号码验证规则
-const validateIDcard = (rule: any, value: any, callback: any) => {
-  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
-  if (rr.test(value)) {
-    callback()
-  }
-  else {
-    callback(new Error('验证失败'))
-  }
-}
+// const validateIDcard = (rule: any, value: any, callback: any) => {
+//   const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+//   if (rr.test(value)) {
+//     callback()
+//   }
+//   else {
+//     callback(new Error('验证失败'))
+//   }
+// }
 const rules = ref({
   staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
   // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
-
+}) // 表单验证规则
+const rules2 = ref({
+  certificateCompany: [{ required: true, message: '发证单位不能为空', trigger: 'blur' }],
+  certificateDate: [{ required: true, message: '发证日期不能为空', trigger: 'blur' }],
+  certificateName: [{ required: true, message: '证书名称不能为空', trigger: 'blur' }],
+  certificateNo: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
+  validDate: [{ required: true, message: '有效日期不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
 const userList = ref<userType[]>([]) // 可使用人列表
@@ -96,6 +113,17 @@
   meterStaff.value.major = ''
   meterStaff.value.workDate = ''
   meterStaff.value.id = ''
+  baseInfo.value = {
+    certificateCompany: '',
+    certificateDate: '',
+    certificateName: '',
+    certificateNo: '',
+    validDate: '',
+    id: '',
+    isDel: 0,
+    minioFileName: '',
+    remark: '',
+  }
 }
 const technologyJobList = ref<technologyJobType[]>([])
 // 获取技术职务列表
@@ -120,98 +148,14 @@
 const confirmPerson = (row: any) => {
   ruleForm.value.staffId = row.staffNo
   meterStaff.value = row
-  ruleFormRef.value?.clearValidate('staffNo')
+  ruleFormRef1.value?.clearValidate('staffNo')
 }
-const changeList = ref([
-  {
-    name: '证书基本信息',
-    data: [] as any[],
-    column: [
-      {
-        label: '证书号',
-        data: 'certificateNo',
-        id: 'zs02',
-      },
-      {
-        label: '证书名称',
-        data: 'certificateName',
-        id: 'zs03',
-      },
-      {
-        label: '发证日期',
-        data: 'certificateDate',
-        id: 'zs04',
-      },
-      {
-        label: '发证单位',
-        data: 'certificateCompany',
-        id: 'zs01',
-      },
-      {
-        label: '有效日期',
-        data: 'validDate',
-        id: 'zs05',
-      },
-    ],
-  },
-  {
-    name: '计量工作培训记录',
-    data: [],
-    column: [],
-  },
-  {
-    name: '业务记录',
-    data: [],
-    column: [],
-  },
-])
-const current = ref('证书基本信息')
-const currentShow = computed(() => {
-  return changeList.value.filter(item => item.name === current.value)[0]
-})
-const certificateRef = ref() // 添加证书信息弹窗
-// 添加行
-const addRow = () => {
-  certificateRef.value.initDialog({ title: '添加' })
-}
-// 编辑行
-const editRow = () => {
-  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
-}
-// 证书信息行内添加数据
-const addRowcertificate = (row: any, flag: string) => {
-  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
-  if (flag === 'update') {
-    changeList.value[0].data = [{
-      ...changeList.value[0].data[0],
-      ...row,
-      certificateStatus: diff < 0 ? '1' : '0',
-      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-    }]
-  }
-  else {
-    changeList.value[0].data.push(
-      {
-        ...row,
-        certificateStatus: diff < 0 ? '1' : '0',
-        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-        id: null,
-        isDel: 0,
-        minioFileName: '',
-        remark: '',
-        staffId: meterStaff.value.id,
-        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-      })
-  }
-}
-const currenSelect = ref<number>(-1) // 当前选中行
-// 删除行
-const removeRow = () => {
-  console.log(currenSelect.value)
-  if (currenSelect.value >= 0) {
+// 提交
+const submitForm = async (formEl1: FormInstance | undefined, formEl2: FormInstance | undefined) => {
+  if (!formEl1 || !formEl2) { return }
+  Promise.all([formEl1.validate(), formEl2.validate()]).then((res) => {
     ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
+      '确认提交吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -219,78 +163,49 @@
         type: 'warning',
       },
     ).then(() => {
-      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
-      currenSelect.value = -1
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 提交
-const submitForm = async (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  await formEl.validate((valid, fields) => {
-    if (valid) {
-      ElMessageBox.confirm(
-        '确认提交吗？',
-        '提示',
-        {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        },
-      ).then(() => {
-        let params
-        if (changeList.value[0].data.length) {
-          params = changeList.value[0].data
-        }
-        else {
-          params = [
-            {
-              certificateCompany: '',
-              certificateDate: '',
-              certificateName: '',
-              certificateNo: '',
-              certificateStatus: '',
-              createTime: '',
-              id: null,
-              isDel: 0,
-              minioFileName: '',
-              remark: '',
-              staffId: meterStaff.value.id,
-              updateTime: '',
-              validDate: '',
-            },
-          ]
-        }
-        (title.value === '新建'
-          ? addCertificateList
-          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
-          formEl?.resetFields()
-          ElMessage.success('提交成功')
-          emits('resetData')
-          resetFormData()
-        })
+      (title.value === '新建'
+        ? addCertificateList
+        : getCertificateUpdate)(title.value === '新建'
+        ? [{
+            ...baseInfo.value,
+            staffId: meterStaff.value.id,
+            createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+            updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+            certificateStatus: dayjs(baseInfo.value.validDate).diff(baseInfo.value.certificateDate, 'day') < 0 ? '1' : '0',
+            meterStaff: undefined,
+          }]
+        : {
+            ...baseInfo.value,
+            staffId: meterStaff.value.id,
+            createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+            updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+            certificateStatus: dayjs(baseInfo.value.validDate).diff(baseInfo.value.certificateDate, 'day') < 0 ? '1' : '0',
+            meterStaff: undefined,
+          }).then((res) => {
+        formEl1?.resetFields()
+        formEl2?.resetFields()
+        ElMessage.success('提交成功')
+        emits('resetData')
+        resetFormData()
       })
-    }
+    })
   })
 }
 // 取消
-const resetForm = (formEl: FormInstance | undefined) => {
+const resetForm = (formEl: FormInstance | undefined, formEl2: FormInstance | undefined) => {
   formEl?.resetFields()
-  changeList.value[0].data = []
+  formEl2?.resetFields()
   emits('resetData')
   resetFormData()
 }
+const selectTreeRef = ref()
 // 弹窗初始化
 const initDialog = (row: any) => {
-  changeList.value[0].data = []
   resetFormData()
   dialogVisible.value = true
   title.value = row.title
-  resetFormData()
+  name.value = row.name
+  selectTreeRef.value?.clearSelected()
   getuser()
   getPubList()
   getSexList()
@@ -303,8 +218,9 @@
   else {
     getCertificateDetail({ id: row.id }).then((res) => {
       if (res.code === 200) {
+        console.log(res, '证书记录')
         meterStaff.value = res.data.meterStaff
-        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+        baseInfo.value = res.data
       }
     })
   }
@@ -314,21 +230,16 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          证书记录-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
-            完成
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
-      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+    <detail-page :title=" `${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
+          完成
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef1, ruleFormRef2)">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef1" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="人员编号" prop="staffNo">
@@ -390,7 +301,8 @@
               </el-select>
               <com-tree-select
                 v-else
-                v-model="meterStaff.deptId" :options="PubListTree" placeholder="选择组织机构"
+                ref="selectTreeRef" v-model="meterStaff.deptId" :options="PubListTree"
+                placeholder="选择组织机构"
                 :tree-props="deptProps"
               />
             </el-form-item>
@@ -410,71 +322,52 @@
           </el-col>
         </el-row>
       </el-form>
-      <div class="header" style="margin-top: 10px;">
-        <div class="title">
-          {{ current }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title === '新建'" type="info" @click="removeRow">
-            删除行
-          </el-button>
-          <el-button v-if="title === '新建'" type="primary" @click="addRow">
-            添加行
-          </el-button>
-          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
-            编辑行
-          </el-button>
-        </span>
-      </div>
-      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
-        <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column>
-        <el-table-column type="index" label="序号" width="55" />
-        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
-      </el-table>
-    </div>
-    <!-- 添加证书信息组件 -->
-    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    </detail-page>
+    <detail-block title="证书基本信息">
+      <el-form ref="ruleFormRef2" :model="baseInfo" :rules="rules2" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="证书号" prop="certificateNo">
+              <el-input v-model.trim="baseInfo.certificateNo" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书名称" prop="certificateName">
+              <el-input v-model.trim="baseInfo.certificateName" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证单位" prop="certificateCompany">
+              <el-input v-model.trim="baseInfo.certificateCompany" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发证日期" prop="certificateDate">
+              <el-date-picker
+                v-model="baseInfo.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择发证日期"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书有效日期" prop="validDate">
+              <el-date-picker
+                v-model="baseInfo.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择有效日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block>
     <!-- 选择用户列表组件 -->
     <person-list-dialog ref="personListRef" @add="confirmPerson" />
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    background-color: #fff;
-    border-radius: 8px;
-    padding-top: 10px;
-    margin-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    display: flex;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    position: relative;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 5px;
-    }
-  }
-
   :deep(.el-radio__label) {
     display: none;
   }
@@ -487,40 +380,5 @@
       }
     }
   }
-}
-
-.marg {
-  margin-top: 20px;
-}
 </style>
 
-<style scoped>
-.avatar-uploader .avatar {
-  width: 178px;
-  height: 178px;
-  display: block;
-}
-</style>
-
-<style>
-.avatar-uploader .el-upload {
-  border: 1px dashed var(--el-border-color);
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-  transition: var(--el-transition-duration-fast);
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: var(--el-color-primary);
-}
-
-.el-icon.avatar-uploader-icon {
-  font-size: 28px;
-  color: #8c939d;
-  width: 178px;
-  height: 178px;
-  text-align: center;
-}
-</style>
diff --git a/src/views/measure/person/components/addRecordCancel.vue b/src/views/measure/person/components/addRecordCancel.vue
new file mode 100644
index 0000000..c32ac43
--- /dev/null
+++ b/src/views/measure/person/components/addRecordCancel.vue
@@ -0,0 +1,459 @@
+<!-- 计量人员新增  证书基本信息table表格   作废 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import type { technologyJobType } from '../person-interface'
+import certificateAddDialog from './certificateAddDialog.vue'
+import personListDialog from './personListDialog.vue'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import type { TreeStructure, userType } from '@/views/system/user/user-interface'
+import { getDictByCode } from '@/api/system/dict'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const meterStaff = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  idCard: '', // 身份证号
+  sex: '', // 性别
+  education: '', // 文化程度
+  technologyJob: '', // 技术职务
+  administrationJob: '', // 行政职务
+  deptId: '', // 工作部门
+  major: '', // 专业
+  workDate: '', // 从事日期
+  id: '',
+})
+const ruleForm = ref({
+  meterStaff: {}, // 人员信息
+  staffId: '', // 计量人员id
+}) // 表单
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const title = ref('')
+const name = ref('')
+// 身份证号码验证规则
+const validateIDcard = (rule: any, value: any, callback: any) => {
+  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+  if (rr.test(value)) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+const rules = ref({
+  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
+
+}) // 表单验证规则
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref<TreeStructure[]>([])
+const PubListTree = ref([])
+// 获取组织列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
+  })
+}
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sex').then((response) => {
+    sexList.value = response.data
+  })
+}
+const educationList = ref<technologyJobType[]>([])
+// 获取文化程度列表
+const geteducationList = () => {
+  getDictByCode('education').then((response) => {
+    educationList.value = response.data
+  })
+}
+// 重置表单内容
+const resetFormData = () => {
+  meterStaff.value.staffNo = ''
+  meterStaff.value.name = ''
+  meterStaff.value.idCard = ''
+  meterStaff.value.sex = ''
+  meterStaff.value.education = ''
+  meterStaff.value.technologyJob = ''
+  meterStaff.value.administrationJob = ''
+  meterStaff.value.deptId = ''
+  meterStaff.value.major = ''
+  meterStaff.value.workDate = ''
+  meterStaff.value.id = ''
+}
+const technologyJobList = ref<technologyJobType[]>([])
+// 获取技术职务列表
+const getTechnologyJobList = () => {
+  getDictByCode('technologyJob').then((response) => {
+    technologyJobList.value = response.data
+  })
+}
+const administrationJobList = ref<technologyJobType[]>([])
+// 获取行政职务列表
+const getAdministrationJob = () => {
+  getDictByCode('administrationJob').then((response) => {
+    administrationJobList.value = response.data
+  })
+}
+const personListRef = ref()
+// 选择人员
+const selectPerson = () => {
+  personListRef.value.initDialog()
+}
+// 保存选择人员信息
+const confirmPerson = (row: any) => {
+  ruleForm.value.staffId = row.staffNo
+  meterStaff.value = row
+  ruleFormRef.value?.clearValidate('staffNo')
+}
+const changeList = ref([
+  {
+    name: '证书基本信息',
+    data: [] as any[],
+    column: [
+      {
+        label: '证书号',
+        data: 'certificateNo',
+        id: 'zs02',
+      },
+      {
+        label: '证书名称',
+        data: 'certificateName',
+        id: 'zs03',
+      },
+      {
+        label: '发证日期',
+        data: 'certificateDate',
+        id: 'zs04',
+      },
+      {
+        label: '发证单位',
+        data: 'certificateCompany',
+        id: 'zs01',
+      },
+      {
+        label: '有效日期',
+        data: 'validDate',
+        id: 'zs05',
+      },
+    ],
+  },
+  {
+    name: '计量工作培训记录',
+    data: [],
+    column: [],
+  },
+  {
+    name: '业务记录',
+    data: [],
+    column: [],
+  },
+])
+const current = ref('证书基本信息')
+const currentShow = computed(() => {
+  return changeList.value.filter(item => item.name === current.value)[0]
+})
+const certificateRef = ref() // 添加证书信息弹窗
+// 添加行
+const addRow = () => {
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
+}
+// 证书信息行内添加数据
+const addRowcertificate = (row: any, flag: string) => {
+  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
+  if (flag === 'update') {
+    changeList.value[0].data = [{
+      ...changeList.value[0].data[0],
+      ...row,
+      certificateStatus: diff < 0 ? '1' : '0',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    }]
+  }
+  else {
+    changeList.value[0].data.push(
+      {
+        ...row,
+        certificateStatus: diff < 0 ? '1' : '0',
+        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        id: null,
+        isDel: 0,
+        minioFileName: '',
+        remark: '',
+        staffId: meterStaff.value.id,
+        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
+  }
+}
+const currenSelect = ref<number>(-1) // 当前选中行
+// 删除行
+const removeRow = () => {
+  console.log(currenSelect.value)
+  if (currenSelect.value >= 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
+      currenSelect.value = -1
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        let params
+        if (changeList.value[0].data.length) {
+          params = changeList.value[0].data
+        }
+        else {
+          params = [
+            {
+              certificateCompany: '',
+              certificateDate: '',
+              certificateName: '',
+              certificateNo: '',
+              certificateStatus: '',
+              createTime: '',
+              id: null,
+              isDel: 0,
+              minioFileName: '',
+              remark: '',
+              staffId: meterStaff.value.id,
+              updateTime: '',
+              validDate: '',
+            },
+          ]
+        }
+        (title.value === '新建'
+          ? addCertificateList
+          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
+          formEl?.resetFields()
+          ElMessage.success('提交成功')
+          emits('resetData')
+          resetFormData()
+        })
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  changeList.value[0].data = []
+  emits('resetData')
+  resetFormData()
+}
+const selectTreeRef = ref()
+// 弹窗初始化
+const initDialog = (row: any) => {
+  changeList.value[0].data = []
+  resetFormData()
+  dialogVisible.value = true
+  title.value = row.title
+  name.value = row.name
+  selectTreeRef.value.clearSelected()
+  resetFormData()
+  getuser()
+  getPubList()
+  getSexList()
+  geteducationList()
+  getTechnologyJobList()
+  getAdministrationJob()
+  if (row.title === '新建') {
+    console.log()
+  }
+  else {
+    getCertificateDetail({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        meterStaff.value = res.data.meterStaff
+        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+      }
+    })
+  }
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <detail-page :title=" `${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+          完成
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="人员编号" prop="staffNo">
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="selectPerson">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="meterStaff.name">
+              <el-input v-model.trim="meterStaff.name" placeholder="姓名" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="性别" prop="meterStaff.sex">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="文化程度" prop="meterStaff.education">
+              <el-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="技术职务" prop="meterStaff.technologyJob">
+              <el-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="行政职务" prop="meterStaff.administrationJob">
+              <el-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="工作部门" prop="deptId">
+              <el-select v-if="title === '详情'" v-model="meterStaff.deptId" disabled>
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+              <com-tree-select
+                v-else
+                ref="selectTreeRef" v-model="meterStaff.deptId" :options="PubListTree"
+                placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业" prop="major">
+              <el-input v-model.trim="meterStaff.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="从事日期" prop="workDate">
+              <el-date-picker
+                v-model="meterStaff.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择从事日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block :title="current">
+      <template #btns>
+        <el-button v-if="title === '新建'" type="info" @click="removeRow">
+          删除行
+        </el-button>
+        <el-button v-if="title === '新建'" type="primary" @click="addRow">
+          添加行
+        </el-button>
+        <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+          编辑行
+        </el-button>
+      </template>
+      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
+        <el-table-column width="55" align="center">
+          <template #default="scope">
+            <el-radio-group v-model="currenSelect" class="ml-4">
+              <el-radio :label="scope.$index" />
+            </el-radio-group>
+          </template>
+        </el-table-column>
+        <el-table-column type="index" label="序号" width="55" />
+        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </detail-block>
+    <!-- 添加证书信息组件 -->
+    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    <!-- 选择用户列表组件 -->
+    <person-list-dialog ref="personListRef" @add="confirmPerson" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        display: none;
+      }
+    }
+  }
+</style>
+
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 332c73c..178fc12 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -32,6 +32,7 @@
   form.validDate = ''
 }
 const initDialog = (row: any) => {
+  resetData()
   title.value = row.title
   if (row.title === '编辑') {
     form.certificateNo = row.certificateNo
@@ -50,10 +51,12 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       if (title.value === '编辑') {
-        emits('add', form, 'update')
+        const deptRow = JSON.parse(JSON.stringify(form))
+        emits('add', deptRow, 'update')
       }
       else {
-        emits('add', form, '')
+        const deptRow = JSON.parse(JSON.stringify(form))
+        emits('add', deptRow, '')
       }
       dialogFormVisible.value = false
     }
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 592d810..9c6f65d 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -30,7 +30,7 @@
   { text: '技术职务', value: 'technologyJob', align: 'center', width: '140' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '100' },
   { text: '计量专业', value: 'major', align: 'center', width: '100' },
-  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '180' },
   { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '技术考核', value: 'technologyExam', align: 'center', width: '85' },
 ]) // 表格
@@ -63,7 +63,7 @@
   loadingTable.value = true
   getStaffList(searchQuery).then((res) => {
     if (res.code === 200) {
-      res.data.records = res.data.records.map((item: StaffType) => ({ ...item, sex: item.sex == '1' ? '男' : '女', technologyExam: item.technologyExam == '0' ? '已考核' : '未考核' }))
+      res.data.records = res.data.records.map((item: StaffType) => ({ ...item, sex: item.sex == '1' ? '男' : '女', technologyExam: item.technologyExam == '0' ? '已考核' : '未考核', certificateDate: item.certificateDate.split(' ')[0] }))
       list.value = res.data.records
       total.value = Number(res.data.total)
     }
@@ -236,21 +236,11 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="proxy.hasPerm(`/measure/person/list/import`)" type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" type="primary" @click="templateDownload">
-            模板下载
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/list/add`)" type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/list/export`)" type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" type="primary" @click="print">
-            打印
-          </el-button>
+          <icon-button v-if="proxy.hasPerm(`/measure/person/list/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/list/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/list/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index 17b92d3..e44001a 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -295,15 +295,17 @@
         </el-button>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
-      <el-form-item>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer footer">
         <el-button type="primary" @click="submitForm(ruleFormRef)">
           发布
         </el-button>
         <el-button @click="resetForm(ruleFormRef)">
           关闭
         </el-button>
-      </el-form-item>
-    </el-form>
+      </div>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index 3d5c2e3..0926957 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -172,15 +172,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <el-button v-if="proxy.hasPerm('/sys/notice/list/add')" type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/sys/notice/list/export')" type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/sys/notice/list/print')" v-print="printObj" type="primary">
-          打印
-        </el-button>
+        <icon-button v-if="proxy.hasPerm('/sys/notice/list/add')" icon="icon-add" title="新建" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/sys/notice/list/export')" icon="icon-export" title="导出" @click="exportExcelBtn" />
+        <icon-button v-if="proxy.hasPerm('/sys/notice/list/print')" v-print="printObj" icon="icon-print" title="打印" />
       </template>
       <!-- 表格区域 -->
       <normal-table
diff --git a/src/views/system/notice/noticeDetail.vue b/src/views/system/notice/noticeDetail.vue
index 441ef0f..94468d4 100644
--- a/src/views/system/notice/noticeDetail.vue
+++ b/src/views/system/notice/noticeDetail.vue
@@ -97,15 +97,14 @@
         </el-link>
         <span v-else>暂无附件</span>
       </el-form-item>
-      <el-form-item>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer footer">
         <el-button type="primary" @click="submitForm()">
           确认
         </el-button>
-        <!-- <el-button @click="resetForm(ruleFormRef)">
-          关闭
-        </el-button> -->
-      </el-form-item>
-    </el-form>
+      </div>
+    </template>
   </el-dialog>
 </template>
 

diff --git a/src/components.d.ts b/src/components.d.ts
index 6e85584..815d62f 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -16,14 +16,13 @@
     BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default']
     BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
-    Benchcol: typeof import('./components/benchcol/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/DetailPage/index copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
+    DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
diff --git a/src/components/DetailPage/DetailBlockSwitch.vue b/src/components/DetailPage/DetailBlockSwitch.vue
new file mode 100644
index 0000000..4d92074
--- /dev/null
+++ b/src/components/DetailPage/DetailBlockSwitch.vue
@@ -0,0 +1,71 @@
+<script lang="ts" setup name="DetailBlock">
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+})
+
+const slots = useSlots()
+</script>
+
+<template>
+  <div class="detail-main">
+    <div class="header">
+      <div class="menu">
+        <slot name="menu" />
+      </div>
+      <div class="title">
+        {{ title }}
+      </div>
+      <div class="btns">
+        <slot name="btns" />
+      </div>
+    </div>
+    <div v-if="slots.default" class="content">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-main {
+  background-color: #fff;
+  border-radius: 8px;
+  margin-top: 10px;
+  padding-top: 10px;
+
+  .header {
+    position: relative;
+    height: 40px;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+
+    .title {
+      font-weight: 500;
+    }
+
+    .btns {
+      position: absolute;
+      right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+
+    .menu {
+      position: absolute;
+      left: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+
+  .content {
+    background-color: #fff;
+    padding: 0 10px 20px;
+    margin-top: 10px;
+  }
+}
+</style>
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d6c1c91..1644a80 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -314,6 +314,39 @@
       },
     ],
   },
+  {
+    path: '/borrow',
+    component: Layout,
+    redirect: '/device/borrow/borrowapply',
+    name: 'Borrow',
+    meta: {
+      title: '设备领用',
+      icon: 'ep:key',
+      auth: '/device/borrow',
+    },
+    children: [
+      {
+        path: 'borrowapply',
+        name: 'borroWapply',
+        component: () => import('@/views/device/borrow/borrwoApply.vue'),
+        meta: {
+          title: '设备借用申请',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowapply',
+        },
+      },
+      {
+        path: 'borrowhandle',
+        name: 'borrowHandle',
+        component: () => import('@/views/device/borrow/borrowHandle.vue'),
+        meta: {
+          title: '设备借用处理',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowhandle',
+        },
+      },
+    ],
+  },
 
 ]
 
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
new file mode 100644
index 0000000..1c2405e
--- /dev/null
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="borrowHandle">
+// 逻辑代码
+</script>
+
+<template>
+  <app-container>
+    设备借用处理
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
new file mode 100644
index 0000000..03d414b
--- /dev/null
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="borrowApply">
+// 逻辑代码
+</script>
+
+<template>
+  <app-container>
+    设备借用申请
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index c2682fc..5f7b347 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -339,381 +339,374 @@
 
 <template>
   <div class="body-container">
-    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资产编号" prop="assetNo">
-            <el-input v-model.trim="ruleForm.assetNo" placeholder="系统自动生成" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="资产类型" prop="assetType">
-            <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备编号" prop="equipmentNo">
-            <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备名称" prop="equipmentName">
-            <el-input v-model.trim="ruleForm.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="生产厂家" prop="manufacturer">
-            <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="厂家国别" prop="manufacturerCountry">
-            <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="出厂编号" prop="manufacturingNo">
-            <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="出厂年月" prop="manufacturingDate">
-            <el-date-picker
-              v-model="ruleForm.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '出厂年月'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="型号" prop="modelNo">
-            <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="管理状态" prop="managerState">
-            <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="ABC" prop="abc">
-            <el-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'">
-              <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="标签绑定" prop="labelBind">
-            <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === '详情' ? '' : '标签'" :disabled="title === '详情'" clearable>
-              <template #append>
-                <el-button type="primary" size="small">
-                  扫描
-                </el-button>
-              </template>
-            </el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="立卡年月" prop="cardEstablishmentDate">
-            <el-date-picker
-              v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '立卡年月'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="启用日期" prop="enableDate">
-            <el-date-picker
-              v-model="ruleForm.enableDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '启用日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定方式" prop="mesureType">
-            <el-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'">
-              <el-option v-for="item in mesureTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定周期" prop="mesureCycle">
-            <el-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="12">
-          <el-form-item label="测量范围" prop="mesureRange">
-            <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === '详情' ? '' : '测量范围'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="不确定度" prop="uncertainty">
-            <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === '详情' ? '' : '不确定度'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="使用部门" prop="useDept">
-            <com-tree-select
-              v-if="title !== '详情'"
-              v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-              :tree-props="deptProps"
-            />
-            <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
-              <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="使用人" prop="usePerson">
-            <el-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'">
-              <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="专业分类" prop="majorCategory">
-            <el-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'">
-              <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="检定部门" prop="mesureDept">
-            <com-tree-select
-              v-if="title !== '详情'"
-              v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-              :tree-props="deptProps"
-            />
-            <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
-              <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定日期" prop="mesureDate">
-            <el-date-picker
-              v-model="ruleForm.mesureDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '检定日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="有效日期" prop="validDate">
-            <el-date-picker
-              v-model="ruleForm.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '有效日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定结果" prop="mesureResult">
-            <el-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'">
-              <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="8">
-          <el-form-item label="是否是技术指标需要校准/检定的设备" prop="isCalibrationTestEquipment" label-width="260px">
-            <el-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否是测量工装台账" prop="isMeasureAccount" label-width="260px">
-            <el-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否标准配套设备" prop="isStandardSupportEquipment" label-width="260px">
-            <el-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
+    <detail-block-switch title="基本信息">
+      <template #menu>
+        <slot name="menuswitch" />
+      </template>
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资产编号" prop="assetNo">
+              <el-input v-model.trim="ruleForm.assetNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="资产类型" prop="assetType">
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备编号" prop="equipmentNo">
+              <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="生产厂家" prop="manufacturer">
+              <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="厂家国别" prop="manufacturerCountry">
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号" prop="manufacturingNo">
+              <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂年月" prop="manufacturingDate">
+              <el-date-picker
+                v-model="ruleForm.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '出厂年月'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="型号" prop="modelNo">
+              <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="管理状态" prop="managerState">
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="ABC" prop="abc">
+              <el-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'">
+                <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标签绑定" prop="labelBind">
+              <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === '详情' ? '' : '标签'" :disabled="title === '详情'" clearable>
+                <template #append>
+                  <el-button type="primary" size="small">
+                    扫描
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="立卡年月" prop="cardEstablishmentDate">
+              <el-date-picker
+                v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '立卡年月'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="启用日期" prop="enableDate">
+              <el-date-picker
+                v-model="ruleForm.enableDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '启用日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定方式" prop="mesureType">
+              <el-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'">
+                <el-option v-for="item in mesureTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定周期" prop="mesureCycle">
+              <el-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="测量范围" prop="mesureRange">
+              <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === '详情' ? '' : '测量范围'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="不确定度" prop="uncertainty">
+              <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === '详情' ? '' : '不确定度'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="使用部门" prop="useDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
+                :tree-props="deptProps"
+              />
+              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="使用人" prop="usePerson">
+              <el-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'">
+                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="专业分类" prop="majorCategory">
+              <el-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'">
+                <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="检定部门" prop="mesureDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                :tree-props="deptProps"
+              />
+              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定日期" prop="mesureDate">
+              <el-date-picker
+                v-model="ruleForm.mesureDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '检定日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="有效日期" prop="validDate">
+              <el-date-picker
+                v-model="ruleForm.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '有效日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定结果" prop="mesureResult">
+              <el-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'">
+                <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="8">
+            <el-form-item label="是否是技术指标需要校准/检定的设备" prop="isCalibrationTestEquipment" label-width="260px">
+              <el-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否是测量工装台账" prop="isMeasureAccount" label-width="260px">
+              <el-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否标准配套设备" prop="isStandardSupportEquipment" label-width="260px">
+              <el-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资产来源" prop="assetSource">
-            <el-input v-model.trim="ruleForm.assetSource" :placeholder="title === '详情' ? '' : '资产来源'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备规格" prop="equipmentSpecifications">
-            <el-input v-model.trim="ruleForm.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备类别" prop="equipmentCategory">
-            <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
-              <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备类型" prop="equipmentType">
-            <el-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'">
-              <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资本来源" prop="capitalSource">
-            <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
-              <el-option v-for="item in capitalSourceList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="管理级别" prop="managerLevel">
-            <el-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'">
-              <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="用途" prop="purpose">
-            <el-input v-model.trim="ruleForm.purpose" :placeholder="title === '详情' ? '' : '用途'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="技术水平" prop="technicalLevel">
-            <el-input v-model.trim="ruleForm.technicalLevel" :placeholder="title === '详情' ? '' : '技术水平'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="完好状态" prop="intactState">
-            <el-input v-model.trim="ruleForm.intactState" :placeholder="title === '详情' ? '' : '完好状态'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="外形尺寸" prop="overallDimension">
-            <el-input v-model.trim="ruleForm.overallDimension" :placeholder="title === '详情' ? '' : '外形尺寸'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="重量(吨)" prop="weight">
-            <el-input v-model.trim="ruleForm.weight" :placeholder="title === '详情' ? '' : '重量'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="单价" prop="singlePrice">
-            <el-input v-model.trim="ruleForm.singlePrice" :placeholder="title === '详情' ? '' : '单价'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="安装及杂费" prop="installIncidentalExpenses">
-            <el-input v-model.trim="ruleForm.installIncidentalExpenses" :placeholder="title === '详情' ? '' : '安装及杂费'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="安装地点" prop="installPlace">
-            <el-input v-model.trim="ruleForm.installPlace" :placeholder="title === '详情' ? '' : '安装地点'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="原值" prop="originValue">
-            <el-input v-model.trim="ruleForm.originValue" :placeholder="title === '详情' ? '' : '原值'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="目前原值" prop="presentOriginValue">
-            <el-input v-model.trim="ruleForm.presentOriginValue" :placeholder="title === '详情' ? '' : '目前原值'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="折旧年限" prop="depreciationPeriod">
-            <el-input v-model.trim="ruleForm.depreciationPeriod" :placeholder="title === '详情' ? '' : '折旧年限'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="折旧方法" prop="depreciationMethod">
-            <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
-              <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="属性" prop="attribute">
-            <el-input v-model.trim="ruleForm.attribute" placeholder="属性" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="12">
-          <el-form-item label="说明书" prop="minioFileName">
-            <show-photo :minio-file-name="ruleForm.fileList[0]?.minioFileName || ''" />
-            <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
-            <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
-              {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
-            </el-button>
-            <span v-if="title === '详情' && !ruleForm.fileList[0]?.minioFileName">暂无</span>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="24">
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" placeholder="备注" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资产来源" prop="assetSource">
+              <el-input v-model.trim="ruleForm.assetSource" :placeholder="title === '详情' ? '' : '资产来源'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备规格" prop="equipmentSpecifications">
+              <el-input v-model.trim="ruleForm.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备类别" prop="equipmentCategory">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+                <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备类型" prop="equipmentType">
+              <el-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'">
+                <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资本来源" prop="capitalSource">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+                <el-option v-for="item in capitalSourceList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="管理级别" prop="managerLevel">
+              <el-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'">
+                <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="用途" prop="purpose">
+              <el-input v-model.trim="ruleForm.purpose" :placeholder="title === '详情' ? '' : '用途'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="技术水平" prop="technicalLevel">
+              <el-input v-model.trim="ruleForm.technicalLevel" :placeholder="title === '详情' ? '' : '技术水平'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="完好状态" prop="intactState">
+              <el-input v-model.trim="ruleForm.intactState" :placeholder="title === '详情' ? '' : '完好状态'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="外形尺寸" prop="overallDimension">
+              <el-input v-model.trim="ruleForm.overallDimension" :placeholder="title === '详情' ? '' : '外形尺寸'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="重量(吨)" prop="weight">
+              <el-input v-model.trim="ruleForm.weight" :placeholder="title === '详情' ? '' : '重量'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="单价" prop="singlePrice">
+              <el-input v-model.trim="ruleForm.singlePrice" :placeholder="title === '详情' ? '' : '单价'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="安装及杂费" prop="installIncidentalExpenses">
+              <el-input v-model.trim="ruleForm.installIncidentalExpenses" :placeholder="title === '详情' ? '' : '安装及杂费'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="安装地点" prop="installPlace">
+              <el-input v-model.trim="ruleForm.installPlace" :placeholder="title === '详情' ? '' : '安装地点'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="原值" prop="originValue">
+              <el-input v-model.trim="ruleForm.originValue" :placeholder="title === '详情' ? '' : '原值'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="目前原值" prop="presentOriginValue">
+              <el-input v-model.trim="ruleForm.presentOriginValue" :placeholder="title === '详情' ? '' : '目前原值'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="折旧年限" prop="depreciationPeriod">
+              <el-input v-model.trim="ruleForm.depreciationPeriod" :placeholder="title === '详情' ? '' : '折旧年限'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="折旧方法" prop="depreciationMethod">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+                <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="属性" prop="attribute">
+              <el-input v-model.trim="ruleForm.attribute" placeholder="属性" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="说明书" prop="minioFileName">
+              <show-photo :minio-file-name="ruleForm.fileList[0]?.minioFileName || ''" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
+                {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
+              </el-button>
+              <span v-if="title === '详情' && !ruleForm.fileList[0]?.minioFileName">暂无</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" placeholder="备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block-switch>
   </div>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    padding-top: 20px;
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index f46553a..fc3fd54 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -360,20 +360,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          固定资产-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`固定资产-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -763,44 +758,11 @@
           </el-row>
         </div> -->
       </el-form>
-    </div>
+    </detail-page>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index 0abbdb1..6e88e96 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -74,33 +74,29 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ name }} -{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm">
-            关闭
-          </el-button>
-        </span>
-      </div>
-      <div class="body">
-        <!-- 三级菜单 -->
-        <el-radio-group v-model="current">
-          <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
-            {{ item.name }}
-          </el-radio-button>
-        </el-radio-group>
-      </div>
-      <!-- 展示区域 -->
-      <keep-alive>
-        <component :is="currentComp" ref="currentCompRef" :name="current" :title="title" :row="row" />
-      </keep-alive>
-    </div>
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <!-- 展示区域 -->
+    <keep-alive>
+      <component :is="currentComp" ref="currentCompRef" :name="current" :title="title" :row="row">
+        <template #menuswitch>
+          <!-- 三级菜单 -->
+          <el-radio-group v-model="current">
+            <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+              {{ item.name }}
+            </el-radio-button>
+          </el-radio-group>
+        </template>
+      </component>
+    </keep-alive>
   </app-container>
 </template>
 
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f9cdcd0..f653095 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -256,7 +256,7 @@
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
-  // 原生上传图片
+  // 原生上传
   // console.log(event.target.files)
   // if (event.target.files[0].type === 'application/pdf') {
   if (event.target.files?.length !== 0) {
@@ -354,7 +354,7 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" type="primary" @click="identify">
+          <!-- <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" type="primary" @click="identify">
             标签识别
           </el-button>
           <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/import`)" type="primary" @click="batchImport">
@@ -371,7 +371,13 @@
           </el-button>
           <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/print`)" v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/device/standingBook/components/templateTable.vue b/src/views/device/standingBook/components/templateTable.vue
index 8a928f0..7aa563f 100644
--- a/src/views/device/standingBook/components/templateTable.vue
+++ b/src/views/device/standingBook/components/templateTable.vue
@@ -245,11 +245,11 @@
   <div>
     <!-- 添加证书信息组件 -->
     <add-row ref="addRowRef" @add="addRowData" />
-    <div class="header">
-      <div class="title">
-        <!-- {{ $props.name }} -->
-      </div>
-      <span class="btns">
+    <detail-block-switch :title="name">
+      <template #menu>
+        <slot name="menuswitch" />
+      </template>
+      <template #btns>
         <el-button v-if="title !== '详情'" type="info" @click="removeRow">
           删除行
         </el-button>
@@ -259,55 +259,33 @@
         <el-button v-if="title !== '详情'" type="primary" @click="editRow">
           编辑行
         </el-button>
-      </span>
-    </div>
-    <!-- 表格区域 -->
-    <normal-table
-      id="print"
-      :data="list" :total="total" :columns="columns as any"
-      :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-      :list-loading="loadingTable"
-      style="padding-top: 20px;background-color: #fff;"
-      @change="changePage"
-    >
-      <template #preColumns>
-        <el-table-column label="" width="55" align="center">
-          <template #default="scope">
-            <el-radio v-model="select" :label="scope.$index" class="radio" />
-          </template>
-        </el-table-column>
-        <el-table-column label="序号" width="55" align="center">
-          <template #default="scope">
-            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-          </template>
-        </el-table-column>
       </template>
-    </normal-table>
+      <!-- 表格区域 -->
+      <normal-table
+        id="print"
+        :data="list" :total="total" :columns="columns as any"
+        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+        :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </detail-block-switch>
   </div>
 </template>
 
 <style lang="scss" scoped>
-.header {
-  background-color: #fff;
-  // height: 40px;
-  border-radius: 8px;
-  display: flex;
-  align-items: center;
-  flex-direction: column;
-  justify-content: center;
-  position: relative;
-
-  .title {
-    // font-weight: 700;
-  }
-
-  .btns {
-    position: absolute;
-    right: 40px;
-    top: -22px;
-  }
-}
-
 :deep(.el-radio__label) {
   display: none;
 }
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 7538bc8..78a3800 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -272,24 +272,12 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/identify`)" type="primary" @click="identify">
-            标签识别
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/import`)" type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/mould`)" type="primary" @click="templateDownload">
-            模板下载
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/add`)" type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/export`)" type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/print`)" v-print="printObj" type="primary">
-            打印
-          </el-button>
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/identify`)" icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index fc364c8..e74d70e 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -361,20 +361,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ name }} - {{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -458,73 +453,33 @@
           </el-col>
         </el-row>
       </el-form>
-      <div v-if="title !== '新建' ">
-        <div class="header" style="margin-top: 10px;">
-          <div class="title">
-            审批流程
-          </div>
-        </div>
-        <div class="timeline">
-          <el-timeline>
-            <el-timeline-item timestamp="2018/4/12" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/12 20:46</p>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="2018/4/3" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/3 20:46</p>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="2018/4/2" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/2 20:46</p>
-              </el-card>
-            </el-timeline-item>
-          </el-timeline>
-        </div>
-      </div>
-    </div>
+    </detail-page>
+    <detail-block v-if="title !== '新建' " title="审批流程">
+      <el-timeline>
+        <el-timeline-item timestamp="2018/4/12" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/12 20:46</p>
+          </el-card>
+        </el-timeline-item>
+        <el-timeline-item timestamp="2018/4/3" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/3 20:46</p>
+          </el-card>
+        </el-timeline-item>
+        <el-timeline-item timestamp="2018/4/2" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/2 20:46</p>
+          </el-card>
+        </el-timeline-item>
+      </el-timeline>
+    </detail-block>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .timeline {
   background-color: #fff;
 }
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index aa3963f..737568d 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -1,6 +1,6 @@
 <!-- 状态管理公共列表组件 -->
 <script lang="ts" setup>
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessageBox } from 'element-plus'
 import approve from './approvalActionDialog.vue'
 import addDialog from './templateAdd.vue'
 const props = defineProps({
@@ -142,7 +142,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: any) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     title: '详情',
@@ -150,7 +150,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: any) => {
   dialogVisible.value = true
   // addRef.value.initDialog({
   //   title: '编辑',
@@ -158,7 +158,7 @@
   // })
 }
 // 删除
-const remove = (row) => {
+const remove = (row: any) => {
   ElMessageBox.confirm(
     `确认删除${row.equipmentName}吗？`,
     '提示',
@@ -181,20 +181,20 @@
   // })
 }
 // 同意
-const agree = (row) => {
+const agree = (row: any) => {
   console.log(approveRef.value)
   approveRef.value.initDialog({
     radio: '1',
   })
 }
 // 驳回
-const reject = (row) => {
+const reject = (row: any) => {
   approveRef.value.initDialog({
     radio: '3',
   })
 }
 // 拒绝
-const refuse = (row) => {
+const refuse = (row: any) => {
   approveRef.value.initDialog(
     {
       radio: '2',
@@ -202,7 +202,7 @@
   )
 }
 // 取消
-const cancel = (row) => {
+const cancel = (rowrow: any) => {
   ElMessageBox.confirm(
     '确认取消吗？',
     '提示',
@@ -301,20 +301,20 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+          <el-input placeholder="申请编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="设备编号" clearable class="w-50 m-2" />
+          <el-input placeholder="设备编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.modelNo" placeholder="设备名称" clearable class="w-50 m-2" />
+          <el-input placeholder="设备名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请单位" clearable class="w-50 m-2" />
+          <el-input placeholder="申请单位" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.publisher" placeholder="申请状态" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" />
+          <el-select placeholder="申请状态" clearable>
+            <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" /> -->
           </el-select>
         </search-item>
       </search-area>
@@ -328,7 +328,10 @@
           <el-button type="primary" @click="templateDownload">
             模板下载
           </el-button> -->
-          <el-button type="primary" @click="add">
+          <icon-button icon="icon-add" title="新建" @click="add" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+          <!-- <el-button type="primary" @click="add">
             新建
           </el-button>
           <el-button type="primary" @click="exportExcelBtn">
@@ -336,7 +339,7 @@
           </el-button>
           <el-button v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
         </template>
         <!-- 表格区域 -->
         <normal-table
@@ -386,22 +389,3 @@
     </app-container>
   </div>
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 154px !important;
-}
-
-.normal-date {
-  width: 154px !important;
-}
-
-.normal-select {
-  width: 154px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
-
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 0763c5a..9ef0b93 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -19,7 +19,6 @@
 const effectiveStatusName = ref('')
 const title = ref('')
 const fileList = ref<UploadUserFile[]>([])
-console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -80,10 +79,9 @@
   if (row.title === '新建') {
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
-    ruleForm.publisher = ''
+    ruleForm.publisher = userInfo.$state.deptName
     ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 判断有无存储
-    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
     if (sessionStorage.getItem(fileTypeName.value)) {
       const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
       ruleForm.fileType = session.fileType
@@ -117,6 +115,8 @@
     ruleForm.remark = row.remark
     ruleForm.publishTime = row.publishTime
     ruleForm.minioFileName = row.minioFileName
+    // ruleForm.publisher = '0'
+    // ruleForm.createUserId = '1'
   }
 }
 defineExpose({ initDialog })
@@ -148,6 +148,9 @@
       type: 'warning',
     },
       ).then((res) => {
+        if (ruleForm.publisher === userInfo.$state.deptName) {
+          ruleForm.publisher === userInfo.$state.deptId
+        }
         if (flag == '提交') {
           addApi(ruleForm).then((res) => {
             if (res.code == 200) {
@@ -193,7 +196,6 @@
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        console.log(res.data[0])
         ruleForm.minioFileName = res.data[0]
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
@@ -216,7 +218,6 @@
 // ])
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
-  console.log(diffDat)
   if (diffDat < 0) {
     // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '在使用'
@@ -237,7 +238,7 @@
 
 <template>
   <app-container v-if="dialogVisible" style="overflow: hidden;">
-    <detail-page :title="`${title}${fileTypeName}`">
+    <detail-page :title="`${fileTypeName}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
           提交
@@ -278,12 +279,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="发布单位" prop="publisher">
-              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'" class="fill-input">
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled>
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
               <com-tree-select
                 v-else
-                v-model="ruleForm.publisher" :options="PubListTree" placeholder="选择组织机构"
+                v-model="ruleForm.publisher" :options="PubListTree" placeholder="请选择发布单位"
                 :tree-props="deptProps"
               />
             </el-form-item>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 44e3e4d..b45fbc3 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -324,22 +324,9 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <!-- <el-button type="primary" @click="batchImport">
-            批量导入
-          </el-button> -->
-          <!-- <el-button type="primary" @click="templateDownload">
-            模板下载
-          </el-button> -->
-          <!-- <el-button type="primary" @click="add">
-            新建
-          </el-button> -->
-          <el-button type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-print="printObj" type="primary">
-            打印
-          </el-button>
+          <!-- <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange"> -->
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 4677e48..7d4724b 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -204,13 +204,9 @@
     loading.close()
   })
 }
-// 打印
-const print = () => {
-
-}
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
-  // 原生上传图片
+  // 原生上传
   // console.log(event.target.files)
   // if (event.target.files[0].type === 'application/pdf') {
   if (event.target.files?.length !== 0) {
@@ -264,7 +260,7 @@
         <search-item>
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
-        <search-item>
+        <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
@@ -273,13 +269,13 @@
               :value="item.value"
             />
           </el-select>
-        </search-item>
+        </search-item> -->
         <search-item>
           <el-date-picker
             v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 155px;"
+            style="width: 185px;"
           />
         </search-item>
         <search-item>
@@ -287,19 +283,19 @@
             v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 155px;"
+            style="width: 185px;"
           />
         </search-item>
         <search-item>
-          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select> -->
-          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
+          </el-select>
+          <!-- <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" /> -->
         </search-item>
       </search-area>
       <table-container>
@@ -310,7 +306,7 @@
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
-          <icon-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" @click="print" />
+          <icon-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index cf0dd4f..5ca3275 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -3,11 +3,11 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { detailType } from '../measureDept-interface'
-import { getUserList } from '@/api/system/user'
+// import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
+import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import type { userType } from '@/views/system/user/user-interface'
 import { listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
-import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
 const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -31,11 +31,20 @@
   technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
+// 获取计量人员列表
 const getuser = () => {
-  getUserList({ offset: 1, limit: 99999 }).then((res) => {
-    userList.value = res.data.rows
+  getStaffList({
+    staffNo: '', // 人员编号
+    name: '', // 姓名
+    deptId: ruleForm.value.deptId, // 所在部门
+    limit: 999999,
+    offset: 1,
+  }).then((res) => {
+    if (res.code === 200) {
+      userList.value = res.data.records
+    }
   })
-} // 获取用户列表
+}
 const technologyJobList = ref<{ id: string;name: string;value: string }[]>([])
 // 获取技术职务列表
 const getTechnologyJobList = () => {
@@ -50,7 +59,16 @@
     administrationJobList.value = response.data
   })
 }
-
+// 选择负责人自动填充职务信息
+const directorChange = (val: string) => {
+  const selectUser = userList.value.filter(item => item.name === val)[0]
+  getStaffDetail(selectUser).then((res) => {
+    if (res.code === 200) {
+      ruleForm.value.administrationJob = res.data.administrationJob
+      ruleForm.value.technologyJob = res.data.technologyJob
+    }
+  })
+}
 // 提交
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
@@ -95,12 +113,6 @@
 const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
-// const searchQuery = ref({
-//   limit: 10,
-//   offset: 1,
-//   total: 0,
-//   pageSizes: [10, 20, 30],
-// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -410,20 +422,6 @@
     }
   })
 }
-// const handleSizeChange = (val: number) => {
-//   searchQuery.value.limit = val
-//   getDepartmentList()
-//   getuserInfoList()
-//   getInstrumentInfo()
-//   getDeviceInfo()
-// }
-// const handleCurrentChange = (val: number) => {
-//   searchQuery.value.offset = val
-//   getDepartmentList()
-//   getuserInfoList()
-//   getInstrumentInfo()
-//   getDeviceInfo()
-// }
 // 弹窗初始化
 const initDialog = (row: any) => {
   reset()
@@ -460,22 +458,17 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title.split('-')[2] === '编辑'" type="primary" @click="submitForm(ruleFormRef)">
-            提交
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="title">
+      <template #btns>
+        <el-button v-if="title.split('-')[2] === '编辑'" type="primary" @click="submitForm(ruleFormRef)">
+          提交
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title.split('-')[2] === '详情' ? 'isDetail' : '']">
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item :label=" `${title.split('-')[1]}编号`" prop="organizeNo">
               <el-input v-model.trim="ruleForm.organizeNo" placeholder="系统自动生成" disabled />
@@ -487,7 +480,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="title.split('-')[1] === '工程组'" :gutter="24" class="marg">
+        <el-row v-if="title.split('-')[1] === '工程组'" :gutter="24">
           <el-col :span="6">
             <el-form-item label="科室编号">
               <el-input v-model.trim="ruleForm.pDeptId" disabled />
@@ -509,10 +502,10 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
-              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" @change="directorChange">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.name" />
               </el-select>
             </el-form-item>
@@ -532,7 +525,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="24">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
               <el-input v-model.trim="ruleForm.remark" :placeholder="title.split('-')[2] === '详情' ? '' : '备注'" :disabled="title.split('-')[2] === '详情'" />
@@ -540,85 +533,24 @@
           </el-col>
         </el-row>
       </el-form>
-      <!-- 科室信息-人员信息等列表切换 -->
-      <div>
-        <div class="header" style="margin-top: 10px;">
-          <!-- 切换 -->
-          <el-radio-group v-model="current" class="change-btn">
-            <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
-              {{ item.name }}
-            </el-radio-button>
-          </el-radio-group>
-          <div class="title">
-            {{ current }}
-          </div>
-          <span class="btns">
-          <!-- <el-button type="info" :disabled="title === '详情'" @click="removeRow">
-            删除行
-          </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
-            添加行
-          </el-button> -->
-          </span>
-        </div>
-        <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <el-table-column type="index" label="序号" width="55" align="center" />
-          <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
-        </el-table>
-        <!-- <div style="width: 100%;margin-top: 10px;">
-          <el-pagination
-            :current-page="searchQuery.offset"
-            :page-sizes="searchQuery.pageSizes"
-            :page-size="searchQuery.limit"
-            :total="searchQuery.total"
-            layout="total, sizes, prev, pager, next"
-            hide-on-single-page
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-          />
-        </div> -->
-      </div>
-    </div>
+    </detail-page>
+    <detail-block-switch :title="current">
+      <template #menu>
+        <el-radio-group v-model="current" class="change-btn">
+          <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
+            {{ item.name }}
+          </el-radio-button>
+        </el-radio-group>
+      </template>
+      <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
+        <el-table-column type="index" label="序号" width="55" align="center" />
+        <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </detail-block-switch>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-    position: relative;
-
-    .change-btn {
-      position: absolute;
-      left: 40px;
-      top: 4px;
-    }
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 4px;
-    }
-  }
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
@@ -628,8 +560,4 @@
     }
   }
 }
-
-.marg {
-  margin-top: 10px;
-}
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 9ad87af..aac1ef2 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -231,12 +231,14 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
+          <!-- <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
           <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
+          <icon-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 2e3322a..3f472eb 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -41,7 +41,7 @@
   { text: '证书号', value: 'certificateNo', align: 'center' },
   { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
   { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'validDate', align: 'center', width: '200' },
   { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
 ]) // 表格
 const certificateStatusList = ref([
@@ -90,7 +90,7 @@
   loadingTable.value = true
   getCertificateList(searchQuery).then((res) => {
     if (res.code === 200) {
-      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效' }))
+      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效', validDate: item.validDate.split(' ')[0], certificateDate: item.certificateDate.split(' ')[0] }))
       list.value = res.data.records
       total.value = Number(res.data.total)
     }
@@ -115,6 +115,7 @@
   addRef.value.initDialog({
     ...row,
     title: '详情',
+    name: props.isRemind ? '证书状况' : '证书记录',
   })
 }
 // 编辑
@@ -123,6 +124,7 @@
   addRef.value.initDialog({
     ...row,
     title: '编辑',
+    name: props.isRemind ? '证书状况' : '证书记录',
   })
 }
 
@@ -193,6 +195,7 @@
   dialogVisible.value = true
   addRef.value.initDialog({
     title: '新建',
+    name: props.isRemind ? '证书状况' : '证书记录',
   })
 }
 // 导出
@@ -292,21 +295,11 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
-            模板下载
-          </el-button>
-          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
-            打印
-          </el-button>
+          <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
@@ -325,7 +318,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column fixed="right" label="操作" align="center" width="150">
+            <el-table-column fixed="right" label="操作" align="center" width="180">
               <template #default="{ row }">
                 <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
                   提醒
@@ -336,7 +329,7 @@
                 <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 4dc1b17..4352604 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -69,7 +69,16 @@
     const IdCard = ruleForm.value.idCard
     const birthday = `${IdCard.substring(6, 10)}-${IdCard.substring(10, 12)}`
     ruleForm.value.birthday = birthday
-    console.log(ruleForm.value)
+    // 获取性别 第17位  奇数为男 偶数为女
+    // ruleForm.value.sex
+    if (Number(IdCard.substring(16, 17)) % 2) {
+      // 男
+      ruleForm.value.sex = '1'
+    }
+    else {
+      //  女
+      ruleForm.value.sex = '2'
+    }
   })
 }
 const dialogVisible = ref<boolean>(false) // 弹窗显示
@@ -130,7 +139,6 @@
     technologyExam: '', // 技术考核
     remark: '', // 备注
     certificateList: [], // 证书列表
-
   }
 }
 const technologyJobList = ref<technologyJobType[]>([])
@@ -309,7 +317,7 @@
           }
           (title.value === '新建'
             ? getStaffAdd
-            : getStaffupdate) ({ ...ruleForm.value, certificateList: changeList.value[0].data }).then((res) => {
+            : getStaffupdate) ({ ...ruleForm.value, certificateList: changeList.value[0].data, birthday: `${ruleForm.value.idCard.substring(6, 10)}-${ruleForm.value.idCard.substring(10, 12)}-${ruleForm.value.idCard.substring(12, 14)}` }).then((res) => {
             if (res.code == 200) {
               formEl?.resetFields()
               ElMessage.success('提交成功')
@@ -332,12 +340,14 @@
   emits('resetData')
   resetFormData()
 }
+const selectTreeRef = ref()
 // 弹窗初始化
 const initDialog = (row: any) => {
   changeList.value[0].data = []
   dialogVisible.value = true
   title.value = row.title
   resetFormData()
+  selectTreeRef.value?.clearSelected()
   getuser()
   getPubList()
   getSexList()
@@ -370,20 +380,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          计量人员-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
-            完成
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`计量人员-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+          完成
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
         <el-row :gutter="24" class="marg">
           <el-col :span="5">
@@ -394,6 +399,7 @@
                 :http-request="uploadQuarterlyEvaluateFile"
                 :before-upload="beforeAvatarUpload"
                 :disabled="title === '详情'"
+                accept="image/png, image/jpeg,image/jpg"
               >
                 <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
                 <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
@@ -425,8 +431,8 @@
               </el-select>
               <com-tree-select
                 v-else
-                v-model="ruleForm.deptId" :options="PubListTree" placeholder="选择组织机构"
-                :tree-props="deptProps"
+                ref="selectTreeRef" v-model="ruleForm.deptId" :options="PubListTree"
+                placeholder="选择组织机构" :tree-props="deptProps"
               />
             </el-form-item>
             <el-form-item label="计量专业" prop="major" class="marg-item">
@@ -489,29 +495,19 @@
           </el-col>
         </el-row>
       </el-form>
-      <!-- 证书基本信息 -->
-      <!-- 切换 -->
-      <!-- <el-radio-group v-model="current" style="margin-bottom: -15px;">
-          <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
-            {{ item.name }}
-          </el-radio-button>
-        </el-radio-group> -->
-      <div class="header" style="margin-top: 10px;">
-        <div class="title">
-          {{ current }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="info" @click="removeRow">
-            删除行
-          </el-button>
-          <el-button v-if="title !== '详情'" type="primary" @click="addRow">
-            添加行
-          </el-button>
-          <el-button v-if="title !== '详情'" type="primary" @click="editRow">
-            编辑行
-          </el-button>
-        </span>
-      </div>
+    </detail-page>
+    <detail-block :title="current">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="info" @click="removeRow">
+          删除行
+        </el-button>
+        <el-button v-if="title !== '详情'" type="primary" @click="addRow">
+          添加行
+        </el-button>
+        <el-button v-if="title !== '详情'" type="primary" @click="editRow">
+          编辑行
+        </el-button>
+      </template>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
         <el-table-column width="55" align="center">
           <template #default="scope">
@@ -523,7 +519,7 @@
         <el-table-column type="index" label="序号" width="55" />
         <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
       </el-table>
-    </div>
+    </detail-block>
     <!-- 添加证书信息组件 -->
     <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
     <!-- 选择用户列表组件 -->
@@ -532,77 +528,38 @@
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    background-color: #fff;
-    border-radius: 8px;
-    padding-top: 10px;
-    margin-top: 10px;
-    padding-right: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    display: flex;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    position: relative;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 5px;
-    }
-  }
-
-  :deep(.el-radio__label) {
-    display: none;
-  }
-
-  :deep(.el-icon.avatar-uploader-icon) {
-    font-size: 28px;
-    color: #8c939d;
-    width: 190px;
-    height: 250px;
-    text-align: center;
-  }
-
-  :deep(.avatar-uploader .avatar) {
-    width: 190px;
-    height: 250px;
-    display: block;
-  }
-
-  .isDetail {
-    ::v-deep {
-      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-        display: none;
-      }
-    }
-  }
+:deep(.el-radio__label) {
+  display: none;
 }
 
-.marg {
-  margin-top: 20px;
+:deep(.el-icon.avatar-uploader-icon) {
+  font-size: 28px;
+  color: #8c939d;
+  width: 190px;
+  height: 250px;
+  text-align: center;
 }
 
-.marg-item {
-  margin-top: 20px;
+:deep(.avatar-uploader .avatar) {
+  width: 190px;
+  height: 250px;
+  display: block;
+}
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
 }
 </style>
 
 <style scoped>
 .avatar-uploader .avatar {
-  width: 220px;
-  height: 320px;
+  width: 190px;
+  height: 250px;
   display: block;
 }
 </style>
@@ -624,8 +581,8 @@
 .el-icon.avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
-  width: 220px;
-  height: 320px;
+  width: 190px;
+  height: 250px;
   text-align: center;
 }
 </style>
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index ae48f11..042636e 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -4,7 +4,6 @@
 import dayjs from 'dayjs'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import type { technologyJobType } from '../person-interface'
-import certificateAddDialog from './certificateAddDialog.vue'
 import personListDialog from './personListDialog.vue'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
@@ -14,7 +13,8 @@
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
-const ruleFormRef = ref<FormInstance>() // from组件
+const ruleFormRef1 = ref<FormInstance>() // from组件
+const ruleFormRef2 = ref<FormInstance>() // from组件
 const meterStaff = ref({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -28,26 +28,43 @@
   workDate: '', // 从事日期
   id: '',
 })
+const baseInfo = ref({
+  certificateCompany: '',
+  certificateDate: '',
+  certificateName: '',
+  certificateNo: '',
+  validDate: '',
+  id: '',
+  isDel: 0,
+  minioFileName: '',
+  remark: '',
+})
 const ruleForm = ref({
   meterStaff: {}, // 人员信息
   staffId: '', // 计量人员id
 }) // 表单
-const multipleTableRef = ref<InstanceType<typeof ElTable>>()
 const title = ref('')
+const name = ref('')
 // 身份证号码验证规则
-const validateIDcard = (rule: any, value: any, callback: any) => {
-  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
-  if (rr.test(value)) {
-    callback()
-  }
-  else {
-    callback(new Error('验证失败'))
-  }
-}
+// const validateIDcard = (rule: any, value: any, callback: any) => {
+//   const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+//   if (rr.test(value)) {
+//     callback()
+//   }
+//   else {
+//     callback(new Error('验证失败'))
+//   }
+// }
 const rules = ref({
   staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
   // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
-
+}) // 表单验证规则
+const rules2 = ref({
+  certificateCompany: [{ required: true, message: '发证单位不能为空', trigger: 'blur' }],
+  certificateDate: [{ required: true, message: '发证日期不能为空', trigger: 'blur' }],
+  certificateName: [{ required: true, message: '证书名称不能为空', trigger: 'blur' }],
+  certificateNo: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
+  validDate: [{ required: true, message: '有效日期不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
 const userList = ref<userType[]>([]) // 可使用人列表
@@ -96,6 +113,17 @@
   meterStaff.value.major = ''
   meterStaff.value.workDate = ''
   meterStaff.value.id = ''
+  baseInfo.value = {
+    certificateCompany: '',
+    certificateDate: '',
+    certificateName: '',
+    certificateNo: '',
+    validDate: '',
+    id: '',
+    isDel: 0,
+    minioFileName: '',
+    remark: '',
+  }
 }
 const technologyJobList = ref<technologyJobType[]>([])
 // 获取技术职务列表
@@ -120,98 +148,14 @@
 const confirmPerson = (row: any) => {
   ruleForm.value.staffId = row.staffNo
   meterStaff.value = row
-  ruleFormRef.value?.clearValidate('staffNo')
+  ruleFormRef1.value?.clearValidate('staffNo')
 }
-const changeList = ref([
-  {
-    name: '证书基本信息',
-    data: [] as any[],
-    column: [
-      {
-        label: '证书号',
-        data: 'certificateNo',
-        id: 'zs02',
-      },
-      {
-        label: '证书名称',
-        data: 'certificateName',
-        id: 'zs03',
-      },
-      {
-        label: '发证日期',
-        data: 'certificateDate',
-        id: 'zs04',
-      },
-      {
-        label: '发证单位',
-        data: 'certificateCompany',
-        id: 'zs01',
-      },
-      {
-        label: '有效日期',
-        data: 'validDate',
-        id: 'zs05',
-      },
-    ],
-  },
-  {
-    name: '计量工作培训记录',
-    data: [],
-    column: [],
-  },
-  {
-    name: '业务记录',
-    data: [],
-    column: [],
-  },
-])
-const current = ref('证书基本信息')
-const currentShow = computed(() => {
-  return changeList.value.filter(item => item.name === current.value)[0]
-})
-const certificateRef = ref() // 添加证书信息弹窗
-// 添加行
-const addRow = () => {
-  certificateRef.value.initDialog({ title: '添加' })
-}
-// 编辑行
-const editRow = () => {
-  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
-}
-// 证书信息行内添加数据
-const addRowcertificate = (row: any, flag: string) => {
-  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
-  if (flag === 'update') {
-    changeList.value[0].data = [{
-      ...changeList.value[0].data[0],
-      ...row,
-      certificateStatus: diff < 0 ? '1' : '0',
-      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-    }]
-  }
-  else {
-    changeList.value[0].data.push(
-      {
-        ...row,
-        certificateStatus: diff < 0 ? '1' : '0',
-        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-        id: null,
-        isDel: 0,
-        minioFileName: '',
-        remark: '',
-        staffId: meterStaff.value.id,
-        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-      })
-  }
-}
-const currenSelect = ref<number>(-1) // 当前选中行
-// 删除行
-const removeRow = () => {
-  console.log(currenSelect.value)
-  if (currenSelect.value >= 0) {
+// 提交
+const submitForm = async (formEl1: FormInstance | undefined, formEl2: FormInstance | undefined) => {
+  if (!formEl1 || !formEl2) { return }
+  Promise.all([formEl1.validate(), formEl2.validate()]).then((res) => {
     ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
+      '确认提交吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -219,78 +163,49 @@
         type: 'warning',
       },
     ).then(() => {
-      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
-      currenSelect.value = -1
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 提交
-const submitForm = async (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  await formEl.validate((valid, fields) => {
-    if (valid) {
-      ElMessageBox.confirm(
-        '确认提交吗？',
-        '提示',
-        {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        },
-      ).then(() => {
-        let params
-        if (changeList.value[0].data.length) {
-          params = changeList.value[0].data
-        }
-        else {
-          params = [
-            {
-              certificateCompany: '',
-              certificateDate: '',
-              certificateName: '',
-              certificateNo: '',
-              certificateStatus: '',
-              createTime: '',
-              id: null,
-              isDel: 0,
-              minioFileName: '',
-              remark: '',
-              staffId: meterStaff.value.id,
-              updateTime: '',
-              validDate: '',
-            },
-          ]
-        }
-        (title.value === '新建'
-          ? addCertificateList
-          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
-          formEl?.resetFields()
-          ElMessage.success('提交成功')
-          emits('resetData')
-          resetFormData()
-        })
+      (title.value === '新建'
+        ? addCertificateList
+        : getCertificateUpdate)(title.value === '新建'
+        ? [{
+            ...baseInfo.value,
+            staffId: meterStaff.value.id,
+            createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+            updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+            certificateStatus: dayjs(baseInfo.value.validDate).diff(baseInfo.value.certificateDate, 'day') < 0 ? '1' : '0',
+            meterStaff: undefined,
+          }]
+        : {
+            ...baseInfo.value,
+            staffId: meterStaff.value.id,
+            createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+            updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+            certificateStatus: dayjs(baseInfo.value.validDate).diff(baseInfo.value.certificateDate, 'day') < 0 ? '1' : '0',
+            meterStaff: undefined,
+          }).then((res) => {
+        formEl1?.resetFields()
+        formEl2?.resetFields()
+        ElMessage.success('提交成功')
+        emits('resetData')
+        resetFormData()
       })
-    }
+    })
   })
 }
 // 取消
-const resetForm = (formEl: FormInstance | undefined) => {
+const resetForm = (formEl: FormInstance | undefined, formEl2: FormInstance | undefined) => {
   formEl?.resetFields()
-  changeList.value[0].data = []
+  formEl2?.resetFields()
   emits('resetData')
   resetFormData()
 }
+const selectTreeRef = ref()
 // 弹窗初始化
 const initDialog = (row: any) => {
-  changeList.value[0].data = []
   resetFormData()
   dialogVisible.value = true
   title.value = row.title
-  resetFormData()
+  name.value = row.name
+  selectTreeRef.value?.clearSelected()
   getuser()
   getPubList()
   getSexList()
@@ -303,8 +218,9 @@
   else {
     getCertificateDetail({ id: row.id }).then((res) => {
       if (res.code === 200) {
+        console.log(res, '证书记录')
         meterStaff.value = res.data.meterStaff
-        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+        baseInfo.value = res.data
       }
     })
   }
@@ -314,21 +230,16 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          证书记录-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
-            完成
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
-      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+    <detail-page :title=" `${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
+          完成
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef1, ruleFormRef2)">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef1" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="人员编号" prop="staffNo">
@@ -390,7 +301,8 @@
               </el-select>
               <com-tree-select
                 v-else
-                v-model="meterStaff.deptId" :options="PubListTree" placeholder="选择组织机构"
+                ref="selectTreeRef" v-model="meterStaff.deptId" :options="PubListTree"
+                placeholder="选择组织机构"
                 :tree-props="deptProps"
               />
             </el-form-item>
@@ -410,71 +322,52 @@
           </el-col>
         </el-row>
       </el-form>
-      <div class="header" style="margin-top: 10px;">
-        <div class="title">
-          {{ current }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title === '新建'" type="info" @click="removeRow">
-            删除行
-          </el-button>
-          <el-button v-if="title === '新建'" type="primary" @click="addRow">
-            添加行
-          </el-button>
-          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
-            编辑行
-          </el-button>
-        </span>
-      </div>
-      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
-        <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column>
-        <el-table-column type="index" label="序号" width="55" />
-        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
-      </el-table>
-    </div>
-    <!-- 添加证书信息组件 -->
-    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    </detail-page>
+    <detail-block title="证书基本信息">
+      <el-form ref="ruleFormRef2" :model="baseInfo" :rules="rules2" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="证书号" prop="certificateNo">
+              <el-input v-model.trim="baseInfo.certificateNo" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书名称" prop="certificateName">
+              <el-input v-model.trim="baseInfo.certificateName" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证单位" prop="certificateCompany">
+              <el-input v-model.trim="baseInfo.certificateCompany" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发证日期" prop="certificateDate">
+              <el-date-picker
+                v-model="baseInfo.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择发证日期"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书有效日期" prop="validDate">
+              <el-date-picker
+                v-model="baseInfo.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择有效日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block>
     <!-- 选择用户列表组件 -->
     <person-list-dialog ref="personListRef" @add="confirmPerson" />
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    background-color: #fff;
-    border-radius: 8px;
-    padding-top: 10px;
-    margin-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    display: flex;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    position: relative;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 5px;
-    }
-  }
-
   :deep(.el-radio__label) {
     display: none;
   }
@@ -487,40 +380,5 @@
       }
     }
   }
-}
-
-.marg {
-  margin-top: 20px;
-}
 </style>
 
-<style scoped>
-.avatar-uploader .avatar {
-  width: 178px;
-  height: 178px;
-  display: block;
-}
-</style>
-
-<style>
-.avatar-uploader .el-upload {
-  border: 1px dashed var(--el-border-color);
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-  transition: var(--el-transition-duration-fast);
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: var(--el-color-primary);
-}
-
-.el-icon.avatar-uploader-icon {
-  font-size: 28px;
-  color: #8c939d;
-  width: 178px;
-  height: 178px;
-  text-align: center;
-}
-</style>
diff --git a/src/views/measure/person/components/addRecordCancel.vue b/src/views/measure/person/components/addRecordCancel.vue
new file mode 100644
index 0000000..c32ac43
--- /dev/null
+++ b/src/views/measure/person/components/addRecordCancel.vue
@@ -0,0 +1,459 @@
+<!-- 计量人员新增  证书基本信息table表格   作废 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import type { technologyJobType } from '../person-interface'
+import certificateAddDialog from './certificateAddDialog.vue'
+import personListDialog from './personListDialog.vue'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import type { TreeStructure, userType } from '@/views/system/user/user-interface'
+import { getDictByCode } from '@/api/system/dict'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const meterStaff = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  idCard: '', // 身份证号
+  sex: '', // 性别
+  education: '', // 文化程度
+  technologyJob: '', // 技术职务
+  administrationJob: '', // 行政职务
+  deptId: '', // 工作部门
+  major: '', // 专业
+  workDate: '', // 从事日期
+  id: '',
+})
+const ruleForm = ref({
+  meterStaff: {}, // 人员信息
+  staffId: '', // 计量人员id
+}) // 表单
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const title = ref('')
+const name = ref('')
+// 身份证号码验证规则
+const validateIDcard = (rule: any, value: any, callback: any) => {
+  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+  if (rr.test(value)) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+const rules = ref({
+  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
+
+}) // 表单验证规则
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref<TreeStructure[]>([])
+const PubListTree = ref([])
+// 获取组织列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
+  })
+}
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sex').then((response) => {
+    sexList.value = response.data
+  })
+}
+const educationList = ref<technologyJobType[]>([])
+// 获取文化程度列表
+const geteducationList = () => {
+  getDictByCode('education').then((response) => {
+    educationList.value = response.data
+  })
+}
+// 重置表单内容
+const resetFormData = () => {
+  meterStaff.value.staffNo = ''
+  meterStaff.value.name = ''
+  meterStaff.value.idCard = ''
+  meterStaff.value.sex = ''
+  meterStaff.value.education = ''
+  meterStaff.value.technologyJob = ''
+  meterStaff.value.administrationJob = ''
+  meterStaff.value.deptId = ''
+  meterStaff.value.major = ''
+  meterStaff.value.workDate = ''
+  meterStaff.value.id = ''
+}
+const technologyJobList = ref<technologyJobType[]>([])
+// 获取技术职务列表
+const getTechnologyJobList = () => {
+  getDictByCode('technologyJob').then((response) => {
+    technologyJobList.value = response.data
+  })
+}
+const administrationJobList = ref<technologyJobType[]>([])
+// 获取行政职务列表
+const getAdministrationJob = () => {
+  getDictByCode('administrationJob').then((response) => {
+    administrationJobList.value = response.data
+  })
+}
+const personListRef = ref()
+// 选择人员
+const selectPerson = () => {
+  personListRef.value.initDialog()
+}
+// 保存选择人员信息
+const confirmPerson = (row: any) => {
+  ruleForm.value.staffId = row.staffNo
+  meterStaff.value = row
+  ruleFormRef.value?.clearValidate('staffNo')
+}
+const changeList = ref([
+  {
+    name: '证书基本信息',
+    data: [] as any[],
+    column: [
+      {
+        label: '证书号',
+        data: 'certificateNo',
+        id: 'zs02',
+      },
+      {
+        label: '证书名称',
+        data: 'certificateName',
+        id: 'zs03',
+      },
+      {
+        label: '发证日期',
+        data: 'certificateDate',
+        id: 'zs04',
+      },
+      {
+        label: '发证单位',
+        data: 'certificateCompany',
+        id: 'zs01',
+      },
+      {
+        label: '有效日期',
+        data: 'validDate',
+        id: 'zs05',
+      },
+    ],
+  },
+  {
+    name: '计量工作培训记录',
+    data: [],
+    column: [],
+  },
+  {
+    name: '业务记录',
+    data: [],
+    column: [],
+  },
+])
+const current = ref('证书基本信息')
+const currentShow = computed(() => {
+  return changeList.value.filter(item => item.name === current.value)[0]
+})
+const certificateRef = ref() // 添加证书信息弹窗
+// 添加行
+const addRow = () => {
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
+}
+// 证书信息行内添加数据
+const addRowcertificate = (row: any, flag: string) => {
+  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
+  if (flag === 'update') {
+    changeList.value[0].data = [{
+      ...changeList.value[0].data[0],
+      ...row,
+      certificateStatus: diff < 0 ? '1' : '0',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    }]
+  }
+  else {
+    changeList.value[0].data.push(
+      {
+        ...row,
+        certificateStatus: diff < 0 ? '1' : '0',
+        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        id: null,
+        isDel: 0,
+        minioFileName: '',
+        remark: '',
+        staffId: meterStaff.value.id,
+        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
+  }
+}
+const currenSelect = ref<number>(-1) // 当前选中行
+// 删除行
+const removeRow = () => {
+  console.log(currenSelect.value)
+  if (currenSelect.value >= 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
+      currenSelect.value = -1
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        let params
+        if (changeList.value[0].data.length) {
+          params = changeList.value[0].data
+        }
+        else {
+          params = [
+            {
+              certificateCompany: '',
+              certificateDate: '',
+              certificateName: '',
+              certificateNo: '',
+              certificateStatus: '',
+              createTime: '',
+              id: null,
+              isDel: 0,
+              minioFileName: '',
+              remark: '',
+              staffId: meterStaff.value.id,
+              updateTime: '',
+              validDate: '',
+            },
+          ]
+        }
+        (title.value === '新建'
+          ? addCertificateList
+          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
+          formEl?.resetFields()
+          ElMessage.success('提交成功')
+          emits('resetData')
+          resetFormData()
+        })
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  changeList.value[0].data = []
+  emits('resetData')
+  resetFormData()
+}
+const selectTreeRef = ref()
+// 弹窗初始化
+const initDialog = (row: any) => {
+  changeList.value[0].data = []
+  resetFormData()
+  dialogVisible.value = true
+  title.value = row.title
+  name.value = row.name
+  selectTreeRef.value.clearSelected()
+  resetFormData()
+  getuser()
+  getPubList()
+  getSexList()
+  geteducationList()
+  getTechnologyJobList()
+  getAdministrationJob()
+  if (row.title === '新建') {
+    console.log()
+  }
+  else {
+    getCertificateDetail({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        meterStaff.value = res.data.meterStaff
+        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+      }
+    })
+  }
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <detail-page :title=" `${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+          完成
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="人员编号" prop="staffNo">
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="selectPerson">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="meterStaff.name">
+              <el-input v-model.trim="meterStaff.name" placeholder="姓名" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="性别" prop="meterStaff.sex">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="文化程度" prop="meterStaff.education">
+              <el-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="技术职务" prop="meterStaff.technologyJob">
+              <el-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="行政职务" prop="meterStaff.administrationJob">
+              <el-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="工作部门" prop="deptId">
+              <el-select v-if="title === '详情'" v-model="meterStaff.deptId" disabled>
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+              <com-tree-select
+                v-else
+                ref="selectTreeRef" v-model="meterStaff.deptId" :options="PubListTree"
+                placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业" prop="major">
+              <el-input v-model.trim="meterStaff.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="从事日期" prop="workDate">
+              <el-date-picker
+                v-model="meterStaff.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择从事日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block :title="current">
+      <template #btns>
+        <el-button v-if="title === '新建'" type="info" @click="removeRow">
+          删除行
+        </el-button>
+        <el-button v-if="title === '新建'" type="primary" @click="addRow">
+          添加行
+        </el-button>
+        <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+          编辑行
+        </el-button>
+      </template>
+      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
+        <el-table-column width="55" align="center">
+          <template #default="scope">
+            <el-radio-group v-model="currenSelect" class="ml-4">
+              <el-radio :label="scope.$index" />
+            </el-radio-group>
+          </template>
+        </el-table-column>
+        <el-table-column type="index" label="序号" width="55" />
+        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </detail-block>
+    <!-- 添加证书信息组件 -->
+    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    <!-- 选择用户列表组件 -->
+    <person-list-dialog ref="personListRef" @add="confirmPerson" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        display: none;
+      }
+    }
+  }
+</style>
+
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 332c73c..178fc12 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -32,6 +32,7 @@
   form.validDate = ''
 }
 const initDialog = (row: any) => {
+  resetData()
   title.value = row.title
   if (row.title === '编辑') {
     form.certificateNo = row.certificateNo
@@ -50,10 +51,12 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       if (title.value === '编辑') {
-        emits('add', form, 'update')
+        const deptRow = JSON.parse(JSON.stringify(form))
+        emits('add', deptRow, 'update')
       }
       else {
-        emits('add', form, '')
+        const deptRow = JSON.parse(JSON.stringify(form))
+        emits('add', deptRow, '')
       }
       dialogFormVisible.value = false
     }
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 592d810..9c6f65d 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -30,7 +30,7 @@
   { text: '技术职务', value: 'technologyJob', align: 'center', width: '140' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '100' },
   { text: '计量专业', value: 'major', align: 'center', width: '100' },
-  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '180' },
   { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '技术考核', value: 'technologyExam', align: 'center', width: '85' },
 ]) // 表格
@@ -63,7 +63,7 @@
   loadingTable.value = true
   getStaffList(searchQuery).then((res) => {
     if (res.code === 200) {
-      res.data.records = res.data.records.map((item: StaffType) => ({ ...item, sex: item.sex == '1' ? '男' : '女', technologyExam: item.technologyExam == '0' ? '已考核' : '未考核' }))
+      res.data.records = res.data.records.map((item: StaffType) => ({ ...item, sex: item.sex == '1' ? '男' : '女', technologyExam: item.technologyExam == '0' ? '已考核' : '未考核', certificateDate: item.certificateDate.split(' ')[0] }))
       list.value = res.data.records
       total.value = Number(res.data.total)
     }
@@ -236,21 +236,11 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="proxy.hasPerm(`/measure/person/list/import`)" type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" type="primary" @click="templateDownload">
-            模板下载
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/list/add`)" type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/list/export`)" type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" type="primary" @click="print">
-            打印
-          </el-button>
+          <icon-button v-if="proxy.hasPerm(`/measure/person/list/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/list/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/list/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index 17b92d3..e44001a 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -295,15 +295,17 @@
         </el-button>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
-      <el-form-item>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer footer">
         <el-button type="primary" @click="submitForm(ruleFormRef)">
           发布
         </el-button>
         <el-button @click="resetForm(ruleFormRef)">
           关闭
         </el-button>
-      </el-form-item>
-    </el-form>
+      </div>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index 3d5c2e3..0926957 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -172,15 +172,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <el-button v-if="proxy.hasPerm('/sys/notice/list/add')" type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/sys/notice/list/export')" type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/sys/notice/list/print')" v-print="printObj" type="primary">
-          打印
-        </el-button>
+        <icon-button v-if="proxy.hasPerm('/sys/notice/list/add')" icon="icon-add" title="新建" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/sys/notice/list/export')" icon="icon-export" title="导出" @click="exportExcelBtn" />
+        <icon-button v-if="proxy.hasPerm('/sys/notice/list/print')" v-print="printObj" icon="icon-print" title="打印" />
       </template>
       <!-- 表格区域 -->
       <normal-table
diff --git a/src/views/system/notice/noticeDetail.vue b/src/views/system/notice/noticeDetail.vue
index 441ef0f..94468d4 100644
--- a/src/views/system/notice/noticeDetail.vue
+++ b/src/views/system/notice/noticeDetail.vue
@@ -97,15 +97,14 @@
         </el-link>
         <span v-else>暂无附件</span>
       </el-form-item>
-      <el-form-item>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer footer">
         <el-button type="primary" @click="submitForm()">
           确认
         </el-button>
-        <!-- <el-button @click="resetForm(ruleFormRef)">
-          关闭
-        </el-button> -->
-      </el-form-item>
-    </el-form>
+      </div>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/src/views/system/tool/autograph/addDDialog.vue b/src/views/system/tool/autograph/addDDialog.vue
index d34e8ef..e39b706 100644
--- a/src/views/system/tool/autograph/addDDialog.vue
+++ b/src/views/system/tool/autograph/addDDialog.vue
@@ -200,15 +200,17 @@
         </el-button>
         <input v-show="title === '123'" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
-      <el-form-item>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer footer">
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
           发布
         </el-button>
         <el-button @click="resetForm(ruleFormRef)">
           关闭
         </el-button>
-      </el-form-item>
-    </el-form>
+      </div>
+    </template>
   </el-dialog>
 </template>
 

diff --git a/src/components.d.ts b/src/components.d.ts
index 6e85584..815d62f 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -16,14 +16,13 @@
     BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default']
     BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
-    Benchcol: typeof import('./components/benchcol/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/DetailPage/index copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
+    DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
diff --git a/src/components/DetailPage/DetailBlockSwitch.vue b/src/components/DetailPage/DetailBlockSwitch.vue
new file mode 100644
index 0000000..4d92074
--- /dev/null
+++ b/src/components/DetailPage/DetailBlockSwitch.vue
@@ -0,0 +1,71 @@
+<script lang="ts" setup name="DetailBlock">
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+})
+
+const slots = useSlots()
+</script>
+
+<template>
+  <div class="detail-main">
+    <div class="header">
+      <div class="menu">
+        <slot name="menu" />
+      </div>
+      <div class="title">
+        {{ title }}
+      </div>
+      <div class="btns">
+        <slot name="btns" />
+      </div>
+    </div>
+    <div v-if="slots.default" class="content">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-main {
+  background-color: #fff;
+  border-radius: 8px;
+  margin-top: 10px;
+  padding-top: 10px;
+
+  .header {
+    position: relative;
+    height: 40px;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+
+    .title {
+      font-weight: 500;
+    }
+
+    .btns {
+      position: absolute;
+      right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+
+    .menu {
+      position: absolute;
+      left: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+
+  .content {
+    background-color: #fff;
+    padding: 0 10px 20px;
+    margin-top: 10px;
+  }
+}
+</style>
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d6c1c91..1644a80 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -314,6 +314,39 @@
       },
     ],
   },
+  {
+    path: '/borrow',
+    component: Layout,
+    redirect: '/device/borrow/borrowapply',
+    name: 'Borrow',
+    meta: {
+      title: '设备领用',
+      icon: 'ep:key',
+      auth: '/device/borrow',
+    },
+    children: [
+      {
+        path: 'borrowapply',
+        name: 'borroWapply',
+        component: () => import('@/views/device/borrow/borrwoApply.vue'),
+        meta: {
+          title: '设备借用申请',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowapply',
+        },
+      },
+      {
+        path: 'borrowhandle',
+        name: 'borrowHandle',
+        component: () => import('@/views/device/borrow/borrowHandle.vue'),
+        meta: {
+          title: '设备借用处理',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowhandle',
+        },
+      },
+    ],
+  },
 
 ]
 
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
new file mode 100644
index 0000000..1c2405e
--- /dev/null
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="borrowHandle">
+// 逻辑代码
+</script>
+
+<template>
+  <app-container>
+    设备借用处理
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
new file mode 100644
index 0000000..03d414b
--- /dev/null
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="borrowApply">
+// 逻辑代码
+</script>
+
+<template>
+  <app-container>
+    设备借用申请
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index c2682fc..5f7b347 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -339,381 +339,374 @@
 
 <template>
   <div class="body-container">
-    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资产编号" prop="assetNo">
-            <el-input v-model.trim="ruleForm.assetNo" placeholder="系统自动生成" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="资产类型" prop="assetType">
-            <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备编号" prop="equipmentNo">
-            <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备名称" prop="equipmentName">
-            <el-input v-model.trim="ruleForm.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="生产厂家" prop="manufacturer">
-            <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="厂家国别" prop="manufacturerCountry">
-            <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="出厂编号" prop="manufacturingNo">
-            <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="出厂年月" prop="manufacturingDate">
-            <el-date-picker
-              v-model="ruleForm.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '出厂年月'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="型号" prop="modelNo">
-            <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="管理状态" prop="managerState">
-            <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="ABC" prop="abc">
-            <el-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'">
-              <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="标签绑定" prop="labelBind">
-            <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === '详情' ? '' : '标签'" :disabled="title === '详情'" clearable>
-              <template #append>
-                <el-button type="primary" size="small">
-                  扫描
-                </el-button>
-              </template>
-            </el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="立卡年月" prop="cardEstablishmentDate">
-            <el-date-picker
-              v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '立卡年月'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="启用日期" prop="enableDate">
-            <el-date-picker
-              v-model="ruleForm.enableDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '启用日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定方式" prop="mesureType">
-            <el-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'">
-              <el-option v-for="item in mesureTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定周期" prop="mesureCycle">
-            <el-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="12">
-          <el-form-item label="测量范围" prop="mesureRange">
-            <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === '详情' ? '' : '测量范围'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="不确定度" prop="uncertainty">
-            <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === '详情' ? '' : '不确定度'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="使用部门" prop="useDept">
-            <com-tree-select
-              v-if="title !== '详情'"
-              v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-              :tree-props="deptProps"
-            />
-            <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
-              <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="使用人" prop="usePerson">
-            <el-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'">
-              <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="专业分类" prop="majorCategory">
-            <el-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'">
-              <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="检定部门" prop="mesureDept">
-            <com-tree-select
-              v-if="title !== '详情'"
-              v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-              :tree-props="deptProps"
-            />
-            <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
-              <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定日期" prop="mesureDate">
-            <el-date-picker
-              v-model="ruleForm.mesureDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '检定日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="有效日期" prop="validDate">
-            <el-date-picker
-              v-model="ruleForm.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '有效日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定结果" prop="mesureResult">
-            <el-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'">
-              <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="8">
-          <el-form-item label="是否是技术指标需要校准/检定的设备" prop="isCalibrationTestEquipment" label-width="260px">
-            <el-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否是测量工装台账" prop="isMeasureAccount" label-width="260px">
-            <el-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否标准配套设备" prop="isStandardSupportEquipment" label-width="260px">
-            <el-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
+    <detail-block-switch title="基本信息">
+      <template #menu>
+        <slot name="menuswitch" />
+      </template>
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资产编号" prop="assetNo">
+              <el-input v-model.trim="ruleForm.assetNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="资产类型" prop="assetType">
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备编号" prop="equipmentNo">
+              <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="生产厂家" prop="manufacturer">
+              <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="厂家国别" prop="manufacturerCountry">
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号" prop="manufacturingNo">
+              <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂年月" prop="manufacturingDate">
+              <el-date-picker
+                v-model="ruleForm.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '出厂年月'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="型号" prop="modelNo">
+              <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="管理状态" prop="managerState">
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="ABC" prop="abc">
+              <el-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'">
+                <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标签绑定" prop="labelBind">
+              <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === '详情' ? '' : '标签'" :disabled="title === '详情'" clearable>
+                <template #append>
+                  <el-button type="primary" size="small">
+                    扫描
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="立卡年月" prop="cardEstablishmentDate">
+              <el-date-picker
+                v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '立卡年月'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="启用日期" prop="enableDate">
+              <el-date-picker
+                v-model="ruleForm.enableDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '启用日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定方式" prop="mesureType">
+              <el-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'">
+                <el-option v-for="item in mesureTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定周期" prop="mesureCycle">
+              <el-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="测量范围" prop="mesureRange">
+              <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === '详情' ? '' : '测量范围'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="不确定度" prop="uncertainty">
+              <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === '详情' ? '' : '不确定度'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="使用部门" prop="useDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
+                :tree-props="deptProps"
+              />
+              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="使用人" prop="usePerson">
+              <el-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'">
+                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="专业分类" prop="majorCategory">
+              <el-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'">
+                <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="检定部门" prop="mesureDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                :tree-props="deptProps"
+              />
+              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定日期" prop="mesureDate">
+              <el-date-picker
+                v-model="ruleForm.mesureDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '检定日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="有效日期" prop="validDate">
+              <el-date-picker
+                v-model="ruleForm.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '有效日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定结果" prop="mesureResult">
+              <el-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'">
+                <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="8">
+            <el-form-item label="是否是技术指标需要校准/检定的设备" prop="isCalibrationTestEquipment" label-width="260px">
+              <el-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否是测量工装台账" prop="isMeasureAccount" label-width="260px">
+              <el-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否标准配套设备" prop="isStandardSupportEquipment" label-width="260px">
+              <el-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资产来源" prop="assetSource">
-            <el-input v-model.trim="ruleForm.assetSource" :placeholder="title === '详情' ? '' : '资产来源'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备规格" prop="equipmentSpecifications">
-            <el-input v-model.trim="ruleForm.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备类别" prop="equipmentCategory">
-            <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
-              <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备类型" prop="equipmentType">
-            <el-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'">
-              <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资本来源" prop="capitalSource">
-            <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
-              <el-option v-for="item in capitalSourceList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="管理级别" prop="managerLevel">
-            <el-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'">
-              <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="用途" prop="purpose">
-            <el-input v-model.trim="ruleForm.purpose" :placeholder="title === '详情' ? '' : '用途'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="技术水平" prop="technicalLevel">
-            <el-input v-model.trim="ruleForm.technicalLevel" :placeholder="title === '详情' ? '' : '技术水平'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="完好状态" prop="intactState">
-            <el-input v-model.trim="ruleForm.intactState" :placeholder="title === '详情' ? '' : '完好状态'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="外形尺寸" prop="overallDimension">
-            <el-input v-model.trim="ruleForm.overallDimension" :placeholder="title === '详情' ? '' : '外形尺寸'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="重量(吨)" prop="weight">
-            <el-input v-model.trim="ruleForm.weight" :placeholder="title === '详情' ? '' : '重量'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="单价" prop="singlePrice">
-            <el-input v-model.trim="ruleForm.singlePrice" :placeholder="title === '详情' ? '' : '单价'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="安装及杂费" prop="installIncidentalExpenses">
-            <el-input v-model.trim="ruleForm.installIncidentalExpenses" :placeholder="title === '详情' ? '' : '安装及杂费'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="安装地点" prop="installPlace">
-            <el-input v-model.trim="ruleForm.installPlace" :placeholder="title === '详情' ? '' : '安装地点'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="原值" prop="originValue">
-            <el-input v-model.trim="ruleForm.originValue" :placeholder="title === '详情' ? '' : '原值'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="目前原值" prop="presentOriginValue">
-            <el-input v-model.trim="ruleForm.presentOriginValue" :placeholder="title === '详情' ? '' : '目前原值'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="折旧年限" prop="depreciationPeriod">
-            <el-input v-model.trim="ruleForm.depreciationPeriod" :placeholder="title === '详情' ? '' : '折旧年限'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="折旧方法" prop="depreciationMethod">
-            <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
-              <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="属性" prop="attribute">
-            <el-input v-model.trim="ruleForm.attribute" placeholder="属性" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="12">
-          <el-form-item label="说明书" prop="minioFileName">
-            <show-photo :minio-file-name="ruleForm.fileList[0]?.minioFileName || ''" />
-            <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
-            <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
-              {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
-            </el-button>
-            <span v-if="title === '详情' && !ruleForm.fileList[0]?.minioFileName">暂无</span>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="24">
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" placeholder="备注" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资产来源" prop="assetSource">
+              <el-input v-model.trim="ruleForm.assetSource" :placeholder="title === '详情' ? '' : '资产来源'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备规格" prop="equipmentSpecifications">
+              <el-input v-model.trim="ruleForm.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备类别" prop="equipmentCategory">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+                <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备类型" prop="equipmentType">
+              <el-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'">
+                <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资本来源" prop="capitalSource">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+                <el-option v-for="item in capitalSourceList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="管理级别" prop="managerLevel">
+              <el-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'">
+                <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="用途" prop="purpose">
+              <el-input v-model.trim="ruleForm.purpose" :placeholder="title === '详情' ? '' : '用途'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="技术水平" prop="technicalLevel">
+              <el-input v-model.trim="ruleForm.technicalLevel" :placeholder="title === '详情' ? '' : '技术水平'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="完好状态" prop="intactState">
+              <el-input v-model.trim="ruleForm.intactState" :placeholder="title === '详情' ? '' : '完好状态'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="外形尺寸" prop="overallDimension">
+              <el-input v-model.trim="ruleForm.overallDimension" :placeholder="title === '详情' ? '' : '外形尺寸'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="重量(吨)" prop="weight">
+              <el-input v-model.trim="ruleForm.weight" :placeholder="title === '详情' ? '' : '重量'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="单价" prop="singlePrice">
+              <el-input v-model.trim="ruleForm.singlePrice" :placeholder="title === '详情' ? '' : '单价'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="安装及杂费" prop="installIncidentalExpenses">
+              <el-input v-model.trim="ruleForm.installIncidentalExpenses" :placeholder="title === '详情' ? '' : '安装及杂费'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="安装地点" prop="installPlace">
+              <el-input v-model.trim="ruleForm.installPlace" :placeholder="title === '详情' ? '' : '安装地点'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="原值" prop="originValue">
+              <el-input v-model.trim="ruleForm.originValue" :placeholder="title === '详情' ? '' : '原值'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="目前原值" prop="presentOriginValue">
+              <el-input v-model.trim="ruleForm.presentOriginValue" :placeholder="title === '详情' ? '' : '目前原值'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="折旧年限" prop="depreciationPeriod">
+              <el-input v-model.trim="ruleForm.depreciationPeriod" :placeholder="title === '详情' ? '' : '折旧年限'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="折旧方法" prop="depreciationMethod">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+                <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="属性" prop="attribute">
+              <el-input v-model.trim="ruleForm.attribute" placeholder="属性" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="说明书" prop="minioFileName">
+              <show-photo :minio-file-name="ruleForm.fileList[0]?.minioFileName || ''" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
+                {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
+              </el-button>
+              <span v-if="title === '详情' && !ruleForm.fileList[0]?.minioFileName">暂无</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" placeholder="备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block-switch>
   </div>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    padding-top: 20px;
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index f46553a..fc3fd54 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -360,20 +360,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          固定资产-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`固定资产-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -763,44 +758,11 @@
           </el-row>
         </div> -->
       </el-form>
-    </div>
+    </detail-page>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index 0abbdb1..6e88e96 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -74,33 +74,29 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ name }} -{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm">
-            关闭
-          </el-button>
-        </span>
-      </div>
-      <div class="body">
-        <!-- 三级菜单 -->
-        <el-radio-group v-model="current">
-          <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
-            {{ item.name }}
-          </el-radio-button>
-        </el-radio-group>
-      </div>
-      <!-- 展示区域 -->
-      <keep-alive>
-        <component :is="currentComp" ref="currentCompRef" :name="current" :title="title" :row="row" />
-      </keep-alive>
-    </div>
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <!-- 展示区域 -->
+    <keep-alive>
+      <component :is="currentComp" ref="currentCompRef" :name="current" :title="title" :row="row">
+        <template #menuswitch>
+          <!-- 三级菜单 -->
+          <el-radio-group v-model="current">
+            <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+              {{ item.name }}
+            </el-radio-button>
+          </el-radio-group>
+        </template>
+      </component>
+    </keep-alive>
   </app-container>
 </template>
 
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f9cdcd0..f653095 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -256,7 +256,7 @@
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
-  // 原生上传图片
+  // 原生上传
   // console.log(event.target.files)
   // if (event.target.files[0].type === 'application/pdf') {
   if (event.target.files?.length !== 0) {
@@ -354,7 +354,7 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" type="primary" @click="identify">
+          <!-- <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" type="primary" @click="identify">
             标签识别
           </el-button>
           <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/import`)" type="primary" @click="batchImport">
@@ -371,7 +371,13 @@
           </el-button>
           <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/print`)" v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/device/standingBook/components/templateTable.vue b/src/views/device/standingBook/components/templateTable.vue
index 8a928f0..7aa563f 100644
--- a/src/views/device/standingBook/components/templateTable.vue
+++ b/src/views/device/standingBook/components/templateTable.vue
@@ -245,11 +245,11 @@
   <div>
     <!-- 添加证书信息组件 -->
     <add-row ref="addRowRef" @add="addRowData" />
-    <div class="header">
-      <div class="title">
-        <!-- {{ $props.name }} -->
-      </div>
-      <span class="btns">
+    <detail-block-switch :title="name">
+      <template #menu>
+        <slot name="menuswitch" />
+      </template>
+      <template #btns>
         <el-button v-if="title !== '详情'" type="info" @click="removeRow">
           删除行
         </el-button>
@@ -259,55 +259,33 @@
         <el-button v-if="title !== '详情'" type="primary" @click="editRow">
           编辑行
         </el-button>
-      </span>
-    </div>
-    <!-- 表格区域 -->
-    <normal-table
-      id="print"
-      :data="list" :total="total" :columns="columns as any"
-      :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-      :list-loading="loadingTable"
-      style="padding-top: 20px;background-color: #fff;"
-      @change="changePage"
-    >
-      <template #preColumns>
-        <el-table-column label="" width="55" align="center">
-          <template #default="scope">
-            <el-radio v-model="select" :label="scope.$index" class="radio" />
-          </template>
-        </el-table-column>
-        <el-table-column label="序号" width="55" align="center">
-          <template #default="scope">
-            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-          </template>
-        </el-table-column>
       </template>
-    </normal-table>
+      <!-- 表格区域 -->
+      <normal-table
+        id="print"
+        :data="list" :total="total" :columns="columns as any"
+        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+        :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </detail-block-switch>
   </div>
 </template>
 
 <style lang="scss" scoped>
-.header {
-  background-color: #fff;
-  // height: 40px;
-  border-radius: 8px;
-  display: flex;
-  align-items: center;
-  flex-direction: column;
-  justify-content: center;
-  position: relative;
-
-  .title {
-    // font-weight: 700;
-  }
-
-  .btns {
-    position: absolute;
-    right: 40px;
-    top: -22px;
-  }
-}
-
 :deep(.el-radio__label) {
   display: none;
 }
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 7538bc8..78a3800 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -272,24 +272,12 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/identify`)" type="primary" @click="identify">
-            标签识别
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/import`)" type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/mould`)" type="primary" @click="templateDownload">
-            模板下载
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/add`)" type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/export`)" type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/print`)" v-print="printObj" type="primary">
-            打印
-          </el-button>
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/identify`)" icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index fc364c8..e74d70e 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -361,20 +361,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ name }} - {{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -458,73 +453,33 @@
           </el-col>
         </el-row>
       </el-form>
-      <div v-if="title !== '新建' ">
-        <div class="header" style="margin-top: 10px;">
-          <div class="title">
-            审批流程
-          </div>
-        </div>
-        <div class="timeline">
-          <el-timeline>
-            <el-timeline-item timestamp="2018/4/12" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/12 20:46</p>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="2018/4/3" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/3 20:46</p>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="2018/4/2" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/2 20:46</p>
-              </el-card>
-            </el-timeline-item>
-          </el-timeline>
-        </div>
-      </div>
-    </div>
+    </detail-page>
+    <detail-block v-if="title !== '新建' " title="审批流程">
+      <el-timeline>
+        <el-timeline-item timestamp="2018/4/12" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/12 20:46</p>
+          </el-card>
+        </el-timeline-item>
+        <el-timeline-item timestamp="2018/4/3" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/3 20:46</p>
+          </el-card>
+        </el-timeline-item>
+        <el-timeline-item timestamp="2018/4/2" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/2 20:46</p>
+          </el-card>
+        </el-timeline-item>
+      </el-timeline>
+    </detail-block>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .timeline {
   background-color: #fff;
 }
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index aa3963f..737568d 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -1,6 +1,6 @@
 <!-- 状态管理公共列表组件 -->
 <script lang="ts" setup>
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessageBox } from 'element-plus'
 import approve from './approvalActionDialog.vue'
 import addDialog from './templateAdd.vue'
 const props = defineProps({
@@ -142,7 +142,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: any) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     title: '详情',
@@ -150,7 +150,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: any) => {
   dialogVisible.value = true
   // addRef.value.initDialog({
   //   title: '编辑',
@@ -158,7 +158,7 @@
   // })
 }
 // 删除
-const remove = (row) => {
+const remove = (row: any) => {
   ElMessageBox.confirm(
     `确认删除${row.equipmentName}吗？`,
     '提示',
@@ -181,20 +181,20 @@
   // })
 }
 // 同意
-const agree = (row) => {
+const agree = (row: any) => {
   console.log(approveRef.value)
   approveRef.value.initDialog({
     radio: '1',
   })
 }
 // 驳回
-const reject = (row) => {
+const reject = (row: any) => {
   approveRef.value.initDialog({
     radio: '3',
   })
 }
 // 拒绝
-const refuse = (row) => {
+const refuse = (row: any) => {
   approveRef.value.initDialog(
     {
       radio: '2',
@@ -202,7 +202,7 @@
   )
 }
 // 取消
-const cancel = (row) => {
+const cancel = (rowrow: any) => {
   ElMessageBox.confirm(
     '确认取消吗？',
     '提示',
@@ -301,20 +301,20 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+          <el-input placeholder="申请编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="设备编号" clearable class="w-50 m-2" />
+          <el-input placeholder="设备编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.modelNo" placeholder="设备名称" clearable class="w-50 m-2" />
+          <el-input placeholder="设备名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请单位" clearable class="w-50 m-2" />
+          <el-input placeholder="申请单位" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.publisher" placeholder="申请状态" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" />
+          <el-select placeholder="申请状态" clearable>
+            <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" /> -->
           </el-select>
         </search-item>
       </search-area>
@@ -328,7 +328,10 @@
           <el-button type="primary" @click="templateDownload">
             模板下载
           </el-button> -->
-          <el-button type="primary" @click="add">
+          <icon-button icon="icon-add" title="新建" @click="add" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+          <!-- <el-button type="primary" @click="add">
             新建
           </el-button>
           <el-button type="primary" @click="exportExcelBtn">
@@ -336,7 +339,7 @@
           </el-button>
           <el-button v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
         </template>
         <!-- 表格区域 -->
         <normal-table
@@ -386,22 +389,3 @@
     </app-container>
   </div>
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 154px !important;
-}
-
-.normal-date {
-  width: 154px !important;
-}
-
-.normal-select {
-  width: 154px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
-
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 0763c5a..9ef0b93 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -19,7 +19,6 @@
 const effectiveStatusName = ref('')
 const title = ref('')
 const fileList = ref<UploadUserFile[]>([])
-console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -80,10 +79,9 @@
   if (row.title === '新建') {
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
-    ruleForm.publisher = ''
+    ruleForm.publisher = userInfo.$state.deptName
     ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 判断有无存储
-    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
     if (sessionStorage.getItem(fileTypeName.value)) {
       const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
       ruleForm.fileType = session.fileType
@@ -117,6 +115,8 @@
     ruleForm.remark = row.remark
     ruleForm.publishTime = row.publishTime
     ruleForm.minioFileName = row.minioFileName
+    // ruleForm.publisher = '0'
+    // ruleForm.createUserId = '1'
   }
 }
 defineExpose({ initDialog })
@@ -148,6 +148,9 @@
       type: 'warning',
     },
       ).then((res) => {
+        if (ruleForm.publisher === userInfo.$state.deptName) {
+          ruleForm.publisher === userInfo.$state.deptId
+        }
         if (flag == '提交') {
           addApi(ruleForm).then((res) => {
             if (res.code == 200) {
@@ -193,7 +196,6 @@
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        console.log(res.data[0])
         ruleForm.minioFileName = res.data[0]
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
@@ -216,7 +218,6 @@
 // ])
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
-  console.log(diffDat)
   if (diffDat < 0) {
     // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '在使用'
@@ -237,7 +238,7 @@
 
 <template>
   <app-container v-if="dialogVisible" style="overflow: hidden;">
-    <detail-page :title="`${title}${fileTypeName}`">
+    <detail-page :title="`${fileTypeName}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
           提交
@@ -278,12 +279,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="发布单位" prop="publisher">
-              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'" class="fill-input">
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled>
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
               <com-tree-select
                 v-else
-                v-model="ruleForm.publisher" :options="PubListTree" placeholder="选择组织机构"
+                v-model="ruleForm.publisher" :options="PubListTree" placeholder="请选择发布单位"
                 :tree-props="deptProps"
               />
             </el-form-item>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 44e3e4d..b45fbc3 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -324,22 +324,9 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <!-- <el-button type="primary" @click="batchImport">
-            批量导入
-          </el-button> -->
-          <!-- <el-button type="primary" @click="templateDownload">
-            模板下载
-          </el-button> -->
-          <!-- <el-button type="primary" @click="add">
-            新建
-          </el-button> -->
-          <el-button type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-print="printObj" type="primary">
-            打印
-          </el-button>
+          <!-- <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange"> -->
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 4677e48..7d4724b 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -204,13 +204,9 @@
     loading.close()
   })
 }
-// 打印
-const print = () => {
-
-}
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
-  // 原生上传图片
+  // 原生上传
   // console.log(event.target.files)
   // if (event.target.files[0].type === 'application/pdf') {
   if (event.target.files?.length !== 0) {
@@ -264,7 +260,7 @@
         <search-item>
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
-        <search-item>
+        <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
@@ -273,13 +269,13 @@
               :value="item.value"
             />
           </el-select>
-        </search-item>
+        </search-item> -->
         <search-item>
           <el-date-picker
             v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 155px;"
+            style="width: 185px;"
           />
         </search-item>
         <search-item>
@@ -287,19 +283,19 @@
             v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 155px;"
+            style="width: 185px;"
           />
         </search-item>
         <search-item>
-          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select> -->
-          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
+          </el-select>
+          <!-- <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" /> -->
         </search-item>
       </search-area>
       <table-container>
@@ -310,7 +306,7 @@
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
-          <icon-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" @click="print" />
+          <icon-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index cf0dd4f..5ca3275 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -3,11 +3,11 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { detailType } from '../measureDept-interface'
-import { getUserList } from '@/api/system/user'
+// import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
+import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import type { userType } from '@/views/system/user/user-interface'
 import { listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
-import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
 const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -31,11 +31,20 @@
   technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
+// 获取计量人员列表
 const getuser = () => {
-  getUserList({ offset: 1, limit: 99999 }).then((res) => {
-    userList.value = res.data.rows
+  getStaffList({
+    staffNo: '', // 人员编号
+    name: '', // 姓名
+    deptId: ruleForm.value.deptId, // 所在部门
+    limit: 999999,
+    offset: 1,
+  }).then((res) => {
+    if (res.code === 200) {
+      userList.value = res.data.records
+    }
   })
-} // 获取用户列表
+}
 const technologyJobList = ref<{ id: string;name: string;value: string }[]>([])
 // 获取技术职务列表
 const getTechnologyJobList = () => {
@@ -50,7 +59,16 @@
     administrationJobList.value = response.data
   })
 }
-
+// 选择负责人自动填充职务信息
+const directorChange = (val: string) => {
+  const selectUser = userList.value.filter(item => item.name === val)[0]
+  getStaffDetail(selectUser).then((res) => {
+    if (res.code === 200) {
+      ruleForm.value.administrationJob = res.data.administrationJob
+      ruleForm.value.technologyJob = res.data.technologyJob
+    }
+  })
+}
 // 提交
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
@@ -95,12 +113,6 @@
 const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
-// const searchQuery = ref({
-//   limit: 10,
-//   offset: 1,
-//   total: 0,
-//   pageSizes: [10, 20, 30],
-// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -410,20 +422,6 @@
     }
   })
 }
-// const handleSizeChange = (val: number) => {
-//   searchQuery.value.limit = val
-//   getDepartmentList()
-//   getuserInfoList()
-//   getInstrumentInfo()
-//   getDeviceInfo()
-// }
-// const handleCurrentChange = (val: number) => {
-//   searchQuery.value.offset = val
-//   getDepartmentList()
-//   getuserInfoList()
-//   getInstrumentInfo()
-//   getDeviceInfo()
-// }
 // 弹窗初始化
 const initDialog = (row: any) => {
   reset()
@@ -460,22 +458,17 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title.split('-')[2] === '编辑'" type="primary" @click="submitForm(ruleFormRef)">
-            提交
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="title">
+      <template #btns>
+        <el-button v-if="title.split('-')[2] === '编辑'" type="primary" @click="submitForm(ruleFormRef)">
+          提交
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title.split('-')[2] === '详情' ? 'isDetail' : '']">
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item :label=" `${title.split('-')[1]}编号`" prop="organizeNo">
               <el-input v-model.trim="ruleForm.organizeNo" placeholder="系统自动生成" disabled />
@@ -487,7 +480,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="title.split('-')[1] === '工程组'" :gutter="24" class="marg">
+        <el-row v-if="title.split('-')[1] === '工程组'" :gutter="24">
           <el-col :span="6">
             <el-form-item label="科室编号">
               <el-input v-model.trim="ruleForm.pDeptId" disabled />
@@ -509,10 +502,10 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
-              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" @change="directorChange">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.name" />
               </el-select>
             </el-form-item>
@@ -532,7 +525,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="24">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
               <el-input v-model.trim="ruleForm.remark" :placeholder="title.split('-')[2] === '详情' ? '' : '备注'" :disabled="title.split('-')[2] === '详情'" />
@@ -540,85 +533,24 @@
           </el-col>
         </el-row>
       </el-form>
-      <!-- 科室信息-人员信息等列表切换 -->
-      <div>
-        <div class="header" style="margin-top: 10px;">
-          <!-- 切换 -->
-          <el-radio-group v-model="current" class="change-btn">
-            <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
-              {{ item.name }}
-            </el-radio-button>
-          </el-radio-group>
-          <div class="title">
-            {{ current }}
-          </div>
-          <span class="btns">
-          <!-- <el-button type="info" :disabled="title === '详情'" @click="removeRow">
-            删除行
-          </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
-            添加行
-          </el-button> -->
-          </span>
-        </div>
-        <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <el-table-column type="index" label="序号" width="55" align="center" />
-          <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
-        </el-table>
-        <!-- <div style="width: 100%;margin-top: 10px;">
-          <el-pagination
-            :current-page="searchQuery.offset"
-            :page-sizes="searchQuery.pageSizes"
-            :page-size="searchQuery.limit"
-            :total="searchQuery.total"
-            layout="total, sizes, prev, pager, next"
-            hide-on-single-page
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-          />
-        </div> -->
-      </div>
-    </div>
+    </detail-page>
+    <detail-block-switch :title="current">
+      <template #menu>
+        <el-radio-group v-model="current" class="change-btn">
+          <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
+            {{ item.name }}
+          </el-radio-button>
+        </el-radio-group>
+      </template>
+      <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
+        <el-table-column type="index" label="序号" width="55" align="center" />
+        <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </detail-block-switch>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-    position: relative;
-
-    .change-btn {
-      position: absolute;
-      left: 40px;
-      top: 4px;
-    }
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 4px;
-    }
-  }
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
@@ -628,8 +560,4 @@
     }
   }
 }
-
-.marg {
-  margin-top: 10px;
-}
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 9ad87af..aac1ef2 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -231,12 +231,14 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
+          <!-- <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
           <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
+          <icon-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 2e3322a..3f472eb 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -41,7 +41,7 @@
   { text: '证书号', value: 'certificateNo', align: 'center' },
   { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
   { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'validDate', align: 'center', width: '200' },
   { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
 ]) // 表格
 const certificateStatusList = ref([
@@ -90,7 +90,7 @@
   loadingTable.value = true
   getCertificateList(searchQuery).then((res) => {
     if (res.code === 200) {
-      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效' }))
+      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效', validDate: item.validDate.split(' ')[0], certificateDate: item.certificateDate.split(' ')[0] }))
       list.value = res.data.records
       total.value = Number(res.data.total)
     }
@@ -115,6 +115,7 @@
   addRef.value.initDialog({
     ...row,
     title: '详情',
+    name: props.isRemind ? '证书状况' : '证书记录',
   })
 }
 // 编辑
@@ -123,6 +124,7 @@
   addRef.value.initDialog({
     ...row,
     title: '编辑',
+    name: props.isRemind ? '证书状况' : '证书记录',
   })
 }
 
@@ -193,6 +195,7 @@
   dialogVisible.value = true
   addRef.value.initDialog({
     title: '新建',
+    name: props.isRemind ? '证书状况' : '证书记录',
   })
 }
 // 导出
@@ -292,21 +295,11 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
-            模板下载
-          </el-button>
-          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
-            打印
-          </el-button>
+          <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
@@ -325,7 +318,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column fixed="right" label="操作" align="center" width="150">
+            <el-table-column fixed="right" label="操作" align="center" width="180">
               <template #default="{ row }">
                 <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
                   提醒
@@ -336,7 +329,7 @@
                 <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 4dc1b17..4352604 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -69,7 +69,16 @@
     const IdCard = ruleForm.value.idCard
     const birthday = `${IdCard.substring(6, 10)}-${IdCard.substring(10, 12)}`
     ruleForm.value.birthday = birthday
-    console.log(ruleForm.value)
+    // 获取性别 第17位  奇数为男 偶数为女
+    // ruleForm.value.sex
+    if (Number(IdCard.substring(16, 17)) % 2) {
+      // 男
+      ruleForm.value.sex = '1'
+    }
+    else {
+      //  女
+      ruleForm.value.sex = '2'
+    }
   })
 }
 const dialogVisible = ref<boolean>(false) // 弹窗显示
@@ -130,7 +139,6 @@
     technologyExam: '', // 技术考核
     remark: '', // 备注
     certificateList: [], // 证书列表
-
   }
 }
 const technologyJobList = ref<technologyJobType[]>([])
@@ -309,7 +317,7 @@
           }
           (title.value === '新建'
             ? getStaffAdd
-            : getStaffupdate) ({ ...ruleForm.value, certificateList: changeList.value[0].data }).then((res) => {
+            : getStaffupdate) ({ ...ruleForm.value, certificateList: changeList.value[0].data, birthday: `${ruleForm.value.idCard.substring(6, 10)}-${ruleForm.value.idCard.substring(10, 12)}-${ruleForm.value.idCard.substring(12, 14)}` }).then((res) => {
             if (res.code == 200) {
               formEl?.resetFields()
               ElMessage.success('提交成功')
@@ -332,12 +340,14 @@
   emits('resetData')
   resetFormData()
 }
+const selectTreeRef = ref()
 // 弹窗初始化
 const initDialog = (row: any) => {
   changeList.value[0].data = []
   dialogVisible.value = true
   title.value = row.title
   resetFormData()
+  selectTreeRef.value?.clearSelected()
   getuser()
   getPubList()
   getSexList()
@@ -370,20 +380,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          计量人员-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
-            完成
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`计量人员-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+          完成
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
         <el-row :gutter="24" class="marg">
           <el-col :span="5">
@@ -394,6 +399,7 @@
                 :http-request="uploadQuarterlyEvaluateFile"
                 :before-upload="beforeAvatarUpload"
                 :disabled="title === '详情'"
+                accept="image/png, image/jpeg,image/jpg"
               >
                 <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
                 <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
@@ -425,8 +431,8 @@
               </el-select>
               <com-tree-select
                 v-else
-                v-model="ruleForm.deptId" :options="PubListTree" placeholder="选择组织机构"
-                :tree-props="deptProps"
+                ref="selectTreeRef" v-model="ruleForm.deptId" :options="PubListTree"
+                placeholder="选择组织机构" :tree-props="deptProps"
               />
             </el-form-item>
             <el-form-item label="计量专业" prop="major" class="marg-item">
@@ -489,29 +495,19 @@
           </el-col>
         </el-row>
       </el-form>
-      <!-- 证书基本信息 -->
-      <!-- 切换 -->
-      <!-- <el-radio-group v-model="current" style="margin-bottom: -15px;">
-          <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
-            {{ item.name }}
-          </el-radio-button>
-        </el-radio-group> -->
-      <div class="header" style="margin-top: 10px;">
-        <div class="title">
-          {{ current }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="info" @click="removeRow">
-            删除行
-          </el-button>
-          <el-button v-if="title !== '详情'" type="primary" @click="addRow">
-            添加行
-          </el-button>
-          <el-button v-if="title !== '详情'" type="primary" @click="editRow">
-            编辑行
-          </el-button>
-        </span>
-      </div>
+    </detail-page>
+    <detail-block :title="current">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="info" @click="removeRow">
+          删除行
+        </el-button>
+        <el-button v-if="title !== '详情'" type="primary" @click="addRow">
+          添加行
+        </el-button>
+        <el-button v-if="title !== '详情'" type="primary" @click="editRow">
+          编辑行
+        </el-button>
+      </template>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
         <el-table-column width="55" align="center">
           <template #default="scope">
@@ -523,7 +519,7 @@
         <el-table-column type="index" label="序号" width="55" />
         <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
       </el-table>
-    </div>
+    </detail-block>
     <!-- 添加证书信息组件 -->
     <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
     <!-- 选择用户列表组件 -->
@@ -532,77 +528,38 @@
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    background-color: #fff;
-    border-radius: 8px;
-    padding-top: 10px;
-    margin-top: 10px;
-    padding-right: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    display: flex;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    position: relative;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 5px;
-    }
-  }
-
-  :deep(.el-radio__label) {
-    display: none;
-  }
-
-  :deep(.el-icon.avatar-uploader-icon) {
-    font-size: 28px;
-    color: #8c939d;
-    width: 190px;
-    height: 250px;
-    text-align: center;
-  }
-
-  :deep(.avatar-uploader .avatar) {
-    width: 190px;
-    height: 250px;
-    display: block;
-  }
-
-  .isDetail {
-    ::v-deep {
-      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-        display: none;
-      }
-    }
-  }
+:deep(.el-radio__label) {
+  display: none;
 }
 
-.marg {
-  margin-top: 20px;
+:deep(.el-icon.avatar-uploader-icon) {
+  font-size: 28px;
+  color: #8c939d;
+  width: 190px;
+  height: 250px;
+  text-align: center;
 }
 
-.marg-item {
-  margin-top: 20px;
+:deep(.avatar-uploader .avatar) {
+  width: 190px;
+  height: 250px;
+  display: block;
+}
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
 }
 </style>
 
 <style scoped>
 .avatar-uploader .avatar {
-  width: 220px;
-  height: 320px;
+  width: 190px;
+  height: 250px;
   display: block;
 }
 </style>
@@ -624,8 +581,8 @@
 .el-icon.avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
-  width: 220px;
-  height: 320px;
+  width: 190px;
+  height: 250px;
   text-align: center;
 }
 </style>
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index ae48f11..042636e 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -4,7 +4,6 @@
 import dayjs from 'dayjs'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import type { technologyJobType } from '../person-interface'
-import certificateAddDialog from './certificateAddDialog.vue'
 import personListDialog from './personListDialog.vue'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
@@ -14,7 +13,8 @@
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
-const ruleFormRef = ref<FormInstance>() // from组件
+const ruleFormRef1 = ref<FormInstance>() // from组件
+const ruleFormRef2 = ref<FormInstance>() // from组件
 const meterStaff = ref({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -28,26 +28,43 @@
   workDate: '', // 从事日期
   id: '',
 })
+const baseInfo = ref({
+  certificateCompany: '',
+  certificateDate: '',
+  certificateName: '',
+  certificateNo: '',
+  validDate: '',
+  id: '',
+  isDel: 0,
+  minioFileName: '',
+  remark: '',
+})
 const ruleForm = ref({
   meterStaff: {}, // 人员信息
   staffId: '', // 计量人员id
 }) // 表单
-const multipleTableRef = ref<InstanceType<typeof ElTable>>()
 const title = ref('')
+const name = ref('')
 // 身份证号码验证规则
-const validateIDcard = (rule: any, value: any, callback: any) => {
-  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
-  if (rr.test(value)) {
-    callback()
-  }
-  else {
-    callback(new Error('验证失败'))
-  }
-}
+// const validateIDcard = (rule: any, value: any, callback: any) => {
+//   const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+//   if (rr.test(value)) {
+//     callback()
+//   }
+//   else {
+//     callback(new Error('验证失败'))
+//   }
+// }
 const rules = ref({
   staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
   // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
-
+}) // 表单验证规则
+const rules2 = ref({
+  certificateCompany: [{ required: true, message: '发证单位不能为空', trigger: 'blur' }],
+  certificateDate: [{ required: true, message: '发证日期不能为空', trigger: 'blur' }],
+  certificateName: [{ required: true, message: '证书名称不能为空', trigger: 'blur' }],
+  certificateNo: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
+  validDate: [{ required: true, message: '有效日期不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
 const userList = ref<userType[]>([]) // 可使用人列表
@@ -96,6 +113,17 @@
   meterStaff.value.major = ''
   meterStaff.value.workDate = ''
   meterStaff.value.id = ''
+  baseInfo.value = {
+    certificateCompany: '',
+    certificateDate: '',
+    certificateName: '',
+    certificateNo: '',
+    validDate: '',
+    id: '',
+    isDel: 0,
+    minioFileName: '',
+    remark: '',
+  }
 }
 const technologyJobList = ref<technologyJobType[]>([])
 // 获取技术职务列表
@@ -120,98 +148,14 @@
 const confirmPerson = (row: any) => {
   ruleForm.value.staffId = row.staffNo
   meterStaff.value = row
-  ruleFormRef.value?.clearValidate('staffNo')
+  ruleFormRef1.value?.clearValidate('staffNo')
 }
-const changeList = ref([
-  {
-    name: '证书基本信息',
-    data: [] as any[],
-    column: [
-      {
-        label: '证书号',
-        data: 'certificateNo',
-        id: 'zs02',
-      },
-      {
-        label: '证书名称',
-        data: 'certificateName',
-        id: 'zs03',
-      },
-      {
-        label: '发证日期',
-        data: 'certificateDate',
-        id: 'zs04',
-      },
-      {
-        label: '发证单位',
-        data: 'certificateCompany',
-        id: 'zs01',
-      },
-      {
-        label: '有效日期',
-        data: 'validDate',
-        id: 'zs05',
-      },
-    ],
-  },
-  {
-    name: '计量工作培训记录',
-    data: [],
-    column: [],
-  },
-  {
-    name: '业务记录',
-    data: [],
-    column: [],
-  },
-])
-const current = ref('证书基本信息')
-const currentShow = computed(() => {
-  return changeList.value.filter(item => item.name === current.value)[0]
-})
-const certificateRef = ref() // 添加证书信息弹窗
-// 添加行
-const addRow = () => {
-  certificateRef.value.initDialog({ title: '添加' })
-}
-// 编辑行
-const editRow = () => {
-  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
-}
-// 证书信息行内添加数据
-const addRowcertificate = (row: any, flag: string) => {
-  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
-  if (flag === 'update') {
-    changeList.value[0].data = [{
-      ...changeList.value[0].data[0],
-      ...row,
-      certificateStatus: diff < 0 ? '1' : '0',
-      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-    }]
-  }
-  else {
-    changeList.value[0].data.push(
-      {
-        ...row,
-        certificateStatus: diff < 0 ? '1' : '0',
-        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-        id: null,
-        isDel: 0,
-        minioFileName: '',
-        remark: '',
-        staffId: meterStaff.value.id,
-        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-      })
-  }
-}
-const currenSelect = ref<number>(-1) // 当前选中行
-// 删除行
-const removeRow = () => {
-  console.log(currenSelect.value)
-  if (currenSelect.value >= 0) {
+// 提交
+const submitForm = async (formEl1: FormInstance | undefined, formEl2: FormInstance | undefined) => {
+  if (!formEl1 || !formEl2) { return }
+  Promise.all([formEl1.validate(), formEl2.validate()]).then((res) => {
     ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
+      '确认提交吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -219,78 +163,49 @@
         type: 'warning',
       },
     ).then(() => {
-      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
-      currenSelect.value = -1
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 提交
-const submitForm = async (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  await formEl.validate((valid, fields) => {
-    if (valid) {
-      ElMessageBox.confirm(
-        '确认提交吗？',
-        '提示',
-        {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        },
-      ).then(() => {
-        let params
-        if (changeList.value[0].data.length) {
-          params = changeList.value[0].data
-        }
-        else {
-          params = [
-            {
-              certificateCompany: '',
-              certificateDate: '',
-              certificateName: '',
-              certificateNo: '',
-              certificateStatus: '',
-              createTime: '',
-              id: null,
-              isDel: 0,
-              minioFileName: '',
-              remark: '',
-              staffId: meterStaff.value.id,
-              updateTime: '',
-              validDate: '',
-            },
-          ]
-        }
-        (title.value === '新建'
-          ? addCertificateList
-          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
-          formEl?.resetFields()
-          ElMessage.success('提交成功')
-          emits('resetData')
-          resetFormData()
-        })
+      (title.value === '新建'
+        ? addCertificateList
+        : getCertificateUpdate)(title.value === '新建'
+        ? [{
+            ...baseInfo.value,
+            staffId: meterStaff.value.id,
+            createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+            updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+            certificateStatus: dayjs(baseInfo.value.validDate).diff(baseInfo.value.certificateDate, 'day') < 0 ? '1' : '0',
+            meterStaff: undefined,
+          }]
+        : {
+            ...baseInfo.value,
+            staffId: meterStaff.value.id,
+            createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+            updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+            certificateStatus: dayjs(baseInfo.value.validDate).diff(baseInfo.value.certificateDate, 'day') < 0 ? '1' : '0',
+            meterStaff: undefined,
+          }).then((res) => {
+        formEl1?.resetFields()
+        formEl2?.resetFields()
+        ElMessage.success('提交成功')
+        emits('resetData')
+        resetFormData()
       })
-    }
+    })
   })
 }
 // 取消
-const resetForm = (formEl: FormInstance | undefined) => {
+const resetForm = (formEl: FormInstance | undefined, formEl2: FormInstance | undefined) => {
   formEl?.resetFields()
-  changeList.value[0].data = []
+  formEl2?.resetFields()
   emits('resetData')
   resetFormData()
 }
+const selectTreeRef = ref()
 // 弹窗初始化
 const initDialog = (row: any) => {
-  changeList.value[0].data = []
   resetFormData()
   dialogVisible.value = true
   title.value = row.title
-  resetFormData()
+  name.value = row.name
+  selectTreeRef.value?.clearSelected()
   getuser()
   getPubList()
   getSexList()
@@ -303,8 +218,9 @@
   else {
     getCertificateDetail({ id: row.id }).then((res) => {
       if (res.code === 200) {
+        console.log(res, '证书记录')
         meterStaff.value = res.data.meterStaff
-        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+        baseInfo.value = res.data
       }
     })
   }
@@ -314,21 +230,16 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          证书记录-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
-            完成
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
-      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+    <detail-page :title=" `${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
+          完成
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef1, ruleFormRef2)">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef1" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="人员编号" prop="staffNo">
@@ -390,7 +301,8 @@
               </el-select>
               <com-tree-select
                 v-else
-                v-model="meterStaff.deptId" :options="PubListTree" placeholder="选择组织机构"
+                ref="selectTreeRef" v-model="meterStaff.deptId" :options="PubListTree"
+                placeholder="选择组织机构"
                 :tree-props="deptProps"
               />
             </el-form-item>
@@ -410,71 +322,52 @@
           </el-col>
         </el-row>
       </el-form>
-      <div class="header" style="margin-top: 10px;">
-        <div class="title">
-          {{ current }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title === '新建'" type="info" @click="removeRow">
-            删除行
-          </el-button>
-          <el-button v-if="title === '新建'" type="primary" @click="addRow">
-            添加行
-          </el-button>
-          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
-            编辑行
-          </el-button>
-        </span>
-      </div>
-      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
-        <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column>
-        <el-table-column type="index" label="序号" width="55" />
-        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
-      </el-table>
-    </div>
-    <!-- 添加证书信息组件 -->
-    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    </detail-page>
+    <detail-block title="证书基本信息">
+      <el-form ref="ruleFormRef2" :model="baseInfo" :rules="rules2" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="证书号" prop="certificateNo">
+              <el-input v-model.trim="baseInfo.certificateNo" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书名称" prop="certificateName">
+              <el-input v-model.trim="baseInfo.certificateName" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证单位" prop="certificateCompany">
+              <el-input v-model.trim="baseInfo.certificateCompany" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发证日期" prop="certificateDate">
+              <el-date-picker
+                v-model="baseInfo.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择发证日期"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书有效日期" prop="validDate">
+              <el-date-picker
+                v-model="baseInfo.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择有效日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block>
     <!-- 选择用户列表组件 -->
     <person-list-dialog ref="personListRef" @add="confirmPerson" />
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    background-color: #fff;
-    border-radius: 8px;
-    padding-top: 10px;
-    margin-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    display: flex;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    position: relative;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 5px;
-    }
-  }
-
   :deep(.el-radio__label) {
     display: none;
   }
@@ -487,40 +380,5 @@
       }
     }
   }
-}
-
-.marg {
-  margin-top: 20px;
-}
 </style>
 
-<style scoped>
-.avatar-uploader .avatar {
-  width: 178px;
-  height: 178px;
-  display: block;
-}
-</style>
-
-<style>
-.avatar-uploader .el-upload {
-  border: 1px dashed var(--el-border-color);
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-  transition: var(--el-transition-duration-fast);
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: var(--el-color-primary);
-}
-
-.el-icon.avatar-uploader-icon {
-  font-size: 28px;
-  color: #8c939d;
-  width: 178px;
-  height: 178px;
-  text-align: center;
-}
-</style>
diff --git a/src/views/measure/person/components/addRecordCancel.vue b/src/views/measure/person/components/addRecordCancel.vue
new file mode 100644
index 0000000..c32ac43
--- /dev/null
+++ b/src/views/measure/person/components/addRecordCancel.vue
@@ -0,0 +1,459 @@
+<!-- 计量人员新增  证书基本信息table表格   作废 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import type { technologyJobType } from '../person-interface'
+import certificateAddDialog from './certificateAddDialog.vue'
+import personListDialog from './personListDialog.vue'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import type { TreeStructure, userType } from '@/views/system/user/user-interface'
+import { getDictByCode } from '@/api/system/dict'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const meterStaff = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  idCard: '', // 身份证号
+  sex: '', // 性别
+  education: '', // 文化程度
+  technologyJob: '', // 技术职务
+  administrationJob: '', // 行政职务
+  deptId: '', // 工作部门
+  major: '', // 专业
+  workDate: '', // 从事日期
+  id: '',
+})
+const ruleForm = ref({
+  meterStaff: {}, // 人员信息
+  staffId: '', // 计量人员id
+}) // 表单
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const title = ref('')
+const name = ref('')
+// 身份证号码验证规则
+const validateIDcard = (rule: any, value: any, callback: any) => {
+  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+  if (rr.test(value)) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+const rules = ref({
+  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
+
+}) // 表单验证规则
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref<TreeStructure[]>([])
+const PubListTree = ref([])
+// 获取组织列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
+  })
+}
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sex').then((response) => {
+    sexList.value = response.data
+  })
+}
+const educationList = ref<technologyJobType[]>([])
+// 获取文化程度列表
+const geteducationList = () => {
+  getDictByCode('education').then((response) => {
+    educationList.value = response.data
+  })
+}
+// 重置表单内容
+const resetFormData = () => {
+  meterStaff.value.staffNo = ''
+  meterStaff.value.name = ''
+  meterStaff.value.idCard = ''
+  meterStaff.value.sex = ''
+  meterStaff.value.education = ''
+  meterStaff.value.technologyJob = ''
+  meterStaff.value.administrationJob = ''
+  meterStaff.value.deptId = ''
+  meterStaff.value.major = ''
+  meterStaff.value.workDate = ''
+  meterStaff.value.id = ''
+}
+const technologyJobList = ref<technologyJobType[]>([])
+// 获取技术职务列表
+const getTechnologyJobList = () => {
+  getDictByCode('technologyJob').then((response) => {
+    technologyJobList.value = response.data
+  })
+}
+const administrationJobList = ref<technologyJobType[]>([])
+// 获取行政职务列表
+const getAdministrationJob = () => {
+  getDictByCode('administrationJob').then((response) => {
+    administrationJobList.value = response.data
+  })
+}
+const personListRef = ref()
+// 选择人员
+const selectPerson = () => {
+  personListRef.value.initDialog()
+}
+// 保存选择人员信息
+const confirmPerson = (row: any) => {
+  ruleForm.value.staffId = row.staffNo
+  meterStaff.value = row
+  ruleFormRef.value?.clearValidate('staffNo')
+}
+const changeList = ref([
+  {
+    name: '证书基本信息',
+    data: [] as any[],
+    column: [
+      {
+        label: '证书号',
+        data: 'certificateNo',
+        id: 'zs02',
+      },
+      {
+        label: '证书名称',
+        data: 'certificateName',
+        id: 'zs03',
+      },
+      {
+        label: '发证日期',
+        data: 'certificateDate',
+        id: 'zs04',
+      },
+      {
+        label: '发证单位',
+        data: 'certificateCompany',
+        id: 'zs01',
+      },
+      {
+        label: '有效日期',
+        data: 'validDate',
+        id: 'zs05',
+      },
+    ],
+  },
+  {
+    name: '计量工作培训记录',
+    data: [],
+    column: [],
+  },
+  {
+    name: '业务记录',
+    data: [],
+    column: [],
+  },
+])
+const current = ref('证书基本信息')
+const currentShow = computed(() => {
+  return changeList.value.filter(item => item.name === current.value)[0]
+})
+const certificateRef = ref() // 添加证书信息弹窗
+// 添加行
+const addRow = () => {
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
+}
+// 证书信息行内添加数据
+const addRowcertificate = (row: any, flag: string) => {
+  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
+  if (flag === 'update') {
+    changeList.value[0].data = [{
+      ...changeList.value[0].data[0],
+      ...row,
+      certificateStatus: diff < 0 ? '1' : '0',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    }]
+  }
+  else {
+    changeList.value[0].data.push(
+      {
+        ...row,
+        certificateStatus: diff < 0 ? '1' : '0',
+        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        id: null,
+        isDel: 0,
+        minioFileName: '',
+        remark: '',
+        staffId: meterStaff.value.id,
+        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
+  }
+}
+const currenSelect = ref<number>(-1) // 当前选中行
+// 删除行
+const removeRow = () => {
+  console.log(currenSelect.value)
+  if (currenSelect.value >= 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
+      currenSelect.value = -1
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        let params
+        if (changeList.value[0].data.length) {
+          params = changeList.value[0].data
+        }
+        else {
+          params = [
+            {
+              certificateCompany: '',
+              certificateDate: '',
+              certificateName: '',
+              certificateNo: '',
+              certificateStatus: '',
+              createTime: '',
+              id: null,
+              isDel: 0,
+              minioFileName: '',
+              remark: '',
+              staffId: meterStaff.value.id,
+              updateTime: '',
+              validDate: '',
+            },
+          ]
+        }
+        (title.value === '新建'
+          ? addCertificateList
+          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
+          formEl?.resetFields()
+          ElMessage.success('提交成功')
+          emits('resetData')
+          resetFormData()
+        })
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  changeList.value[0].data = []
+  emits('resetData')
+  resetFormData()
+}
+const selectTreeRef = ref()
+// 弹窗初始化
+const initDialog = (row: any) => {
+  changeList.value[0].data = []
+  resetFormData()
+  dialogVisible.value = true
+  title.value = row.title
+  name.value = row.name
+  selectTreeRef.value.clearSelected()
+  resetFormData()
+  getuser()
+  getPubList()
+  getSexList()
+  geteducationList()
+  getTechnologyJobList()
+  getAdministrationJob()
+  if (row.title === '新建') {
+    console.log()
+  }
+  else {
+    getCertificateDetail({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        meterStaff.value = res.data.meterStaff
+        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+      }
+    })
+  }
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <detail-page :title=" `${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+          完成
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="人员编号" prop="staffNo">
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="selectPerson">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="meterStaff.name">
+              <el-input v-model.trim="meterStaff.name" placeholder="姓名" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="性别" prop="meterStaff.sex">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="文化程度" prop="meterStaff.education">
+              <el-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="技术职务" prop="meterStaff.technologyJob">
+              <el-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="行政职务" prop="meterStaff.administrationJob">
+              <el-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="工作部门" prop="deptId">
+              <el-select v-if="title === '详情'" v-model="meterStaff.deptId" disabled>
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+              <com-tree-select
+                v-else
+                ref="selectTreeRef" v-model="meterStaff.deptId" :options="PubListTree"
+                placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业" prop="major">
+              <el-input v-model.trim="meterStaff.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="从事日期" prop="workDate">
+              <el-date-picker
+                v-model="meterStaff.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择从事日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block :title="current">
+      <template #btns>
+        <el-button v-if="title === '新建'" type="info" @click="removeRow">
+          删除行
+        </el-button>
+        <el-button v-if="title === '新建'" type="primary" @click="addRow">
+          添加行
+        </el-button>
+        <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+          编辑行
+        </el-button>
+      </template>
+      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
+        <el-table-column width="55" align="center">
+          <template #default="scope">
+            <el-radio-group v-model="currenSelect" class="ml-4">
+              <el-radio :label="scope.$index" />
+            </el-radio-group>
+          </template>
+        </el-table-column>
+        <el-table-column type="index" label="序号" width="55" />
+        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </detail-block>
+    <!-- 添加证书信息组件 -->
+    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    <!-- 选择用户列表组件 -->
+    <person-list-dialog ref="personListRef" @add="confirmPerson" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        display: none;
+      }
+    }
+  }
+</style>
+
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 332c73c..178fc12 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -32,6 +32,7 @@
   form.validDate = ''
 }
 const initDialog = (row: any) => {
+  resetData()
   title.value = row.title
   if (row.title === '编辑') {
     form.certificateNo = row.certificateNo
@@ -50,10 +51,12 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       if (title.value === '编辑') {
-        emits('add', form, 'update')
+        const deptRow = JSON.parse(JSON.stringify(form))
+        emits('add', deptRow, 'update')
       }
       else {
-        emits('add', form, '')
+        const deptRow = JSON.parse(JSON.stringify(form))
+        emits('add', deptRow, '')
       }
       dialogFormVisible.value = false
     }
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 592d810..9c6f65d 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -30,7 +30,7 @@
   { text: '技术职务', value: 'technologyJob', align: 'center', width: '140' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '100' },
   { text: '计量专业', value: 'major', align: 'center', width: '100' },
-  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '180' },
   { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '技术考核', value: 'technologyExam', align: 'center', width: '85' },
 ]) // 表格
@@ -63,7 +63,7 @@
   loadingTable.value = true
   getStaffList(searchQuery).then((res) => {
     if (res.code === 200) {
-      res.data.records = res.data.records.map((item: StaffType) => ({ ...item, sex: item.sex == '1' ? '男' : '女', technologyExam: item.technologyExam == '0' ? '已考核' : '未考核' }))
+      res.data.records = res.data.records.map((item: StaffType) => ({ ...item, sex: item.sex == '1' ? '男' : '女', technologyExam: item.technologyExam == '0' ? '已考核' : '未考核', certificateDate: item.certificateDate.split(' ')[0] }))
       list.value = res.data.records
       total.value = Number(res.data.total)
     }
@@ -236,21 +236,11 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="proxy.hasPerm(`/measure/person/list/import`)" type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" type="primary" @click="templateDownload">
-            模板下载
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/list/add`)" type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/list/export`)" type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" type="primary" @click="print">
-            打印
-          </el-button>
+          <icon-button v-if="proxy.hasPerm(`/measure/person/list/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/list/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/list/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index 17b92d3..e44001a 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -295,15 +295,17 @@
         </el-button>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
-      <el-form-item>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer footer">
         <el-button type="primary" @click="submitForm(ruleFormRef)">
           发布
         </el-button>
         <el-button @click="resetForm(ruleFormRef)">
           关闭
         </el-button>
-      </el-form-item>
-    </el-form>
+      </div>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index 3d5c2e3..0926957 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -172,15 +172,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <el-button v-if="proxy.hasPerm('/sys/notice/list/add')" type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/sys/notice/list/export')" type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/sys/notice/list/print')" v-print="printObj" type="primary">
-          打印
-        </el-button>
+        <icon-button v-if="proxy.hasPerm('/sys/notice/list/add')" icon="icon-add" title="新建" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/sys/notice/list/export')" icon="icon-export" title="导出" @click="exportExcelBtn" />
+        <icon-button v-if="proxy.hasPerm('/sys/notice/list/print')" v-print="printObj" icon="icon-print" title="打印" />
       </template>
       <!-- 表格区域 -->
       <normal-table
diff --git a/src/views/system/notice/noticeDetail.vue b/src/views/system/notice/noticeDetail.vue
index 441ef0f..94468d4 100644
--- a/src/views/system/notice/noticeDetail.vue
+++ b/src/views/system/notice/noticeDetail.vue
@@ -97,15 +97,14 @@
         </el-link>
         <span v-else>暂无附件</span>
       </el-form-item>
-      <el-form-item>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer footer">
         <el-button type="primary" @click="submitForm()">
           确认
         </el-button>
-        <!-- <el-button @click="resetForm(ruleFormRef)">
-          关闭
-        </el-button> -->
-      </el-form-item>
-    </el-form>
+      </div>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/src/views/system/tool/autograph/addDDialog.vue b/src/views/system/tool/autograph/addDDialog.vue
index d34e8ef..e39b706 100644
--- a/src/views/system/tool/autograph/addDDialog.vue
+++ b/src/views/system/tool/autograph/addDDialog.vue
@@ -200,15 +200,17 @@
         </el-button>
         <input v-show="title === '123'" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
-      <el-form-item>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer footer">
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
           发布
         </el-button>
         <el-button @click="resetForm(ruleFormRef)">
           关闭
         </el-button>
-      </el-form-item>
-    </el-form>
+      </div>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/src/views/system/tool/autograph/autograph.vue b/src/views/system/tool/autograph/autograph.vue
index 8fffe07..ac9f000 100644
--- a/src/views/system/tool/autograph/autograph.vue
+++ b/src/views/system/tool/autograph/autograph.vue
@@ -191,15 +191,9 @@
     <table-container>
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/add')" type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/export')" type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/print')" v-print="printObj" type="primary">
-          打印
-        </el-button>
+        <icon-button v-if="proxy.hasPerm('/sys/tool/autograph/add')" icon="icon-add" title="新建" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/sys/tool/autograph/export')" icon="icon-export" title="导出" @click="exportExcelBtn" />
+        <icon-button v-if="proxy.hasPerm('/sys/tool/autograph/print')" v-print="printObj" icon="icon-print" title="打印" />
       </template>
       <!-- 表格区域 -->
       <normal-table

diff --git a/src/components.d.ts b/src/components.d.ts
index 6e85584..815d62f 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -16,14 +16,13 @@
     BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default']
     BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
-    Benchcol: typeof import('./components/benchcol/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/DetailPage/index copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
+    DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
diff --git a/src/components/DetailPage/DetailBlockSwitch.vue b/src/components/DetailPage/DetailBlockSwitch.vue
new file mode 100644
index 0000000..4d92074
--- /dev/null
+++ b/src/components/DetailPage/DetailBlockSwitch.vue
@@ -0,0 +1,71 @@
+<script lang="ts" setup name="DetailBlock">
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+})
+
+const slots = useSlots()
+</script>
+
+<template>
+  <div class="detail-main">
+    <div class="header">
+      <div class="menu">
+        <slot name="menu" />
+      </div>
+      <div class="title">
+        {{ title }}
+      </div>
+      <div class="btns">
+        <slot name="btns" />
+      </div>
+    </div>
+    <div v-if="slots.default" class="content">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-main {
+  background-color: #fff;
+  border-radius: 8px;
+  margin-top: 10px;
+  padding-top: 10px;
+
+  .header {
+    position: relative;
+    height: 40px;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+
+    .title {
+      font-weight: 500;
+    }
+
+    .btns {
+      position: absolute;
+      right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+
+    .menu {
+      position: absolute;
+      left: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+
+  .content {
+    background-color: #fff;
+    padding: 0 10px 20px;
+    margin-top: 10px;
+  }
+}
+</style>
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d6c1c91..1644a80 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -314,6 +314,39 @@
       },
     ],
   },
+  {
+    path: '/borrow',
+    component: Layout,
+    redirect: '/device/borrow/borrowapply',
+    name: 'Borrow',
+    meta: {
+      title: '设备领用',
+      icon: 'ep:key',
+      auth: '/device/borrow',
+    },
+    children: [
+      {
+        path: 'borrowapply',
+        name: 'borroWapply',
+        component: () => import('@/views/device/borrow/borrwoApply.vue'),
+        meta: {
+          title: '设备借用申请',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowapply',
+        },
+      },
+      {
+        path: 'borrowhandle',
+        name: 'borrowHandle',
+        component: () => import('@/views/device/borrow/borrowHandle.vue'),
+        meta: {
+          title: '设备借用处理',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowhandle',
+        },
+      },
+    ],
+  },
 
 ]
 
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
new file mode 100644
index 0000000..1c2405e
--- /dev/null
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="borrowHandle">
+// 逻辑代码
+</script>
+
+<template>
+  <app-container>
+    设备借用处理
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
new file mode 100644
index 0000000..03d414b
--- /dev/null
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="borrowApply">
+// 逻辑代码
+</script>
+
+<template>
+  <app-container>
+    设备借用申请
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index c2682fc..5f7b347 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -339,381 +339,374 @@
 
 <template>
   <div class="body-container">
-    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资产编号" prop="assetNo">
-            <el-input v-model.trim="ruleForm.assetNo" placeholder="系统自动生成" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="资产类型" prop="assetType">
-            <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备编号" prop="equipmentNo">
-            <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备名称" prop="equipmentName">
-            <el-input v-model.trim="ruleForm.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="生产厂家" prop="manufacturer">
-            <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="厂家国别" prop="manufacturerCountry">
-            <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="出厂编号" prop="manufacturingNo">
-            <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="出厂年月" prop="manufacturingDate">
-            <el-date-picker
-              v-model="ruleForm.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '出厂年月'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="型号" prop="modelNo">
-            <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="管理状态" prop="managerState">
-            <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="ABC" prop="abc">
-            <el-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'">
-              <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="标签绑定" prop="labelBind">
-            <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === '详情' ? '' : '标签'" :disabled="title === '详情'" clearable>
-              <template #append>
-                <el-button type="primary" size="small">
-                  扫描
-                </el-button>
-              </template>
-            </el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="立卡年月" prop="cardEstablishmentDate">
-            <el-date-picker
-              v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '立卡年月'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="启用日期" prop="enableDate">
-            <el-date-picker
-              v-model="ruleForm.enableDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '启用日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定方式" prop="mesureType">
-            <el-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'">
-              <el-option v-for="item in mesureTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定周期" prop="mesureCycle">
-            <el-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="12">
-          <el-form-item label="测量范围" prop="mesureRange">
-            <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === '详情' ? '' : '测量范围'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="不确定度" prop="uncertainty">
-            <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === '详情' ? '' : '不确定度'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="使用部门" prop="useDept">
-            <com-tree-select
-              v-if="title !== '详情'"
-              v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-              :tree-props="deptProps"
-            />
-            <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
-              <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="使用人" prop="usePerson">
-            <el-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'">
-              <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="专业分类" prop="majorCategory">
-            <el-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'">
-              <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="检定部门" prop="mesureDept">
-            <com-tree-select
-              v-if="title !== '详情'"
-              v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-              :tree-props="deptProps"
-            />
-            <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
-              <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定日期" prop="mesureDate">
-            <el-date-picker
-              v-model="ruleForm.mesureDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '检定日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="有效日期" prop="validDate">
-            <el-date-picker
-              v-model="ruleForm.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '有效日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定结果" prop="mesureResult">
-            <el-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'">
-              <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="8">
-          <el-form-item label="是否是技术指标需要校准/检定的设备" prop="isCalibrationTestEquipment" label-width="260px">
-            <el-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否是测量工装台账" prop="isMeasureAccount" label-width="260px">
-            <el-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否标准配套设备" prop="isStandardSupportEquipment" label-width="260px">
-            <el-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
+    <detail-block-switch title="基本信息">
+      <template #menu>
+        <slot name="menuswitch" />
+      </template>
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资产编号" prop="assetNo">
+              <el-input v-model.trim="ruleForm.assetNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="资产类型" prop="assetType">
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备编号" prop="equipmentNo">
+              <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="生产厂家" prop="manufacturer">
+              <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="厂家国别" prop="manufacturerCountry">
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号" prop="manufacturingNo">
+              <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂年月" prop="manufacturingDate">
+              <el-date-picker
+                v-model="ruleForm.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '出厂年月'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="型号" prop="modelNo">
+              <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="管理状态" prop="managerState">
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="ABC" prop="abc">
+              <el-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'">
+                <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标签绑定" prop="labelBind">
+              <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === '详情' ? '' : '标签'" :disabled="title === '详情'" clearable>
+                <template #append>
+                  <el-button type="primary" size="small">
+                    扫描
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="立卡年月" prop="cardEstablishmentDate">
+              <el-date-picker
+                v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '立卡年月'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="启用日期" prop="enableDate">
+              <el-date-picker
+                v-model="ruleForm.enableDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '启用日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定方式" prop="mesureType">
+              <el-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'">
+                <el-option v-for="item in mesureTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定周期" prop="mesureCycle">
+              <el-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="测量范围" prop="mesureRange">
+              <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === '详情' ? '' : '测量范围'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="不确定度" prop="uncertainty">
+              <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === '详情' ? '' : '不确定度'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="使用部门" prop="useDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
+                :tree-props="deptProps"
+              />
+              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="使用人" prop="usePerson">
+              <el-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'">
+                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="专业分类" prop="majorCategory">
+              <el-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'">
+                <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="检定部门" prop="mesureDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                :tree-props="deptProps"
+              />
+              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定日期" prop="mesureDate">
+              <el-date-picker
+                v-model="ruleForm.mesureDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '检定日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="有效日期" prop="validDate">
+              <el-date-picker
+                v-model="ruleForm.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '有效日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定结果" prop="mesureResult">
+              <el-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'">
+                <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="8">
+            <el-form-item label="是否是技术指标需要校准/检定的设备" prop="isCalibrationTestEquipment" label-width="260px">
+              <el-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否是测量工装台账" prop="isMeasureAccount" label-width="260px">
+              <el-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否标准配套设备" prop="isStandardSupportEquipment" label-width="260px">
+              <el-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资产来源" prop="assetSource">
-            <el-input v-model.trim="ruleForm.assetSource" :placeholder="title === '详情' ? '' : '资产来源'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备规格" prop="equipmentSpecifications">
-            <el-input v-model.trim="ruleForm.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备类别" prop="equipmentCategory">
-            <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
-              <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备类型" prop="equipmentType">
-            <el-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'">
-              <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资本来源" prop="capitalSource">
-            <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
-              <el-option v-for="item in capitalSourceList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="管理级别" prop="managerLevel">
-            <el-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'">
-              <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="用途" prop="purpose">
-            <el-input v-model.trim="ruleForm.purpose" :placeholder="title === '详情' ? '' : '用途'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="技术水平" prop="technicalLevel">
-            <el-input v-model.trim="ruleForm.technicalLevel" :placeholder="title === '详情' ? '' : '技术水平'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="完好状态" prop="intactState">
-            <el-input v-model.trim="ruleForm.intactState" :placeholder="title === '详情' ? '' : '完好状态'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="外形尺寸" prop="overallDimension">
-            <el-input v-model.trim="ruleForm.overallDimension" :placeholder="title === '详情' ? '' : '外形尺寸'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="重量(吨)" prop="weight">
-            <el-input v-model.trim="ruleForm.weight" :placeholder="title === '详情' ? '' : '重量'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="单价" prop="singlePrice">
-            <el-input v-model.trim="ruleForm.singlePrice" :placeholder="title === '详情' ? '' : '单价'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="安装及杂费" prop="installIncidentalExpenses">
-            <el-input v-model.trim="ruleForm.installIncidentalExpenses" :placeholder="title === '详情' ? '' : '安装及杂费'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="安装地点" prop="installPlace">
-            <el-input v-model.trim="ruleForm.installPlace" :placeholder="title === '详情' ? '' : '安装地点'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="原值" prop="originValue">
-            <el-input v-model.trim="ruleForm.originValue" :placeholder="title === '详情' ? '' : '原值'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="目前原值" prop="presentOriginValue">
-            <el-input v-model.trim="ruleForm.presentOriginValue" :placeholder="title === '详情' ? '' : '目前原值'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="折旧年限" prop="depreciationPeriod">
-            <el-input v-model.trim="ruleForm.depreciationPeriod" :placeholder="title === '详情' ? '' : '折旧年限'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="折旧方法" prop="depreciationMethod">
-            <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
-              <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="属性" prop="attribute">
-            <el-input v-model.trim="ruleForm.attribute" placeholder="属性" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="12">
-          <el-form-item label="说明书" prop="minioFileName">
-            <show-photo :minio-file-name="ruleForm.fileList[0]?.minioFileName || ''" />
-            <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
-            <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
-              {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
-            </el-button>
-            <span v-if="title === '详情' && !ruleForm.fileList[0]?.minioFileName">暂无</span>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="24">
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" placeholder="备注" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资产来源" prop="assetSource">
+              <el-input v-model.trim="ruleForm.assetSource" :placeholder="title === '详情' ? '' : '资产来源'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备规格" prop="equipmentSpecifications">
+              <el-input v-model.trim="ruleForm.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备类别" prop="equipmentCategory">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+                <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备类型" prop="equipmentType">
+              <el-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'">
+                <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资本来源" prop="capitalSource">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+                <el-option v-for="item in capitalSourceList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="管理级别" prop="managerLevel">
+              <el-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'">
+                <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="用途" prop="purpose">
+              <el-input v-model.trim="ruleForm.purpose" :placeholder="title === '详情' ? '' : '用途'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="技术水平" prop="technicalLevel">
+              <el-input v-model.trim="ruleForm.technicalLevel" :placeholder="title === '详情' ? '' : '技术水平'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="完好状态" prop="intactState">
+              <el-input v-model.trim="ruleForm.intactState" :placeholder="title === '详情' ? '' : '完好状态'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="外形尺寸" prop="overallDimension">
+              <el-input v-model.trim="ruleForm.overallDimension" :placeholder="title === '详情' ? '' : '外形尺寸'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="重量(吨)" prop="weight">
+              <el-input v-model.trim="ruleForm.weight" :placeholder="title === '详情' ? '' : '重量'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="单价" prop="singlePrice">
+              <el-input v-model.trim="ruleForm.singlePrice" :placeholder="title === '详情' ? '' : '单价'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="安装及杂费" prop="installIncidentalExpenses">
+              <el-input v-model.trim="ruleForm.installIncidentalExpenses" :placeholder="title === '详情' ? '' : '安装及杂费'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="安装地点" prop="installPlace">
+              <el-input v-model.trim="ruleForm.installPlace" :placeholder="title === '详情' ? '' : '安装地点'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="原值" prop="originValue">
+              <el-input v-model.trim="ruleForm.originValue" :placeholder="title === '详情' ? '' : '原值'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="目前原值" prop="presentOriginValue">
+              <el-input v-model.trim="ruleForm.presentOriginValue" :placeholder="title === '详情' ? '' : '目前原值'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="折旧年限" prop="depreciationPeriod">
+              <el-input v-model.trim="ruleForm.depreciationPeriod" :placeholder="title === '详情' ? '' : '折旧年限'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="折旧方法" prop="depreciationMethod">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+                <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="属性" prop="attribute">
+              <el-input v-model.trim="ruleForm.attribute" placeholder="属性" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="说明书" prop="minioFileName">
+              <show-photo :minio-file-name="ruleForm.fileList[0]?.minioFileName || ''" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
+                {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
+              </el-button>
+              <span v-if="title === '详情' && !ruleForm.fileList[0]?.minioFileName">暂无</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" placeholder="备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block-switch>
   </div>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    padding-top: 20px;
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index f46553a..fc3fd54 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -360,20 +360,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          固定资产-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`固定资产-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -763,44 +758,11 @@
           </el-row>
         </div> -->
       </el-form>
-    </div>
+    </detail-page>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index 0abbdb1..6e88e96 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -74,33 +74,29 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ name }} -{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm">
-            关闭
-          </el-button>
-        </span>
-      </div>
-      <div class="body">
-        <!-- 三级菜单 -->
-        <el-radio-group v-model="current">
-          <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
-            {{ item.name }}
-          </el-radio-button>
-        </el-radio-group>
-      </div>
-      <!-- 展示区域 -->
-      <keep-alive>
-        <component :is="currentComp" ref="currentCompRef" :name="current" :title="title" :row="row" />
-      </keep-alive>
-    </div>
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <!-- 展示区域 -->
+    <keep-alive>
+      <component :is="currentComp" ref="currentCompRef" :name="current" :title="title" :row="row">
+        <template #menuswitch>
+          <!-- 三级菜单 -->
+          <el-radio-group v-model="current">
+            <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+              {{ item.name }}
+            </el-radio-button>
+          </el-radio-group>
+        </template>
+      </component>
+    </keep-alive>
   </app-container>
 </template>
 
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f9cdcd0..f653095 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -256,7 +256,7 @@
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
-  // 原生上传图片
+  // 原生上传
   // console.log(event.target.files)
   // if (event.target.files[0].type === 'application/pdf') {
   if (event.target.files?.length !== 0) {
@@ -354,7 +354,7 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" type="primary" @click="identify">
+          <!-- <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" type="primary" @click="identify">
             标签识别
           </el-button>
           <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/import`)" type="primary" @click="batchImport">
@@ -371,7 +371,13 @@
           </el-button>
           <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/print`)" v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/device/standingBook/components/templateTable.vue b/src/views/device/standingBook/components/templateTable.vue
index 8a928f0..7aa563f 100644
--- a/src/views/device/standingBook/components/templateTable.vue
+++ b/src/views/device/standingBook/components/templateTable.vue
@@ -245,11 +245,11 @@
   <div>
     <!-- 添加证书信息组件 -->
     <add-row ref="addRowRef" @add="addRowData" />
-    <div class="header">
-      <div class="title">
-        <!-- {{ $props.name }} -->
-      </div>
-      <span class="btns">
+    <detail-block-switch :title="name">
+      <template #menu>
+        <slot name="menuswitch" />
+      </template>
+      <template #btns>
         <el-button v-if="title !== '详情'" type="info" @click="removeRow">
           删除行
         </el-button>
@@ -259,55 +259,33 @@
         <el-button v-if="title !== '详情'" type="primary" @click="editRow">
           编辑行
         </el-button>
-      </span>
-    </div>
-    <!-- 表格区域 -->
-    <normal-table
-      id="print"
-      :data="list" :total="total" :columns="columns as any"
-      :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-      :list-loading="loadingTable"
-      style="padding-top: 20px;background-color: #fff;"
-      @change="changePage"
-    >
-      <template #preColumns>
-        <el-table-column label="" width="55" align="center">
-          <template #default="scope">
-            <el-radio v-model="select" :label="scope.$index" class="radio" />
-          </template>
-        </el-table-column>
-        <el-table-column label="序号" width="55" align="center">
-          <template #default="scope">
-            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-          </template>
-        </el-table-column>
       </template>
-    </normal-table>
+      <!-- 表格区域 -->
+      <normal-table
+        id="print"
+        :data="list" :total="total" :columns="columns as any"
+        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+        :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </detail-block-switch>
   </div>
 </template>
 
 <style lang="scss" scoped>
-.header {
-  background-color: #fff;
-  // height: 40px;
-  border-radius: 8px;
-  display: flex;
-  align-items: center;
-  flex-direction: column;
-  justify-content: center;
-  position: relative;
-
-  .title {
-    // font-weight: 700;
-  }
-
-  .btns {
-    position: absolute;
-    right: 40px;
-    top: -22px;
-  }
-}
-
 :deep(.el-radio__label) {
   display: none;
 }
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 7538bc8..78a3800 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -272,24 +272,12 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/identify`)" type="primary" @click="identify">
-            标签识别
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/import`)" type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/mould`)" type="primary" @click="templateDownload">
-            模板下载
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/add`)" type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/export`)" type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/print`)" v-print="printObj" type="primary">
-            打印
-          </el-button>
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/identify`)" icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index fc364c8..e74d70e 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -361,20 +361,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ name }} - {{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -458,73 +453,33 @@
           </el-col>
         </el-row>
       </el-form>
-      <div v-if="title !== '新建' ">
-        <div class="header" style="margin-top: 10px;">
-          <div class="title">
-            审批流程
-          </div>
-        </div>
-        <div class="timeline">
-          <el-timeline>
-            <el-timeline-item timestamp="2018/4/12" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/12 20:46</p>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="2018/4/3" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/3 20:46</p>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="2018/4/2" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/2 20:46</p>
-              </el-card>
-            </el-timeline-item>
-          </el-timeline>
-        </div>
-      </div>
-    </div>
+    </detail-page>
+    <detail-block v-if="title !== '新建' " title="审批流程">
+      <el-timeline>
+        <el-timeline-item timestamp="2018/4/12" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/12 20:46</p>
+          </el-card>
+        </el-timeline-item>
+        <el-timeline-item timestamp="2018/4/3" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/3 20:46</p>
+          </el-card>
+        </el-timeline-item>
+        <el-timeline-item timestamp="2018/4/2" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/2 20:46</p>
+          </el-card>
+        </el-timeline-item>
+      </el-timeline>
+    </detail-block>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .timeline {
   background-color: #fff;
 }
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index aa3963f..737568d 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -1,6 +1,6 @@
 <!-- 状态管理公共列表组件 -->
 <script lang="ts" setup>
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessageBox } from 'element-plus'
 import approve from './approvalActionDialog.vue'
 import addDialog from './templateAdd.vue'
 const props = defineProps({
@@ -142,7 +142,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: any) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     title: '详情',
@@ -150,7 +150,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: any) => {
   dialogVisible.value = true
   // addRef.value.initDialog({
   //   title: '编辑',
@@ -158,7 +158,7 @@
   // })
 }
 // 删除
-const remove = (row) => {
+const remove = (row: any) => {
   ElMessageBox.confirm(
     `确认删除${row.equipmentName}吗？`,
     '提示',
@@ -181,20 +181,20 @@
   // })
 }
 // 同意
-const agree = (row) => {
+const agree = (row: any) => {
   console.log(approveRef.value)
   approveRef.value.initDialog({
     radio: '1',
   })
 }
 // 驳回
-const reject = (row) => {
+const reject = (row: any) => {
   approveRef.value.initDialog({
     radio: '3',
   })
 }
 // 拒绝
-const refuse = (row) => {
+const refuse = (row: any) => {
   approveRef.value.initDialog(
     {
       radio: '2',
@@ -202,7 +202,7 @@
   )
 }
 // 取消
-const cancel = (row) => {
+const cancel = (rowrow: any) => {
   ElMessageBox.confirm(
     '确认取消吗？',
     '提示',
@@ -301,20 +301,20 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+          <el-input placeholder="申请编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="设备编号" clearable class="w-50 m-2" />
+          <el-input placeholder="设备编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.modelNo" placeholder="设备名称" clearable class="w-50 m-2" />
+          <el-input placeholder="设备名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请单位" clearable class="w-50 m-2" />
+          <el-input placeholder="申请单位" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.publisher" placeholder="申请状态" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" />
+          <el-select placeholder="申请状态" clearable>
+            <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" /> -->
           </el-select>
         </search-item>
       </search-area>
@@ -328,7 +328,10 @@
           <el-button type="primary" @click="templateDownload">
             模板下载
           </el-button> -->
-          <el-button type="primary" @click="add">
+          <icon-button icon="icon-add" title="新建" @click="add" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+          <!-- <el-button type="primary" @click="add">
             新建
           </el-button>
           <el-button type="primary" @click="exportExcelBtn">
@@ -336,7 +339,7 @@
           </el-button>
           <el-button v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
         </template>
         <!-- 表格区域 -->
         <normal-table
@@ -386,22 +389,3 @@
     </app-container>
   </div>
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 154px !important;
-}
-
-.normal-date {
-  width: 154px !important;
-}
-
-.normal-select {
-  width: 154px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
-
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 0763c5a..9ef0b93 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -19,7 +19,6 @@
 const effectiveStatusName = ref('')
 const title = ref('')
 const fileList = ref<UploadUserFile[]>([])
-console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -80,10 +79,9 @@
   if (row.title === '新建') {
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
-    ruleForm.publisher = ''
+    ruleForm.publisher = userInfo.$state.deptName
     ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 判断有无存储
-    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
     if (sessionStorage.getItem(fileTypeName.value)) {
       const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
       ruleForm.fileType = session.fileType
@@ -117,6 +115,8 @@
     ruleForm.remark = row.remark
     ruleForm.publishTime = row.publishTime
     ruleForm.minioFileName = row.minioFileName
+    // ruleForm.publisher = '0'
+    // ruleForm.createUserId = '1'
   }
 }
 defineExpose({ initDialog })
@@ -148,6 +148,9 @@
       type: 'warning',
     },
       ).then((res) => {
+        if (ruleForm.publisher === userInfo.$state.deptName) {
+          ruleForm.publisher === userInfo.$state.deptId
+        }
         if (flag == '提交') {
           addApi(ruleForm).then((res) => {
             if (res.code == 200) {
@@ -193,7 +196,6 @@
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        console.log(res.data[0])
         ruleForm.minioFileName = res.data[0]
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
@@ -216,7 +218,6 @@
 // ])
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
-  console.log(diffDat)
   if (diffDat < 0) {
     // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '在使用'
@@ -237,7 +238,7 @@
 
 <template>
   <app-container v-if="dialogVisible" style="overflow: hidden;">
-    <detail-page :title="`${title}${fileTypeName}`">
+    <detail-page :title="`${fileTypeName}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
           提交
@@ -278,12 +279,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="发布单位" prop="publisher">
-              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'" class="fill-input">
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled>
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
               <com-tree-select
                 v-else
-                v-model="ruleForm.publisher" :options="PubListTree" placeholder="选择组织机构"
+                v-model="ruleForm.publisher" :options="PubListTree" placeholder="请选择发布单位"
                 :tree-props="deptProps"
               />
             </el-form-item>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 44e3e4d..b45fbc3 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -324,22 +324,9 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <!-- <el-button type="primary" @click="batchImport">
-            批量导入
-          </el-button> -->
-          <!-- <el-button type="primary" @click="templateDownload">
-            模板下载
-          </el-button> -->
-          <!-- <el-button type="primary" @click="add">
-            新建
-          </el-button> -->
-          <el-button type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-print="printObj" type="primary">
-            打印
-          </el-button>
+          <!-- <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange"> -->
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 4677e48..7d4724b 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -204,13 +204,9 @@
     loading.close()
   })
 }
-// 打印
-const print = () => {
-
-}
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
-  // 原生上传图片
+  // 原生上传
   // console.log(event.target.files)
   // if (event.target.files[0].type === 'application/pdf') {
   if (event.target.files?.length !== 0) {
@@ -264,7 +260,7 @@
         <search-item>
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
-        <search-item>
+        <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
@@ -273,13 +269,13 @@
               :value="item.value"
             />
           </el-select>
-        </search-item>
+        </search-item> -->
         <search-item>
           <el-date-picker
             v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 155px;"
+            style="width: 185px;"
           />
         </search-item>
         <search-item>
@@ -287,19 +283,19 @@
             v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 155px;"
+            style="width: 185px;"
           />
         </search-item>
         <search-item>
-          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select> -->
-          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
+          </el-select>
+          <!-- <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" /> -->
         </search-item>
       </search-area>
       <table-container>
@@ -310,7 +306,7 @@
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
-          <icon-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" @click="print" />
+          <icon-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index cf0dd4f..5ca3275 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -3,11 +3,11 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { detailType } from '../measureDept-interface'
-import { getUserList } from '@/api/system/user'
+// import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
+import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import type { userType } from '@/views/system/user/user-interface'
 import { listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
-import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
 const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -31,11 +31,20 @@
   technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
+// 获取计量人员列表
 const getuser = () => {
-  getUserList({ offset: 1, limit: 99999 }).then((res) => {
-    userList.value = res.data.rows
+  getStaffList({
+    staffNo: '', // 人员编号
+    name: '', // 姓名
+    deptId: ruleForm.value.deptId, // 所在部门
+    limit: 999999,
+    offset: 1,
+  }).then((res) => {
+    if (res.code === 200) {
+      userList.value = res.data.records
+    }
   })
-} // 获取用户列表
+}
 const technologyJobList = ref<{ id: string;name: string;value: string }[]>([])
 // 获取技术职务列表
 const getTechnologyJobList = () => {
@@ -50,7 +59,16 @@
     administrationJobList.value = response.data
   })
 }
-
+// 选择负责人自动填充职务信息
+const directorChange = (val: string) => {
+  const selectUser = userList.value.filter(item => item.name === val)[0]
+  getStaffDetail(selectUser).then((res) => {
+    if (res.code === 200) {
+      ruleForm.value.administrationJob = res.data.administrationJob
+      ruleForm.value.technologyJob = res.data.technologyJob
+    }
+  })
+}
 // 提交
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
@@ -95,12 +113,6 @@
 const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
-// const searchQuery = ref({
-//   limit: 10,
-//   offset: 1,
-//   total: 0,
-//   pageSizes: [10, 20, 30],
-// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -410,20 +422,6 @@
     }
   })
 }
-// const handleSizeChange = (val: number) => {
-//   searchQuery.value.limit = val
-//   getDepartmentList()
-//   getuserInfoList()
-//   getInstrumentInfo()
-//   getDeviceInfo()
-// }
-// const handleCurrentChange = (val: number) => {
-//   searchQuery.value.offset = val
-//   getDepartmentList()
-//   getuserInfoList()
-//   getInstrumentInfo()
-//   getDeviceInfo()
-// }
 // 弹窗初始化
 const initDialog = (row: any) => {
   reset()
@@ -460,22 +458,17 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title.split('-')[2] === '编辑'" type="primary" @click="submitForm(ruleFormRef)">
-            提交
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="title">
+      <template #btns>
+        <el-button v-if="title.split('-')[2] === '编辑'" type="primary" @click="submitForm(ruleFormRef)">
+          提交
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title.split('-')[2] === '详情' ? 'isDetail' : '']">
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item :label=" `${title.split('-')[1]}编号`" prop="organizeNo">
               <el-input v-model.trim="ruleForm.organizeNo" placeholder="系统自动生成" disabled />
@@ -487,7 +480,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="title.split('-')[1] === '工程组'" :gutter="24" class="marg">
+        <el-row v-if="title.split('-')[1] === '工程组'" :gutter="24">
           <el-col :span="6">
             <el-form-item label="科室编号">
               <el-input v-model.trim="ruleForm.pDeptId" disabled />
@@ -509,10 +502,10 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
-              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" @change="directorChange">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.name" />
               </el-select>
             </el-form-item>
@@ -532,7 +525,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="24">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
               <el-input v-model.trim="ruleForm.remark" :placeholder="title.split('-')[2] === '详情' ? '' : '备注'" :disabled="title.split('-')[2] === '详情'" />
@@ -540,85 +533,24 @@
           </el-col>
         </el-row>
       </el-form>
-      <!-- 科室信息-人员信息等列表切换 -->
-      <div>
-        <div class="header" style="margin-top: 10px;">
-          <!-- 切换 -->
-          <el-radio-group v-model="current" class="change-btn">
-            <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
-              {{ item.name }}
-            </el-radio-button>
-          </el-radio-group>
-          <div class="title">
-            {{ current }}
-          </div>
-          <span class="btns">
-          <!-- <el-button type="info" :disabled="title === '详情'" @click="removeRow">
-            删除行
-          </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
-            添加行
-          </el-button> -->
-          </span>
-        </div>
-        <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <el-table-column type="index" label="序号" width="55" align="center" />
-          <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
-        </el-table>
-        <!-- <div style="width: 100%;margin-top: 10px;">
-          <el-pagination
-            :current-page="searchQuery.offset"
-            :page-sizes="searchQuery.pageSizes"
-            :page-size="searchQuery.limit"
-            :total="searchQuery.total"
-            layout="total, sizes, prev, pager, next"
-            hide-on-single-page
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-          />
-        </div> -->
-      </div>
-    </div>
+    </detail-page>
+    <detail-block-switch :title="current">
+      <template #menu>
+        <el-radio-group v-model="current" class="change-btn">
+          <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
+            {{ item.name }}
+          </el-radio-button>
+        </el-radio-group>
+      </template>
+      <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
+        <el-table-column type="index" label="序号" width="55" align="center" />
+        <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </detail-block-switch>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-    position: relative;
-
-    .change-btn {
-      position: absolute;
-      left: 40px;
-      top: 4px;
-    }
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 4px;
-    }
-  }
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
@@ -628,8 +560,4 @@
     }
   }
 }
-
-.marg {
-  margin-top: 10px;
-}
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 9ad87af..aac1ef2 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -231,12 +231,14 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
+          <!-- <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
           <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
+          <icon-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 2e3322a..3f472eb 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -41,7 +41,7 @@
   { text: '证书号', value: 'certificateNo', align: 'center' },
   { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
   { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'validDate', align: 'center', width: '200' },
   { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
 ]) // 表格
 const certificateStatusList = ref([
@@ -90,7 +90,7 @@
   loadingTable.value = true
   getCertificateList(searchQuery).then((res) => {
     if (res.code === 200) {
-      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效' }))
+      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效', validDate: item.validDate.split(' ')[0], certificateDate: item.certificateDate.split(' ')[0] }))
       list.value = res.data.records
       total.value = Number(res.data.total)
     }
@@ -115,6 +115,7 @@
   addRef.value.initDialog({
     ...row,
     title: '详情',
+    name: props.isRemind ? '证书状况' : '证书记录',
   })
 }
 // 编辑
@@ -123,6 +124,7 @@
   addRef.value.initDialog({
     ...row,
     title: '编辑',
+    name: props.isRemind ? '证书状况' : '证书记录',
   })
 }
 
@@ -193,6 +195,7 @@
   dialogVisible.value = true
   addRef.value.initDialog({
     title: '新建',
+    name: props.isRemind ? '证书状况' : '证书记录',
   })
 }
 // 导出
@@ -292,21 +295,11 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
-            模板下载
-          </el-button>
-          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
-            打印
-          </el-button>
+          <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
@@ -325,7 +318,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column fixed="right" label="操作" align="center" width="150">
+            <el-table-column fixed="right" label="操作" align="center" width="180">
               <template #default="{ row }">
                 <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
                   提醒
@@ -336,7 +329,7 @@
                 <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 4dc1b17..4352604 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -69,7 +69,16 @@
     const IdCard = ruleForm.value.idCard
     const birthday = `${IdCard.substring(6, 10)}-${IdCard.substring(10, 12)}`
     ruleForm.value.birthday = birthday
-    console.log(ruleForm.value)
+    // 获取性别 第17位  奇数为男 偶数为女
+    // ruleForm.value.sex
+    if (Number(IdCard.substring(16, 17)) % 2) {
+      // 男
+      ruleForm.value.sex = '1'
+    }
+    else {
+      //  女
+      ruleForm.value.sex = '2'
+    }
   })
 }
 const dialogVisible = ref<boolean>(false) // 弹窗显示
@@ -130,7 +139,6 @@
     technologyExam: '', // 技术考核
     remark: '', // 备注
     certificateList: [], // 证书列表
-
   }
 }
 const technologyJobList = ref<technologyJobType[]>([])
@@ -309,7 +317,7 @@
           }
           (title.value === '新建'
             ? getStaffAdd
-            : getStaffupdate) ({ ...ruleForm.value, certificateList: changeList.value[0].data }).then((res) => {
+            : getStaffupdate) ({ ...ruleForm.value, certificateList: changeList.value[0].data, birthday: `${ruleForm.value.idCard.substring(6, 10)}-${ruleForm.value.idCard.substring(10, 12)}-${ruleForm.value.idCard.substring(12, 14)}` }).then((res) => {
             if (res.code == 200) {
               formEl?.resetFields()
               ElMessage.success('提交成功')
@@ -332,12 +340,14 @@
   emits('resetData')
   resetFormData()
 }
+const selectTreeRef = ref()
 // 弹窗初始化
 const initDialog = (row: any) => {
   changeList.value[0].data = []
   dialogVisible.value = true
   title.value = row.title
   resetFormData()
+  selectTreeRef.value?.clearSelected()
   getuser()
   getPubList()
   getSexList()
@@ -370,20 +380,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          计量人员-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
-            完成
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`计量人员-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+          完成
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
         <el-row :gutter="24" class="marg">
           <el-col :span="5">
@@ -394,6 +399,7 @@
                 :http-request="uploadQuarterlyEvaluateFile"
                 :before-upload="beforeAvatarUpload"
                 :disabled="title === '详情'"
+                accept="image/png, image/jpeg,image/jpg"
               >
                 <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
                 <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
@@ -425,8 +431,8 @@
               </el-select>
               <com-tree-select
                 v-else
-                v-model="ruleForm.deptId" :options="PubListTree" placeholder="选择组织机构"
-                :tree-props="deptProps"
+                ref="selectTreeRef" v-model="ruleForm.deptId" :options="PubListTree"
+                placeholder="选择组织机构" :tree-props="deptProps"
               />
             </el-form-item>
             <el-form-item label="计量专业" prop="major" class="marg-item">
@@ -489,29 +495,19 @@
           </el-col>
         </el-row>
       </el-form>
-      <!-- 证书基本信息 -->
-      <!-- 切换 -->
-      <!-- <el-radio-group v-model="current" style="margin-bottom: -15px;">
-          <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
-            {{ item.name }}
-          </el-radio-button>
-        </el-radio-group> -->
-      <div class="header" style="margin-top: 10px;">
-        <div class="title">
-          {{ current }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="info" @click="removeRow">
-            删除行
-          </el-button>
-          <el-button v-if="title !== '详情'" type="primary" @click="addRow">
-            添加行
-          </el-button>
-          <el-button v-if="title !== '详情'" type="primary" @click="editRow">
-            编辑行
-          </el-button>
-        </span>
-      </div>
+    </detail-page>
+    <detail-block :title="current">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="info" @click="removeRow">
+          删除行
+        </el-button>
+        <el-button v-if="title !== '详情'" type="primary" @click="addRow">
+          添加行
+        </el-button>
+        <el-button v-if="title !== '详情'" type="primary" @click="editRow">
+          编辑行
+        </el-button>
+      </template>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
         <el-table-column width="55" align="center">
           <template #default="scope">
@@ -523,7 +519,7 @@
         <el-table-column type="index" label="序号" width="55" />
         <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
       </el-table>
-    </div>
+    </detail-block>
     <!-- 添加证书信息组件 -->
     <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
     <!-- 选择用户列表组件 -->
@@ -532,77 +528,38 @@
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    background-color: #fff;
-    border-radius: 8px;
-    padding-top: 10px;
-    margin-top: 10px;
-    padding-right: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    display: flex;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    position: relative;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 5px;
-    }
-  }
-
-  :deep(.el-radio__label) {
-    display: none;
-  }
-
-  :deep(.el-icon.avatar-uploader-icon) {
-    font-size: 28px;
-    color: #8c939d;
-    width: 190px;
-    height: 250px;
-    text-align: center;
-  }
-
-  :deep(.avatar-uploader .avatar) {
-    width: 190px;
-    height: 250px;
-    display: block;
-  }
-
-  .isDetail {
-    ::v-deep {
-      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-        display: none;
-      }
-    }
-  }
+:deep(.el-radio__label) {
+  display: none;
 }
 
-.marg {
-  margin-top: 20px;
+:deep(.el-icon.avatar-uploader-icon) {
+  font-size: 28px;
+  color: #8c939d;
+  width: 190px;
+  height: 250px;
+  text-align: center;
 }
 
-.marg-item {
-  margin-top: 20px;
+:deep(.avatar-uploader .avatar) {
+  width: 190px;
+  height: 250px;
+  display: block;
+}
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
 }
 </style>
 
 <style scoped>
 .avatar-uploader .avatar {
-  width: 220px;
-  height: 320px;
+  width: 190px;
+  height: 250px;
   display: block;
 }
 </style>
@@ -624,8 +581,8 @@
 .el-icon.avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
-  width: 220px;
-  height: 320px;
+  width: 190px;
+  height: 250px;
   text-align: center;
 }
 </style>
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index ae48f11..042636e 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -4,7 +4,6 @@
 import dayjs from 'dayjs'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import type { technologyJobType } from '../person-interface'
-import certificateAddDialog from './certificateAddDialog.vue'
 import personListDialog from './personListDialog.vue'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
@@ -14,7 +13,8 @@
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
-const ruleFormRef = ref<FormInstance>() // from组件
+const ruleFormRef1 = ref<FormInstance>() // from组件
+const ruleFormRef2 = ref<FormInstance>() // from组件
 const meterStaff = ref({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -28,26 +28,43 @@
   workDate: '', // 从事日期
   id: '',
 })
+const baseInfo = ref({
+  certificateCompany: '',
+  certificateDate: '',
+  certificateName: '',
+  certificateNo: '',
+  validDate: '',
+  id: '',
+  isDel: 0,
+  minioFileName: '',
+  remark: '',
+})
 const ruleForm = ref({
   meterStaff: {}, // 人员信息
   staffId: '', // 计量人员id
 }) // 表单
-const multipleTableRef = ref<InstanceType<typeof ElTable>>()
 const title = ref('')
+const name = ref('')
 // 身份证号码验证规则
-const validateIDcard = (rule: any, value: any, callback: any) => {
-  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
-  if (rr.test(value)) {
-    callback()
-  }
-  else {
-    callback(new Error('验证失败'))
-  }
-}
+// const validateIDcard = (rule: any, value: any, callback: any) => {
+//   const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+//   if (rr.test(value)) {
+//     callback()
+//   }
+//   else {
+//     callback(new Error('验证失败'))
+//   }
+// }
 const rules = ref({
   staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
   // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
-
+}) // 表单验证规则
+const rules2 = ref({
+  certificateCompany: [{ required: true, message: '发证单位不能为空', trigger: 'blur' }],
+  certificateDate: [{ required: true, message: '发证日期不能为空', trigger: 'blur' }],
+  certificateName: [{ required: true, message: '证书名称不能为空', trigger: 'blur' }],
+  certificateNo: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
+  validDate: [{ required: true, message: '有效日期不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
 const userList = ref<userType[]>([]) // 可使用人列表
@@ -96,6 +113,17 @@
   meterStaff.value.major = ''
   meterStaff.value.workDate = ''
   meterStaff.value.id = ''
+  baseInfo.value = {
+    certificateCompany: '',
+    certificateDate: '',
+    certificateName: '',
+    certificateNo: '',
+    validDate: '',
+    id: '',
+    isDel: 0,
+    minioFileName: '',
+    remark: '',
+  }
 }
 const technologyJobList = ref<technologyJobType[]>([])
 // 获取技术职务列表
@@ -120,98 +148,14 @@
 const confirmPerson = (row: any) => {
   ruleForm.value.staffId = row.staffNo
   meterStaff.value = row
-  ruleFormRef.value?.clearValidate('staffNo')
+  ruleFormRef1.value?.clearValidate('staffNo')
 }
-const changeList = ref([
-  {
-    name: '证书基本信息',
-    data: [] as any[],
-    column: [
-      {
-        label: '证书号',
-        data: 'certificateNo',
-        id: 'zs02',
-      },
-      {
-        label: '证书名称',
-        data: 'certificateName',
-        id: 'zs03',
-      },
-      {
-        label: '发证日期',
-        data: 'certificateDate',
-        id: 'zs04',
-      },
-      {
-        label: '发证单位',
-        data: 'certificateCompany',
-        id: 'zs01',
-      },
-      {
-        label: '有效日期',
-        data: 'validDate',
-        id: 'zs05',
-      },
-    ],
-  },
-  {
-    name: '计量工作培训记录',
-    data: [],
-    column: [],
-  },
-  {
-    name: '业务记录',
-    data: [],
-    column: [],
-  },
-])
-const current = ref('证书基本信息')
-const currentShow = computed(() => {
-  return changeList.value.filter(item => item.name === current.value)[0]
-})
-const certificateRef = ref() // 添加证书信息弹窗
-// 添加行
-const addRow = () => {
-  certificateRef.value.initDialog({ title: '添加' })
-}
-// 编辑行
-const editRow = () => {
-  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
-}
-// 证书信息行内添加数据
-const addRowcertificate = (row: any, flag: string) => {
-  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
-  if (flag === 'update') {
-    changeList.value[0].data = [{
-      ...changeList.value[0].data[0],
-      ...row,
-      certificateStatus: diff < 0 ? '1' : '0',
-      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-    }]
-  }
-  else {
-    changeList.value[0].data.push(
-      {
-        ...row,
-        certificateStatus: diff < 0 ? '1' : '0',
-        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-        id: null,
-        isDel: 0,
-        minioFileName: '',
-        remark: '',
-        staffId: meterStaff.value.id,
-        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-      })
-  }
-}
-const currenSelect = ref<number>(-1) // 当前选中行
-// 删除行
-const removeRow = () => {
-  console.log(currenSelect.value)
-  if (currenSelect.value >= 0) {
+// 提交
+const submitForm = async (formEl1: FormInstance | undefined, formEl2: FormInstance | undefined) => {
+  if (!formEl1 || !formEl2) { return }
+  Promise.all([formEl1.validate(), formEl2.validate()]).then((res) => {
     ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
+      '确认提交吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -219,78 +163,49 @@
         type: 'warning',
       },
     ).then(() => {
-      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
-      currenSelect.value = -1
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 提交
-const submitForm = async (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  await formEl.validate((valid, fields) => {
-    if (valid) {
-      ElMessageBox.confirm(
-        '确认提交吗？',
-        '提示',
-        {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        },
-      ).then(() => {
-        let params
-        if (changeList.value[0].data.length) {
-          params = changeList.value[0].data
-        }
-        else {
-          params = [
-            {
-              certificateCompany: '',
-              certificateDate: '',
-              certificateName: '',
-              certificateNo: '',
-              certificateStatus: '',
-              createTime: '',
-              id: null,
-              isDel: 0,
-              minioFileName: '',
-              remark: '',
-              staffId: meterStaff.value.id,
-              updateTime: '',
-              validDate: '',
-            },
-          ]
-        }
-        (title.value === '新建'
-          ? addCertificateList
-          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
-          formEl?.resetFields()
-          ElMessage.success('提交成功')
-          emits('resetData')
-          resetFormData()
-        })
+      (title.value === '新建'
+        ? addCertificateList
+        : getCertificateUpdate)(title.value === '新建'
+        ? [{
+            ...baseInfo.value,
+            staffId: meterStaff.value.id,
+            createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+            updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+            certificateStatus: dayjs(baseInfo.value.validDate).diff(baseInfo.value.certificateDate, 'day') < 0 ? '1' : '0',
+            meterStaff: undefined,
+          }]
+        : {
+            ...baseInfo.value,
+            staffId: meterStaff.value.id,
+            createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+            updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+            certificateStatus: dayjs(baseInfo.value.validDate).diff(baseInfo.value.certificateDate, 'day') < 0 ? '1' : '0',
+            meterStaff: undefined,
+          }).then((res) => {
+        formEl1?.resetFields()
+        formEl2?.resetFields()
+        ElMessage.success('提交成功')
+        emits('resetData')
+        resetFormData()
       })
-    }
+    })
   })
 }
 // 取消
-const resetForm = (formEl: FormInstance | undefined) => {
+const resetForm = (formEl: FormInstance | undefined, formEl2: FormInstance | undefined) => {
   formEl?.resetFields()
-  changeList.value[0].data = []
+  formEl2?.resetFields()
   emits('resetData')
   resetFormData()
 }
+const selectTreeRef = ref()
 // 弹窗初始化
 const initDialog = (row: any) => {
-  changeList.value[0].data = []
   resetFormData()
   dialogVisible.value = true
   title.value = row.title
-  resetFormData()
+  name.value = row.name
+  selectTreeRef.value?.clearSelected()
   getuser()
   getPubList()
   getSexList()
@@ -303,8 +218,9 @@
   else {
     getCertificateDetail({ id: row.id }).then((res) => {
       if (res.code === 200) {
+        console.log(res, '证书记录')
         meterStaff.value = res.data.meterStaff
-        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+        baseInfo.value = res.data
       }
     })
   }
@@ -314,21 +230,16 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          证书记录-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
-            完成
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
-      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+    <detail-page :title=" `${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
+          完成
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef1, ruleFormRef2)">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef1" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="人员编号" prop="staffNo">
@@ -390,7 +301,8 @@
               </el-select>
               <com-tree-select
                 v-else
-                v-model="meterStaff.deptId" :options="PubListTree" placeholder="选择组织机构"
+                ref="selectTreeRef" v-model="meterStaff.deptId" :options="PubListTree"
+                placeholder="选择组织机构"
                 :tree-props="deptProps"
               />
             </el-form-item>
@@ -410,71 +322,52 @@
           </el-col>
         </el-row>
       </el-form>
-      <div class="header" style="margin-top: 10px;">
-        <div class="title">
-          {{ current }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title === '新建'" type="info" @click="removeRow">
-            删除行
-          </el-button>
-          <el-button v-if="title === '新建'" type="primary" @click="addRow">
-            添加行
-          </el-button>
-          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
-            编辑行
-          </el-button>
-        </span>
-      </div>
-      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
-        <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column>
-        <el-table-column type="index" label="序号" width="55" />
-        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
-      </el-table>
-    </div>
-    <!-- 添加证书信息组件 -->
-    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    </detail-page>
+    <detail-block title="证书基本信息">
+      <el-form ref="ruleFormRef2" :model="baseInfo" :rules="rules2" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="证书号" prop="certificateNo">
+              <el-input v-model.trim="baseInfo.certificateNo" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书名称" prop="certificateName">
+              <el-input v-model.trim="baseInfo.certificateName" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证单位" prop="certificateCompany">
+              <el-input v-model.trim="baseInfo.certificateCompany" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发证日期" prop="certificateDate">
+              <el-date-picker
+                v-model="baseInfo.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择发证日期"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书有效日期" prop="validDate">
+              <el-date-picker
+                v-model="baseInfo.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择有效日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block>
     <!-- 选择用户列表组件 -->
     <person-list-dialog ref="personListRef" @add="confirmPerson" />
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    background-color: #fff;
-    border-radius: 8px;
-    padding-top: 10px;
-    margin-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    display: flex;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    position: relative;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 5px;
-    }
-  }
-
   :deep(.el-radio__label) {
     display: none;
   }
@@ -487,40 +380,5 @@
       }
     }
   }
-}
-
-.marg {
-  margin-top: 20px;
-}
 </style>
 
-<style scoped>
-.avatar-uploader .avatar {
-  width: 178px;
-  height: 178px;
-  display: block;
-}
-</style>
-
-<style>
-.avatar-uploader .el-upload {
-  border: 1px dashed var(--el-border-color);
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-  transition: var(--el-transition-duration-fast);
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: var(--el-color-primary);
-}
-
-.el-icon.avatar-uploader-icon {
-  font-size: 28px;
-  color: #8c939d;
-  width: 178px;
-  height: 178px;
-  text-align: center;
-}
-</style>
diff --git a/src/views/measure/person/components/addRecordCancel.vue b/src/views/measure/person/components/addRecordCancel.vue
new file mode 100644
index 0000000..c32ac43
--- /dev/null
+++ b/src/views/measure/person/components/addRecordCancel.vue
@@ -0,0 +1,459 @@
+<!-- 计量人员新增  证书基本信息table表格   作废 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import type { technologyJobType } from '../person-interface'
+import certificateAddDialog from './certificateAddDialog.vue'
+import personListDialog from './personListDialog.vue'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import type { TreeStructure, userType } from '@/views/system/user/user-interface'
+import { getDictByCode } from '@/api/system/dict'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const meterStaff = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  idCard: '', // 身份证号
+  sex: '', // 性别
+  education: '', // 文化程度
+  technologyJob: '', // 技术职务
+  administrationJob: '', // 行政职务
+  deptId: '', // 工作部门
+  major: '', // 专业
+  workDate: '', // 从事日期
+  id: '',
+})
+const ruleForm = ref({
+  meterStaff: {}, // 人员信息
+  staffId: '', // 计量人员id
+}) // 表单
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const title = ref('')
+const name = ref('')
+// 身份证号码验证规则
+const validateIDcard = (rule: any, value: any, callback: any) => {
+  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+  if (rr.test(value)) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+const rules = ref({
+  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
+
+}) // 表单验证规则
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref<TreeStructure[]>([])
+const PubListTree = ref([])
+// 获取组织列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
+  })
+}
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sex').then((response) => {
+    sexList.value = response.data
+  })
+}
+const educationList = ref<technologyJobType[]>([])
+// 获取文化程度列表
+const geteducationList = () => {
+  getDictByCode('education').then((response) => {
+    educationList.value = response.data
+  })
+}
+// 重置表单内容
+const resetFormData = () => {
+  meterStaff.value.staffNo = ''
+  meterStaff.value.name = ''
+  meterStaff.value.idCard = ''
+  meterStaff.value.sex = ''
+  meterStaff.value.education = ''
+  meterStaff.value.technologyJob = ''
+  meterStaff.value.administrationJob = ''
+  meterStaff.value.deptId = ''
+  meterStaff.value.major = ''
+  meterStaff.value.workDate = ''
+  meterStaff.value.id = ''
+}
+const technologyJobList = ref<technologyJobType[]>([])
+// 获取技术职务列表
+const getTechnologyJobList = () => {
+  getDictByCode('technologyJob').then((response) => {
+    technologyJobList.value = response.data
+  })
+}
+const administrationJobList = ref<technologyJobType[]>([])
+// 获取行政职务列表
+const getAdministrationJob = () => {
+  getDictByCode('administrationJob').then((response) => {
+    administrationJobList.value = response.data
+  })
+}
+const personListRef = ref()
+// 选择人员
+const selectPerson = () => {
+  personListRef.value.initDialog()
+}
+// 保存选择人员信息
+const confirmPerson = (row: any) => {
+  ruleForm.value.staffId = row.staffNo
+  meterStaff.value = row
+  ruleFormRef.value?.clearValidate('staffNo')
+}
+const changeList = ref([
+  {
+    name: '证书基本信息',
+    data: [] as any[],
+    column: [
+      {
+        label: '证书号',
+        data: 'certificateNo',
+        id: 'zs02',
+      },
+      {
+        label: '证书名称',
+        data: 'certificateName',
+        id: 'zs03',
+      },
+      {
+        label: '发证日期',
+        data: 'certificateDate',
+        id: 'zs04',
+      },
+      {
+        label: '发证单位',
+        data: 'certificateCompany',
+        id: 'zs01',
+      },
+      {
+        label: '有效日期',
+        data: 'validDate',
+        id: 'zs05',
+      },
+    ],
+  },
+  {
+    name: '计量工作培训记录',
+    data: [],
+    column: [],
+  },
+  {
+    name: '业务记录',
+    data: [],
+    column: [],
+  },
+])
+const current = ref('证书基本信息')
+const currentShow = computed(() => {
+  return changeList.value.filter(item => item.name === current.value)[0]
+})
+const certificateRef = ref() // 添加证书信息弹窗
+// 添加行
+const addRow = () => {
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
+}
+// 证书信息行内添加数据
+const addRowcertificate = (row: any, flag: string) => {
+  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
+  if (flag === 'update') {
+    changeList.value[0].data = [{
+      ...changeList.value[0].data[0],
+      ...row,
+      certificateStatus: diff < 0 ? '1' : '0',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    }]
+  }
+  else {
+    changeList.value[0].data.push(
+      {
+        ...row,
+        certificateStatus: diff < 0 ? '1' : '0',
+        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        id: null,
+        isDel: 0,
+        minioFileName: '',
+        remark: '',
+        staffId: meterStaff.value.id,
+        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
+  }
+}
+const currenSelect = ref<number>(-1) // 当前选中行
+// 删除行
+const removeRow = () => {
+  console.log(currenSelect.value)
+  if (currenSelect.value >= 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
+      currenSelect.value = -1
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        let params
+        if (changeList.value[0].data.length) {
+          params = changeList.value[0].data
+        }
+        else {
+          params = [
+            {
+              certificateCompany: '',
+              certificateDate: '',
+              certificateName: '',
+              certificateNo: '',
+              certificateStatus: '',
+              createTime: '',
+              id: null,
+              isDel: 0,
+              minioFileName: '',
+              remark: '',
+              staffId: meterStaff.value.id,
+              updateTime: '',
+              validDate: '',
+            },
+          ]
+        }
+        (title.value === '新建'
+          ? addCertificateList
+          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
+          formEl?.resetFields()
+          ElMessage.success('提交成功')
+          emits('resetData')
+          resetFormData()
+        })
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  changeList.value[0].data = []
+  emits('resetData')
+  resetFormData()
+}
+const selectTreeRef = ref()
+// 弹窗初始化
+const initDialog = (row: any) => {
+  changeList.value[0].data = []
+  resetFormData()
+  dialogVisible.value = true
+  title.value = row.title
+  name.value = row.name
+  selectTreeRef.value.clearSelected()
+  resetFormData()
+  getuser()
+  getPubList()
+  getSexList()
+  geteducationList()
+  getTechnologyJobList()
+  getAdministrationJob()
+  if (row.title === '新建') {
+    console.log()
+  }
+  else {
+    getCertificateDetail({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        meterStaff.value = res.data.meterStaff
+        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+      }
+    })
+  }
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <detail-page :title=" `${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+          完成
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="人员编号" prop="staffNo">
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="selectPerson">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="meterStaff.name">
+              <el-input v-model.trim="meterStaff.name" placeholder="姓名" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="性别" prop="meterStaff.sex">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="文化程度" prop="meterStaff.education">
+              <el-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="技术职务" prop="meterStaff.technologyJob">
+              <el-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="行政职务" prop="meterStaff.administrationJob">
+              <el-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="工作部门" prop="deptId">
+              <el-select v-if="title === '详情'" v-model="meterStaff.deptId" disabled>
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+              <com-tree-select
+                v-else
+                ref="selectTreeRef" v-model="meterStaff.deptId" :options="PubListTree"
+                placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业" prop="major">
+              <el-input v-model.trim="meterStaff.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="从事日期" prop="workDate">
+              <el-date-picker
+                v-model="meterStaff.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择从事日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block :title="current">
+      <template #btns>
+        <el-button v-if="title === '新建'" type="info" @click="removeRow">
+          删除行
+        </el-button>
+        <el-button v-if="title === '新建'" type="primary" @click="addRow">
+          添加行
+        </el-button>
+        <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+          编辑行
+        </el-button>
+      </template>
+      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
+        <el-table-column width="55" align="center">
+          <template #default="scope">
+            <el-radio-group v-model="currenSelect" class="ml-4">
+              <el-radio :label="scope.$index" />
+            </el-radio-group>
+          </template>
+        </el-table-column>
+        <el-table-column type="index" label="序号" width="55" />
+        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </detail-block>
+    <!-- 添加证书信息组件 -->
+    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    <!-- 选择用户列表组件 -->
+    <person-list-dialog ref="personListRef" @add="confirmPerson" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        display: none;
+      }
+    }
+  }
+</style>
+
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 332c73c..178fc12 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -32,6 +32,7 @@
   form.validDate = ''
 }
 const initDialog = (row: any) => {
+  resetData()
   title.value = row.title
   if (row.title === '编辑') {
     form.certificateNo = row.certificateNo
@@ -50,10 +51,12 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       if (title.value === '编辑') {
-        emits('add', form, 'update')
+        const deptRow = JSON.parse(JSON.stringify(form))
+        emits('add', deptRow, 'update')
       }
       else {
-        emits('add', form, '')
+        const deptRow = JSON.parse(JSON.stringify(form))
+        emits('add', deptRow, '')
       }
       dialogFormVisible.value = false
     }
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 592d810..9c6f65d 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -30,7 +30,7 @@
   { text: '技术职务', value: 'technologyJob', align: 'center', width: '140' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '100' },
   { text: '计量专业', value: 'major', align: 'center', width: '100' },
-  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '180' },
   { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '技术考核', value: 'technologyExam', align: 'center', width: '85' },
 ]) // 表格
@@ -63,7 +63,7 @@
   loadingTable.value = true
   getStaffList(searchQuery).then((res) => {
     if (res.code === 200) {
-      res.data.records = res.data.records.map((item: StaffType) => ({ ...item, sex: item.sex == '1' ? '男' : '女', technologyExam: item.technologyExam == '0' ? '已考核' : '未考核' }))
+      res.data.records = res.data.records.map((item: StaffType) => ({ ...item, sex: item.sex == '1' ? '男' : '女', technologyExam: item.technologyExam == '0' ? '已考核' : '未考核', certificateDate: item.certificateDate.split(' ')[0] }))
       list.value = res.data.records
       total.value = Number(res.data.total)
     }
@@ -236,21 +236,11 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="proxy.hasPerm(`/measure/person/list/import`)" type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" type="primary" @click="templateDownload">
-            模板下载
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/list/add`)" type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/list/export`)" type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" type="primary" @click="print">
-            打印
-          </el-button>
+          <icon-button v-if="proxy.hasPerm(`/measure/person/list/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/list/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/list/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index 17b92d3..e44001a 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -295,15 +295,17 @@
         </el-button>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
-      <el-form-item>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer footer">
         <el-button type="primary" @click="submitForm(ruleFormRef)">
           发布
         </el-button>
         <el-button @click="resetForm(ruleFormRef)">
           关闭
         </el-button>
-      </el-form-item>
-    </el-form>
+      </div>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index 3d5c2e3..0926957 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -172,15 +172,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <el-button v-if="proxy.hasPerm('/sys/notice/list/add')" type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/sys/notice/list/export')" type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/sys/notice/list/print')" v-print="printObj" type="primary">
-          打印
-        </el-button>
+        <icon-button v-if="proxy.hasPerm('/sys/notice/list/add')" icon="icon-add" title="新建" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/sys/notice/list/export')" icon="icon-export" title="导出" @click="exportExcelBtn" />
+        <icon-button v-if="proxy.hasPerm('/sys/notice/list/print')" v-print="printObj" icon="icon-print" title="打印" />
       </template>
       <!-- 表格区域 -->
       <normal-table
diff --git a/src/views/system/notice/noticeDetail.vue b/src/views/system/notice/noticeDetail.vue
index 441ef0f..94468d4 100644
--- a/src/views/system/notice/noticeDetail.vue
+++ b/src/views/system/notice/noticeDetail.vue
@@ -97,15 +97,14 @@
         </el-link>
         <span v-else>暂无附件</span>
       </el-form-item>
-      <el-form-item>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer footer">
         <el-button type="primary" @click="submitForm()">
           确认
         </el-button>
-        <!-- <el-button @click="resetForm(ruleFormRef)">
-          关闭
-        </el-button> -->
-      </el-form-item>
-    </el-form>
+      </div>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/src/views/system/tool/autograph/addDDialog.vue b/src/views/system/tool/autograph/addDDialog.vue
index d34e8ef..e39b706 100644
--- a/src/views/system/tool/autograph/addDDialog.vue
+++ b/src/views/system/tool/autograph/addDDialog.vue
@@ -200,15 +200,17 @@
         </el-button>
         <input v-show="title === '123'" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
-      <el-form-item>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer footer">
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
           发布
         </el-button>
         <el-button @click="resetForm(ruleFormRef)">
           关闭
         </el-button>
-      </el-form-item>
-    </el-form>
+      </div>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/src/views/system/tool/autograph/autograph.vue b/src/views/system/tool/autograph/autograph.vue
index 8fffe07..ac9f000 100644
--- a/src/views/system/tool/autograph/autograph.vue
+++ b/src/views/system/tool/autograph/autograph.vue
@@ -191,15 +191,9 @@
     <table-container>
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/add')" type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/export')" type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/print')" v-print="printObj" type="primary">
-          打印
-        </el-button>
+        <icon-button v-if="proxy.hasPerm('/sys/tool/autograph/add')" icon="icon-add" title="新建" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/sys/tool/autograph/export')" icon="icon-export" title="导出" @click="exportExcelBtn" />
+        <icon-button v-if="proxy.hasPerm('/sys/tool/autograph/print')" v-print="printObj" icon="icon-print" title="打印" />
       </template>
       <!-- 表格区域 -->
       <normal-table
diff --git a/src/views/system/tool/certificate/addDDialog.vue b/src/views/system/tool/certificate/addDDialog.vue
index 330f2de..2721bf8 100644
--- a/src/views/system/tool/certificate/addDDialog.vue
+++ b/src/views/system/tool/certificate/addDDialog.vue
@@ -199,15 +199,17 @@
         </el-button>
         <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
       </el-form-item>
-      <el-form-item>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer footer">
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
           发布
         </el-button>
         <el-button @click="resetForm(ruleFormRef)">
           关闭
         </el-button>
-      </el-form-item>
-    </el-form>
+      </div>
+    </template>
   </el-dialog>
 </template>
 

diff --git a/src/components.d.ts b/src/components.d.ts
index 6e85584..815d62f 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -16,14 +16,13 @@
     BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default']
     BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
-    Benchcol: typeof import('./components/benchcol/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/DetailPage/index copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
+    DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
diff --git a/src/components/DetailPage/DetailBlockSwitch.vue b/src/components/DetailPage/DetailBlockSwitch.vue
new file mode 100644
index 0000000..4d92074
--- /dev/null
+++ b/src/components/DetailPage/DetailBlockSwitch.vue
@@ -0,0 +1,71 @@
+<script lang="ts" setup name="DetailBlock">
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+})
+
+const slots = useSlots()
+</script>
+
+<template>
+  <div class="detail-main">
+    <div class="header">
+      <div class="menu">
+        <slot name="menu" />
+      </div>
+      <div class="title">
+        {{ title }}
+      </div>
+      <div class="btns">
+        <slot name="btns" />
+      </div>
+    </div>
+    <div v-if="slots.default" class="content">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-main {
+  background-color: #fff;
+  border-radius: 8px;
+  margin-top: 10px;
+  padding-top: 10px;
+
+  .header {
+    position: relative;
+    height: 40px;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+
+    .title {
+      font-weight: 500;
+    }
+
+    .btns {
+      position: absolute;
+      right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+
+    .menu {
+      position: absolute;
+      left: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+
+  .content {
+    background-color: #fff;
+    padding: 0 10px 20px;
+    margin-top: 10px;
+  }
+}
+</style>
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d6c1c91..1644a80 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -314,6 +314,39 @@
       },
     ],
   },
+  {
+    path: '/borrow',
+    component: Layout,
+    redirect: '/device/borrow/borrowapply',
+    name: 'Borrow',
+    meta: {
+      title: '设备领用',
+      icon: 'ep:key',
+      auth: '/device/borrow',
+    },
+    children: [
+      {
+        path: 'borrowapply',
+        name: 'borroWapply',
+        component: () => import('@/views/device/borrow/borrwoApply.vue'),
+        meta: {
+          title: '设备借用申请',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowapply',
+        },
+      },
+      {
+        path: 'borrowhandle',
+        name: 'borrowHandle',
+        component: () => import('@/views/device/borrow/borrowHandle.vue'),
+        meta: {
+          title: '设备借用处理',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowhandle',
+        },
+      },
+    ],
+  },
 
 ]
 
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
new file mode 100644
index 0000000..1c2405e
--- /dev/null
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="borrowHandle">
+// 逻辑代码
+</script>
+
+<template>
+  <app-container>
+    设备借用处理
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
new file mode 100644
index 0000000..03d414b
--- /dev/null
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="borrowApply">
+// 逻辑代码
+</script>
+
+<template>
+  <app-container>
+    设备借用申请
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index c2682fc..5f7b347 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -339,381 +339,374 @@
 
 <template>
   <div class="body-container">
-    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资产编号" prop="assetNo">
-            <el-input v-model.trim="ruleForm.assetNo" placeholder="系统自动生成" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="资产类型" prop="assetType">
-            <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备编号" prop="equipmentNo">
-            <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备名称" prop="equipmentName">
-            <el-input v-model.trim="ruleForm.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="生产厂家" prop="manufacturer">
-            <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="厂家国别" prop="manufacturerCountry">
-            <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="出厂编号" prop="manufacturingNo">
-            <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="出厂年月" prop="manufacturingDate">
-            <el-date-picker
-              v-model="ruleForm.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '出厂年月'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="型号" prop="modelNo">
-            <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="管理状态" prop="managerState">
-            <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="ABC" prop="abc">
-            <el-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'">
-              <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="标签绑定" prop="labelBind">
-            <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === '详情' ? '' : '标签'" :disabled="title === '详情'" clearable>
-              <template #append>
-                <el-button type="primary" size="small">
-                  扫描
-                </el-button>
-              </template>
-            </el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="立卡年月" prop="cardEstablishmentDate">
-            <el-date-picker
-              v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '立卡年月'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="启用日期" prop="enableDate">
-            <el-date-picker
-              v-model="ruleForm.enableDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '启用日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定方式" prop="mesureType">
-            <el-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'">
-              <el-option v-for="item in mesureTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定周期" prop="mesureCycle">
-            <el-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="12">
-          <el-form-item label="测量范围" prop="mesureRange">
-            <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === '详情' ? '' : '测量范围'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="不确定度" prop="uncertainty">
-            <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === '详情' ? '' : '不确定度'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="使用部门" prop="useDept">
-            <com-tree-select
-              v-if="title !== '详情'"
-              v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-              :tree-props="deptProps"
-            />
-            <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
-              <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="使用人" prop="usePerson">
-            <el-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'">
-              <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="专业分类" prop="majorCategory">
-            <el-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'">
-              <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="检定部门" prop="mesureDept">
-            <com-tree-select
-              v-if="title !== '详情'"
-              v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-              :tree-props="deptProps"
-            />
-            <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
-              <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定日期" prop="mesureDate">
-            <el-date-picker
-              v-model="ruleForm.mesureDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '检定日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="有效日期" prop="validDate">
-            <el-date-picker
-              v-model="ruleForm.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '有效日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定结果" prop="mesureResult">
-            <el-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'">
-              <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="8">
-          <el-form-item label="是否是技术指标需要校准/检定的设备" prop="isCalibrationTestEquipment" label-width="260px">
-            <el-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否是测量工装台账" prop="isMeasureAccount" label-width="260px">
-            <el-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否标准配套设备" prop="isStandardSupportEquipment" label-width="260px">
-            <el-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
+    <detail-block-switch title="基本信息">
+      <template #menu>
+        <slot name="menuswitch" />
+      </template>
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资产编号" prop="assetNo">
+              <el-input v-model.trim="ruleForm.assetNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="资产类型" prop="assetType">
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备编号" prop="equipmentNo">
+              <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="生产厂家" prop="manufacturer">
+              <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="厂家国别" prop="manufacturerCountry">
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号" prop="manufacturingNo">
+              <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂年月" prop="manufacturingDate">
+              <el-date-picker
+                v-model="ruleForm.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '出厂年月'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="型号" prop="modelNo">
+              <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="管理状态" prop="managerState">
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="ABC" prop="abc">
+              <el-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'">
+                <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标签绑定" prop="labelBind">
+              <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === '详情' ? '' : '标签'" :disabled="title === '详情'" clearable>
+                <template #append>
+                  <el-button type="primary" size="small">
+                    扫描
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="立卡年月" prop="cardEstablishmentDate">
+              <el-date-picker
+                v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '立卡年月'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="启用日期" prop="enableDate">
+              <el-date-picker
+                v-model="ruleForm.enableDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '启用日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定方式" prop="mesureType">
+              <el-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'">
+                <el-option v-for="item in mesureTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定周期" prop="mesureCycle">
+              <el-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="测量范围" prop="mesureRange">
+              <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === '详情' ? '' : '测量范围'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="不确定度" prop="uncertainty">
+              <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === '详情' ? '' : '不确定度'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="使用部门" prop="useDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
+                :tree-props="deptProps"
+              />
+              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="使用人" prop="usePerson">
+              <el-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'">
+                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="专业分类" prop="majorCategory">
+              <el-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'">
+                <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="检定部门" prop="mesureDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                :tree-props="deptProps"
+              />
+              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定日期" prop="mesureDate">
+              <el-date-picker
+                v-model="ruleForm.mesureDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '检定日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="有效日期" prop="validDate">
+              <el-date-picker
+                v-model="ruleForm.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '有效日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定结果" prop="mesureResult">
+              <el-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'">
+                <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="8">
+            <el-form-item label="是否是技术指标需要校准/检定的设备" prop="isCalibrationTestEquipment" label-width="260px">
+              <el-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否是测量工装台账" prop="isMeasureAccount" label-width="260px">
+              <el-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否标准配套设备" prop="isStandardSupportEquipment" label-width="260px">
+              <el-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资产来源" prop="assetSource">
-            <el-input v-model.trim="ruleForm.assetSource" :placeholder="title === '详情' ? '' : '资产来源'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备规格" prop="equipmentSpecifications">
-            <el-input v-model.trim="ruleForm.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备类别" prop="equipmentCategory">
-            <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
-              <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备类型" prop="equipmentType">
-            <el-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'">
-              <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资本来源" prop="capitalSource">
-            <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
-              <el-option v-for="item in capitalSourceList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="管理级别" prop="managerLevel">
-            <el-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'">
-              <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="用途" prop="purpose">
-            <el-input v-model.trim="ruleForm.purpose" :placeholder="title === '详情' ? '' : '用途'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="技术水平" prop="technicalLevel">
-            <el-input v-model.trim="ruleForm.technicalLevel" :placeholder="title === '详情' ? '' : '技术水平'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="完好状态" prop="intactState">
-            <el-input v-model.trim="ruleForm.intactState" :placeholder="title === '详情' ? '' : '完好状态'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="外形尺寸" prop="overallDimension">
-            <el-input v-model.trim="ruleForm.overallDimension" :placeholder="title === '详情' ? '' : '外形尺寸'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="重量(吨)" prop="weight">
-            <el-input v-model.trim="ruleForm.weight" :placeholder="title === '详情' ? '' : '重量'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="单价" prop="singlePrice">
-            <el-input v-model.trim="ruleForm.singlePrice" :placeholder="title === '详情' ? '' : '单价'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="安装及杂费" prop="installIncidentalExpenses">
-            <el-input v-model.trim="ruleForm.installIncidentalExpenses" :placeholder="title === '详情' ? '' : '安装及杂费'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="安装地点" prop="installPlace">
-            <el-input v-model.trim="ruleForm.installPlace" :placeholder="title === '详情' ? '' : '安装地点'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="原值" prop="originValue">
-            <el-input v-model.trim="ruleForm.originValue" :placeholder="title === '详情' ? '' : '原值'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="目前原值" prop="presentOriginValue">
-            <el-input v-model.trim="ruleForm.presentOriginValue" :placeholder="title === '详情' ? '' : '目前原值'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="折旧年限" prop="depreciationPeriod">
-            <el-input v-model.trim="ruleForm.depreciationPeriod" :placeholder="title === '详情' ? '' : '折旧年限'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="折旧方法" prop="depreciationMethod">
-            <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
-              <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="属性" prop="attribute">
-            <el-input v-model.trim="ruleForm.attribute" placeholder="属性" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="12">
-          <el-form-item label="说明书" prop="minioFileName">
-            <show-photo :minio-file-name="ruleForm.fileList[0]?.minioFileName || ''" />
-            <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
-            <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
-              {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
-            </el-button>
-            <span v-if="title === '详情' && !ruleForm.fileList[0]?.minioFileName">暂无</span>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="24">
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" placeholder="备注" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资产来源" prop="assetSource">
+              <el-input v-model.trim="ruleForm.assetSource" :placeholder="title === '详情' ? '' : '资产来源'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备规格" prop="equipmentSpecifications">
+              <el-input v-model.trim="ruleForm.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备类别" prop="equipmentCategory">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+                <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备类型" prop="equipmentType">
+              <el-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'">
+                <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资本来源" prop="capitalSource">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+                <el-option v-for="item in capitalSourceList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="管理级别" prop="managerLevel">
+              <el-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'">
+                <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="用途" prop="purpose">
+              <el-input v-model.trim="ruleForm.purpose" :placeholder="title === '详情' ? '' : '用途'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="技术水平" prop="technicalLevel">
+              <el-input v-model.trim="ruleForm.technicalLevel" :placeholder="title === '详情' ? '' : '技术水平'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="完好状态" prop="intactState">
+              <el-input v-model.trim="ruleForm.intactState" :placeholder="title === '详情' ? '' : '完好状态'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="外形尺寸" prop="overallDimension">
+              <el-input v-model.trim="ruleForm.overallDimension" :placeholder="title === '详情' ? '' : '外形尺寸'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="重量(吨)" prop="weight">
+              <el-input v-model.trim="ruleForm.weight" :placeholder="title === '详情' ? '' : '重量'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="单价" prop="singlePrice">
+              <el-input v-model.trim="ruleForm.singlePrice" :placeholder="title === '详情' ? '' : '单价'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="安装及杂费" prop="installIncidentalExpenses">
+              <el-input v-model.trim="ruleForm.installIncidentalExpenses" :placeholder="title === '详情' ? '' : '安装及杂费'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="安装地点" prop="installPlace">
+              <el-input v-model.trim="ruleForm.installPlace" :placeholder="title === '详情' ? '' : '安装地点'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="原值" prop="originValue">
+              <el-input v-model.trim="ruleForm.originValue" :placeholder="title === '详情' ? '' : '原值'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="目前原值" prop="presentOriginValue">
+              <el-input v-model.trim="ruleForm.presentOriginValue" :placeholder="title === '详情' ? '' : '目前原值'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="折旧年限" prop="depreciationPeriod">
+              <el-input v-model.trim="ruleForm.depreciationPeriod" :placeholder="title === '详情' ? '' : '折旧年限'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="折旧方法" prop="depreciationMethod">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+                <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="属性" prop="attribute">
+              <el-input v-model.trim="ruleForm.attribute" placeholder="属性" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="说明书" prop="minioFileName">
+              <show-photo :minio-file-name="ruleForm.fileList[0]?.minioFileName || ''" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
+                {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
+              </el-button>
+              <span v-if="title === '详情' && !ruleForm.fileList[0]?.minioFileName">暂无</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" placeholder="备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block-switch>
   </div>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    padding-top: 20px;
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index f46553a..fc3fd54 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -360,20 +360,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          固定资产-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`固定资产-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -763,44 +758,11 @@
           </el-row>
         </div> -->
       </el-form>
-    </div>
+    </detail-page>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index 0abbdb1..6e88e96 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -74,33 +74,29 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ name }} -{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm">
-            关闭
-          </el-button>
-        </span>
-      </div>
-      <div class="body">
-        <!-- 三级菜单 -->
-        <el-radio-group v-model="current">
-          <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
-            {{ item.name }}
-          </el-radio-button>
-        </el-radio-group>
-      </div>
-      <!-- 展示区域 -->
-      <keep-alive>
-        <component :is="currentComp" ref="currentCompRef" :name="current" :title="title" :row="row" />
-      </keep-alive>
-    </div>
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <!-- 展示区域 -->
+    <keep-alive>
+      <component :is="currentComp" ref="currentCompRef" :name="current" :title="title" :row="row">
+        <template #menuswitch>
+          <!-- 三级菜单 -->
+          <el-radio-group v-model="current">
+            <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+              {{ item.name }}
+            </el-radio-button>
+          </el-radio-group>
+        </template>
+      </component>
+    </keep-alive>
   </app-container>
 </template>
 
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f9cdcd0..f653095 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -256,7 +256,7 @@
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
-  // 原生上传图片
+  // 原生上传
   // console.log(event.target.files)
   // if (event.target.files[0].type === 'application/pdf') {
   if (event.target.files?.length !== 0) {
@@ -354,7 +354,7 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" type="primary" @click="identify">
+          <!-- <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" type="primary" @click="identify">
             标签识别
           </el-button>
           <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/import`)" type="primary" @click="batchImport">
@@ -371,7 +371,13 @@
           </el-button>
           <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/print`)" v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/device/standingBook/components/templateTable.vue b/src/views/device/standingBook/components/templateTable.vue
index 8a928f0..7aa563f 100644
--- a/src/views/device/standingBook/components/templateTable.vue
+++ b/src/views/device/standingBook/components/templateTable.vue
@@ -245,11 +245,11 @@
   <div>
     <!-- 添加证书信息组件 -->
     <add-row ref="addRowRef" @add="addRowData" />
-    <div class="header">
-      <div class="title">
-        <!-- {{ $props.name }} -->
-      </div>
-      <span class="btns">
+    <detail-block-switch :title="name">
+      <template #menu>
+        <slot name="menuswitch" />
+      </template>
+      <template #btns>
         <el-button v-if="title !== '详情'" type="info" @click="removeRow">
           删除行
         </el-button>
@@ -259,55 +259,33 @@
         <el-button v-if="title !== '详情'" type="primary" @click="editRow">
           编辑行
         </el-button>
-      </span>
-    </div>
-    <!-- 表格区域 -->
-    <normal-table
-      id="print"
-      :data="list" :total="total" :columns="columns as any"
-      :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-      :list-loading="loadingTable"
-      style="padding-top: 20px;background-color: #fff;"
-      @change="changePage"
-    >
-      <template #preColumns>
-        <el-table-column label="" width="55" align="center">
-          <template #default="scope">
-            <el-radio v-model="select" :label="scope.$index" class="radio" />
-          </template>
-        </el-table-column>
-        <el-table-column label="序号" width="55" align="center">
-          <template #default="scope">
-            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-          </template>
-        </el-table-column>
       </template>
-    </normal-table>
+      <!-- 表格区域 -->
+      <normal-table
+        id="print"
+        :data="list" :total="total" :columns="columns as any"
+        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+        :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </detail-block-switch>
   </div>
 </template>
 
 <style lang="scss" scoped>
-.header {
-  background-color: #fff;
-  // height: 40px;
-  border-radius: 8px;
-  display: flex;
-  align-items: center;
-  flex-direction: column;
-  justify-content: center;
-  position: relative;
-
-  .title {
-    // font-weight: 700;
-  }
-
-  .btns {
-    position: absolute;
-    right: 40px;
-    top: -22px;
-  }
-}
-
 :deep(.el-radio__label) {
   display: none;
 }
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 7538bc8..78a3800 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -272,24 +272,12 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/identify`)" type="primary" @click="identify">
-            标签识别
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/import`)" type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/mould`)" type="primary" @click="templateDownload">
-            模板下载
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/add`)" type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/export`)" type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/print`)" v-print="printObj" type="primary">
-            打印
-          </el-button>
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/identify`)" icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index fc364c8..e74d70e 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -361,20 +361,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ name }} - {{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -458,73 +453,33 @@
           </el-col>
         </el-row>
       </el-form>
-      <div v-if="title !== '新建' ">
-        <div class="header" style="margin-top: 10px;">
-          <div class="title">
-            审批流程
-          </div>
-        </div>
-        <div class="timeline">
-          <el-timeline>
-            <el-timeline-item timestamp="2018/4/12" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/12 20:46</p>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="2018/4/3" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/3 20:46</p>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="2018/4/2" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/2 20:46</p>
-              </el-card>
-            </el-timeline-item>
-          </el-timeline>
-        </div>
-      </div>
-    </div>
+    </detail-page>
+    <detail-block v-if="title !== '新建' " title="审批流程">
+      <el-timeline>
+        <el-timeline-item timestamp="2018/4/12" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/12 20:46</p>
+          </el-card>
+        </el-timeline-item>
+        <el-timeline-item timestamp="2018/4/3" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/3 20:46</p>
+          </el-card>
+        </el-timeline-item>
+        <el-timeline-item timestamp="2018/4/2" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/2 20:46</p>
+          </el-card>
+        </el-timeline-item>
+      </el-timeline>
+    </detail-block>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .timeline {
   background-color: #fff;
 }
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index aa3963f..737568d 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -1,6 +1,6 @@
 <!-- 状态管理公共列表组件 -->
 <script lang="ts" setup>
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessageBox } from 'element-plus'
 import approve from './approvalActionDialog.vue'
 import addDialog from './templateAdd.vue'
 const props = defineProps({
@@ -142,7 +142,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: any) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     title: '详情',
@@ -150,7 +150,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: any) => {
   dialogVisible.value = true
   // addRef.value.initDialog({
   //   title: '编辑',
@@ -158,7 +158,7 @@
   // })
 }
 // 删除
-const remove = (row) => {
+const remove = (row: any) => {
   ElMessageBox.confirm(
     `确认删除${row.equipmentName}吗？`,
     '提示',
@@ -181,20 +181,20 @@
   // })
 }
 // 同意
-const agree = (row) => {
+const agree = (row: any) => {
   console.log(approveRef.value)
   approveRef.value.initDialog({
     radio: '1',
   })
 }
 // 驳回
-const reject = (row) => {
+const reject = (row: any) => {
   approveRef.value.initDialog({
     radio: '3',
   })
 }
 // 拒绝
-const refuse = (row) => {
+const refuse = (row: any) => {
   approveRef.value.initDialog(
     {
       radio: '2',
@@ -202,7 +202,7 @@
   )
 }
 // 取消
-const cancel = (row) => {
+const cancel = (rowrow: any) => {
   ElMessageBox.confirm(
     '确认取消吗？',
     '提示',
@@ -301,20 +301,20 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+          <el-input placeholder="申请编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="设备编号" clearable class="w-50 m-2" />
+          <el-input placeholder="设备编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.modelNo" placeholder="设备名称" clearable class="w-50 m-2" />
+          <el-input placeholder="设备名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请单位" clearable class="w-50 m-2" />
+          <el-input placeholder="申请单位" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.publisher" placeholder="申请状态" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" />
+          <el-select placeholder="申请状态" clearable>
+            <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" /> -->
           </el-select>
         </search-item>
       </search-area>
@@ -328,7 +328,10 @@
           <el-button type="primary" @click="templateDownload">
             模板下载
           </el-button> -->
-          <el-button type="primary" @click="add">
+          <icon-button icon="icon-add" title="新建" @click="add" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+          <!-- <el-button type="primary" @click="add">
             新建
           </el-button>
           <el-button type="primary" @click="exportExcelBtn">
@@ -336,7 +339,7 @@
           </el-button>
           <el-button v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
         </template>
         <!-- 表格区域 -->
         <normal-table
@@ -386,22 +389,3 @@
     </app-container>
   </div>
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 154px !important;
-}
-
-.normal-date {
-  width: 154px !important;
-}
-
-.normal-select {
-  width: 154px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
-
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 0763c5a..9ef0b93 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -19,7 +19,6 @@
 const effectiveStatusName = ref('')
 const title = ref('')
 const fileList = ref<UploadUserFile[]>([])
-console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -80,10 +79,9 @@
   if (row.title === '新建') {
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
-    ruleForm.publisher = ''
+    ruleForm.publisher = userInfo.$state.deptName
     ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 判断有无存储
-    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
     if (sessionStorage.getItem(fileTypeName.value)) {
       const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
       ruleForm.fileType = session.fileType
@@ -117,6 +115,8 @@
     ruleForm.remark = row.remark
     ruleForm.publishTime = row.publishTime
     ruleForm.minioFileName = row.minioFileName
+    // ruleForm.publisher = '0'
+    // ruleForm.createUserId = '1'
   }
 }
 defineExpose({ initDialog })
@@ -148,6 +148,9 @@
       type: 'warning',
     },
       ).then((res) => {
+        if (ruleForm.publisher === userInfo.$state.deptName) {
+          ruleForm.publisher === userInfo.$state.deptId
+        }
         if (flag == '提交') {
           addApi(ruleForm).then((res) => {
             if (res.code == 200) {
@@ -193,7 +196,6 @@
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        console.log(res.data[0])
         ruleForm.minioFileName = res.data[0]
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
@@ -216,7 +218,6 @@
 // ])
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
-  console.log(diffDat)
   if (diffDat < 0) {
     // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '在使用'
@@ -237,7 +238,7 @@
 
 <template>
   <app-container v-if="dialogVisible" style="overflow: hidden;">
-    <detail-page :title="`${title}${fileTypeName}`">
+    <detail-page :title="`${fileTypeName}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
           提交
@@ -278,12 +279,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="发布单位" prop="publisher">
-              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'" class="fill-input">
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled>
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
               <com-tree-select
                 v-else
-                v-model="ruleForm.publisher" :options="PubListTree" placeholder="选择组织机构"
+                v-model="ruleForm.publisher" :options="PubListTree" placeholder="请选择发布单位"
                 :tree-props="deptProps"
               />
             </el-form-item>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 44e3e4d..b45fbc3 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -324,22 +324,9 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <!-- <el-button type="primary" @click="batchImport">
-            批量导入
-          </el-button> -->
-          <!-- <el-button type="primary" @click="templateDownload">
-            模板下载
-          </el-button> -->
-          <!-- <el-button type="primary" @click="add">
-            新建
-          </el-button> -->
-          <el-button type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-print="printObj" type="primary">
-            打印
-          </el-button>
+          <!-- <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange"> -->
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 4677e48..7d4724b 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -204,13 +204,9 @@
     loading.close()
   })
 }
-// 打印
-const print = () => {
-
-}
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
-  // 原生上传图片
+  // 原生上传
   // console.log(event.target.files)
   // if (event.target.files[0].type === 'application/pdf') {
   if (event.target.files?.length !== 0) {
@@ -264,7 +260,7 @@
         <search-item>
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
-        <search-item>
+        <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
@@ -273,13 +269,13 @@
               :value="item.value"
             />
           </el-select>
-        </search-item>
+        </search-item> -->
         <search-item>
           <el-date-picker
             v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 155px;"
+            style="width: 185px;"
           />
         </search-item>
         <search-item>
@@ -287,19 +283,19 @@
             v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 155px;"
+            style="width: 185px;"
           />
         </search-item>
         <search-item>
-          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select> -->
-          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
+          </el-select>
+          <!-- <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" /> -->
         </search-item>
       </search-area>
       <table-container>
@@ -310,7 +306,7 @@
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
-          <icon-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" @click="print" />
+          <icon-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index cf0dd4f..5ca3275 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -3,11 +3,11 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { detailType } from '../measureDept-interface'
-import { getUserList } from '@/api/system/user'
+// import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
+import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import type { userType } from '@/views/system/user/user-interface'
 import { listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
-import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
 const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -31,11 +31,20 @@
   technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
+// 获取计量人员列表
 const getuser = () => {
-  getUserList({ offset: 1, limit: 99999 }).then((res) => {
-    userList.value = res.data.rows
+  getStaffList({
+    staffNo: '', // 人员编号
+    name: '', // 姓名
+    deptId: ruleForm.value.deptId, // 所在部门
+    limit: 999999,
+    offset: 1,
+  }).then((res) => {
+    if (res.code === 200) {
+      userList.value = res.data.records
+    }
   })
-} // 获取用户列表
+}
 const technologyJobList = ref<{ id: string;name: string;value: string }[]>([])
 // 获取技术职务列表
 const getTechnologyJobList = () => {
@@ -50,7 +59,16 @@
     administrationJobList.value = response.data
   })
 }
-
+// 选择负责人自动填充职务信息
+const directorChange = (val: string) => {
+  const selectUser = userList.value.filter(item => item.name === val)[0]
+  getStaffDetail(selectUser).then((res) => {
+    if (res.code === 200) {
+      ruleForm.value.administrationJob = res.data.administrationJob
+      ruleForm.value.technologyJob = res.data.technologyJob
+    }
+  })
+}
 // 提交
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
@@ -95,12 +113,6 @@
 const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
-// const searchQuery = ref({
-//   limit: 10,
-//   offset: 1,
-//   total: 0,
-//   pageSizes: [10, 20, 30],
-// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -410,20 +422,6 @@
     }
   })
 }
-// const handleSizeChange = (val: number) => {
-//   searchQuery.value.limit = val
-//   getDepartmentList()
-//   getuserInfoList()
-//   getInstrumentInfo()
-//   getDeviceInfo()
-// }
-// const handleCurrentChange = (val: number) => {
-//   searchQuery.value.offset = val
-//   getDepartmentList()
-//   getuserInfoList()
-//   getInstrumentInfo()
-//   getDeviceInfo()
-// }
 // 弹窗初始化
 const initDialog = (row: any) => {
   reset()
@@ -460,22 +458,17 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title.split('-')[2] === '编辑'" type="primary" @click="submitForm(ruleFormRef)">
-            提交
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="title">
+      <template #btns>
+        <el-button v-if="title.split('-')[2] === '编辑'" type="primary" @click="submitForm(ruleFormRef)">
+          提交
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title.split('-')[2] === '详情' ? 'isDetail' : '']">
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item :label=" `${title.split('-')[1]}编号`" prop="organizeNo">
               <el-input v-model.trim="ruleForm.organizeNo" placeholder="系统自动生成" disabled />
@@ -487,7 +480,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="title.split('-')[1] === '工程组'" :gutter="24" class="marg">
+        <el-row v-if="title.split('-')[1] === '工程组'" :gutter="24">
           <el-col :span="6">
             <el-form-item label="科室编号">
               <el-input v-model.trim="ruleForm.pDeptId" disabled />
@@ -509,10 +502,10 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
-              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" @change="directorChange">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.name" />
               </el-select>
             </el-form-item>
@@ -532,7 +525,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="24">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
               <el-input v-model.trim="ruleForm.remark" :placeholder="title.split('-')[2] === '详情' ? '' : '备注'" :disabled="title.split('-')[2] === '详情'" />
@@ -540,85 +533,24 @@
           </el-col>
         </el-row>
       </el-form>
-      <!-- 科室信息-人员信息等列表切换 -->
-      <div>
-        <div class="header" style="margin-top: 10px;">
-          <!-- 切换 -->
-          <el-radio-group v-model="current" class="change-btn">
-            <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
-              {{ item.name }}
-            </el-radio-button>
-          </el-radio-group>
-          <div class="title">
-            {{ current }}
-          </div>
-          <span class="btns">
-          <!-- <el-button type="info" :disabled="title === '详情'" @click="removeRow">
-            删除行
-          </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
-            添加行
-          </el-button> -->
-          </span>
-        </div>
-        <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <el-table-column type="index" label="序号" width="55" align="center" />
-          <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
-        </el-table>
-        <!-- <div style="width: 100%;margin-top: 10px;">
-          <el-pagination
-            :current-page="searchQuery.offset"
-            :page-sizes="searchQuery.pageSizes"
-            :page-size="searchQuery.limit"
-            :total="searchQuery.total"
-            layout="total, sizes, prev, pager, next"
-            hide-on-single-page
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-          />
-        </div> -->
-      </div>
-    </div>
+    </detail-page>
+    <detail-block-switch :title="current">
+      <template #menu>
+        <el-radio-group v-model="current" class="change-btn">
+          <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
+            {{ item.name }}
+          </el-radio-button>
+        </el-radio-group>
+      </template>
+      <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
+        <el-table-column type="index" label="序号" width="55" align="center" />
+        <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </detail-block-switch>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-    position: relative;
-
-    .change-btn {
-      position: absolute;
-      left: 40px;
-      top: 4px;
-    }
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 4px;
-    }
-  }
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
@@ -628,8 +560,4 @@
     }
   }
 }
-
-.marg {
-  margin-top: 10px;
-}
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 9ad87af..aac1ef2 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -231,12 +231,14 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
+          <!-- <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
           <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
+          <icon-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 2e3322a..3f472eb 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -41,7 +41,7 @@
   { text: '证书号', value: 'certificateNo', align: 'center' },
   { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
   { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'validDate', align: 'center', width: '200' },
   { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
 ]) // 表格
 const certificateStatusList = ref([
@@ -90,7 +90,7 @@
   loadingTable.value = true
   getCertificateList(searchQuery).then((res) => {
     if (res.code === 200) {
-      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效' }))
+      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效', validDate: item.validDate.split(' ')[0], certificateDate: item.certificateDate.split(' ')[0] }))
       list.value = res.data.records
       total.value = Number(res.data.total)
     }
@@ -115,6 +115,7 @@
   addRef.value.initDialog({
     ...row,
     title: '详情',
+    name: props.isRemind ? '证书状况' : '证书记录',
   })
 }
 // 编辑
@@ -123,6 +124,7 @@
   addRef.value.initDialog({
     ...row,
     title: '编辑',
+    name: props.isRemind ? '证书状况' : '证书记录',
   })
 }
 
@@ -193,6 +195,7 @@
   dialogVisible.value = true
   addRef.value.initDialog({
     title: '新建',
+    name: props.isRemind ? '证书状况' : '证书记录',
   })
 }
 // 导出
@@ -292,21 +295,11 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
-            模板下载
-          </el-button>
-          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
-            打印
-          </el-button>
+          <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
@@ -325,7 +318,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column fixed="right" label="操作" align="center" width="150">
+            <el-table-column fixed="right" label="操作" align="center" width="180">
               <template #default="{ row }">
                 <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
                   提醒
@@ -336,7 +329,7 @@
                 <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 4dc1b17..4352604 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -69,7 +69,16 @@
     const IdCard = ruleForm.value.idCard
     const birthday = `${IdCard.substring(6, 10)}-${IdCard.substring(10, 12)}`
     ruleForm.value.birthday = birthday
-    console.log(ruleForm.value)
+    // 获取性别 第17位  奇数为男 偶数为女
+    // ruleForm.value.sex
+    if (Number(IdCard.substring(16, 17)) % 2) {
+      // 男
+      ruleForm.value.sex = '1'
+    }
+    else {
+      //  女
+      ruleForm.value.sex = '2'
+    }
   })
 }
 const dialogVisible = ref<boolean>(false) // 弹窗显示
@@ -130,7 +139,6 @@
     technologyExam: '', // 技术考核
     remark: '', // 备注
     certificateList: [], // 证书列表
-
   }
 }
 const technologyJobList = ref<technologyJobType[]>([])
@@ -309,7 +317,7 @@
           }
           (title.value === '新建'
             ? getStaffAdd
-            : getStaffupdate) ({ ...ruleForm.value, certificateList: changeList.value[0].data }).then((res) => {
+            : getStaffupdate) ({ ...ruleForm.value, certificateList: changeList.value[0].data, birthday: `${ruleForm.value.idCard.substring(6, 10)}-${ruleForm.value.idCard.substring(10, 12)}-${ruleForm.value.idCard.substring(12, 14)}` }).then((res) => {
             if (res.code == 200) {
               formEl?.resetFields()
               ElMessage.success('提交成功')
@@ -332,12 +340,14 @@
   emits('resetData')
   resetFormData()
 }
+const selectTreeRef = ref()
 // 弹窗初始化
 const initDialog = (row: any) => {
   changeList.value[0].data = []
   dialogVisible.value = true
   title.value = row.title
   resetFormData()
+  selectTreeRef.value?.clearSelected()
   getuser()
   getPubList()
   getSexList()
@@ -370,20 +380,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          计量人员-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
-            完成
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`计量人员-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+          完成
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
         <el-row :gutter="24" class="marg">
           <el-col :span="5">
@@ -394,6 +399,7 @@
                 :http-request="uploadQuarterlyEvaluateFile"
                 :before-upload="beforeAvatarUpload"
                 :disabled="title === '详情'"
+                accept="image/png, image/jpeg,image/jpg"
               >
                 <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
                 <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
@@ -425,8 +431,8 @@
               </el-select>
               <com-tree-select
                 v-else
-                v-model="ruleForm.deptId" :options="PubListTree" placeholder="选择组织机构"
-                :tree-props="deptProps"
+                ref="selectTreeRef" v-model="ruleForm.deptId" :options="PubListTree"
+                placeholder="选择组织机构" :tree-props="deptProps"
               />
             </el-form-item>
             <el-form-item label="计量专业" prop="major" class="marg-item">
@@ -489,29 +495,19 @@
           </el-col>
         </el-row>
       </el-form>
-      <!-- 证书基本信息 -->
-      <!-- 切换 -->
-      <!-- <el-radio-group v-model="current" style="margin-bottom: -15px;">
-          <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
-            {{ item.name }}
-          </el-radio-button>
-        </el-radio-group> -->
-      <div class="header" style="margin-top: 10px;">
-        <div class="title">
-          {{ current }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="info" @click="removeRow">
-            删除行
-          </el-button>
-          <el-button v-if="title !== '详情'" type="primary" @click="addRow">
-            添加行
-          </el-button>
-          <el-button v-if="title !== '详情'" type="primary" @click="editRow">
-            编辑行
-          </el-button>
-        </span>
-      </div>
+    </detail-page>
+    <detail-block :title="current">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="info" @click="removeRow">
+          删除行
+        </el-button>
+        <el-button v-if="title !== '详情'" type="primary" @click="addRow">
+          添加行
+        </el-button>
+        <el-button v-if="title !== '详情'" type="primary" @click="editRow">
+          编辑行
+        </el-button>
+      </template>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
         <el-table-column width="55" align="center">
           <template #default="scope">
@@ -523,7 +519,7 @@
         <el-table-column type="index" label="序号" width="55" />
         <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
       </el-table>
-    </div>
+    </detail-block>
     <!-- 添加证书信息组件 -->
     <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
     <!-- 选择用户列表组件 -->
@@ -532,77 +528,38 @@
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    background-color: #fff;
-    border-radius: 8px;
-    padding-top: 10px;
-    margin-top: 10px;
-    padding-right: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    display: flex;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    position: relative;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 5px;
-    }
-  }
-
-  :deep(.el-radio__label) {
-    display: none;
-  }
-
-  :deep(.el-icon.avatar-uploader-icon) {
-    font-size: 28px;
-    color: #8c939d;
-    width: 190px;
-    height: 250px;
-    text-align: center;
-  }
-
-  :deep(.avatar-uploader .avatar) {
-    width: 190px;
-    height: 250px;
-    display: block;
-  }
-
-  .isDetail {
-    ::v-deep {
-      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-        display: none;
-      }
-    }
-  }
+:deep(.el-radio__label) {
+  display: none;
 }
 
-.marg {
-  margin-top: 20px;
+:deep(.el-icon.avatar-uploader-icon) {
+  font-size: 28px;
+  color: #8c939d;
+  width: 190px;
+  height: 250px;
+  text-align: center;
 }
 
-.marg-item {
-  margin-top: 20px;
+:deep(.avatar-uploader .avatar) {
+  width: 190px;
+  height: 250px;
+  display: block;
+}
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
 }
 </style>
 
 <style scoped>
 .avatar-uploader .avatar {
-  width: 220px;
-  height: 320px;
+  width: 190px;
+  height: 250px;
   display: block;
 }
 </style>
@@ -624,8 +581,8 @@
 .el-icon.avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
-  width: 220px;
-  height: 320px;
+  width: 190px;
+  height: 250px;
   text-align: center;
 }
 </style>
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index ae48f11..042636e 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -4,7 +4,6 @@
 import dayjs from 'dayjs'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import type { technologyJobType } from '../person-interface'
-import certificateAddDialog from './certificateAddDialog.vue'
 import personListDialog from './personListDialog.vue'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
@@ -14,7 +13,8 @@
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
-const ruleFormRef = ref<FormInstance>() // from组件
+const ruleFormRef1 = ref<FormInstance>() // from组件
+const ruleFormRef2 = ref<FormInstance>() // from组件
 const meterStaff = ref({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -28,26 +28,43 @@
   workDate: '', // 从事日期
   id: '',
 })
+const baseInfo = ref({
+  certificateCompany: '',
+  certificateDate: '',
+  certificateName: '',
+  certificateNo: '',
+  validDate: '',
+  id: '',
+  isDel: 0,
+  minioFileName: '',
+  remark: '',
+})
 const ruleForm = ref({
   meterStaff: {}, // 人员信息
   staffId: '', // 计量人员id
 }) // 表单
-const multipleTableRef = ref<InstanceType<typeof ElTable>>()
 const title = ref('')
+const name = ref('')
 // 身份证号码验证规则
-const validateIDcard = (rule: any, value: any, callback: any) => {
-  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
-  if (rr.test(value)) {
-    callback()
-  }
-  else {
-    callback(new Error('验证失败'))
-  }
-}
+// const validateIDcard = (rule: any, value: any, callback: any) => {
+//   const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+//   if (rr.test(value)) {
+//     callback()
+//   }
+//   else {
+//     callback(new Error('验证失败'))
+//   }
+// }
 const rules = ref({
   staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
   // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
-
+}) // 表单验证规则
+const rules2 = ref({
+  certificateCompany: [{ required: true, message: '发证单位不能为空', trigger: 'blur' }],
+  certificateDate: [{ required: true, message: '发证日期不能为空', trigger: 'blur' }],
+  certificateName: [{ required: true, message: '证书名称不能为空', trigger: 'blur' }],
+  certificateNo: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
+  validDate: [{ required: true, message: '有效日期不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
 const userList = ref<userType[]>([]) // 可使用人列表
@@ -96,6 +113,17 @@
   meterStaff.value.major = ''
   meterStaff.value.workDate = ''
   meterStaff.value.id = ''
+  baseInfo.value = {
+    certificateCompany: '',
+    certificateDate: '',
+    certificateName: '',
+    certificateNo: '',
+    validDate: '',
+    id: '',
+    isDel: 0,
+    minioFileName: '',
+    remark: '',
+  }
 }
 const technologyJobList = ref<technologyJobType[]>([])
 // 获取技术职务列表
@@ -120,98 +148,14 @@
 const confirmPerson = (row: any) => {
   ruleForm.value.staffId = row.staffNo
   meterStaff.value = row
-  ruleFormRef.value?.clearValidate('staffNo')
+  ruleFormRef1.value?.clearValidate('staffNo')
 }
-const changeList = ref([
-  {
-    name: '证书基本信息',
-    data: [] as any[],
-    column: [
-      {
-        label: '证书号',
-        data: 'certificateNo',
-        id: 'zs02',
-      },
-      {
-        label: '证书名称',
-        data: 'certificateName',
-        id: 'zs03',
-      },
-      {
-        label: '发证日期',
-        data: 'certificateDate',
-        id: 'zs04',
-      },
-      {
-        label: '发证单位',
-        data: 'certificateCompany',
-        id: 'zs01',
-      },
-      {
-        label: '有效日期',
-        data: 'validDate',
-        id: 'zs05',
-      },
-    ],
-  },
-  {
-    name: '计量工作培训记录',
-    data: [],
-    column: [],
-  },
-  {
-    name: '业务记录',
-    data: [],
-    column: [],
-  },
-])
-const current = ref('证书基本信息')
-const currentShow = computed(() => {
-  return changeList.value.filter(item => item.name === current.value)[0]
-})
-const certificateRef = ref() // 添加证书信息弹窗
-// 添加行
-const addRow = () => {
-  certificateRef.value.initDialog({ title: '添加' })
-}
-// 编辑行
-const editRow = () => {
-  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
-}
-// 证书信息行内添加数据
-const addRowcertificate = (row: any, flag: string) => {
-  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
-  if (flag === 'update') {
-    changeList.value[0].data = [{
-      ...changeList.value[0].data[0],
-      ...row,
-      certificateStatus: diff < 0 ? '1' : '0',
-      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-    }]
-  }
-  else {
-    changeList.value[0].data.push(
-      {
-        ...row,
-        certificateStatus: diff < 0 ? '1' : '0',
-        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-        id: null,
-        isDel: 0,
-        minioFileName: '',
-        remark: '',
-        staffId: meterStaff.value.id,
-        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-      })
-  }
-}
-const currenSelect = ref<number>(-1) // 当前选中行
-// 删除行
-const removeRow = () => {
-  console.log(currenSelect.value)
-  if (currenSelect.value >= 0) {
+// 提交
+const submitForm = async (formEl1: FormInstance | undefined, formEl2: FormInstance | undefined) => {
+  if (!formEl1 || !formEl2) { return }
+  Promise.all([formEl1.validate(), formEl2.validate()]).then((res) => {
     ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
+      '确认提交吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -219,78 +163,49 @@
         type: 'warning',
       },
     ).then(() => {
-      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
-      currenSelect.value = -1
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 提交
-const submitForm = async (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  await formEl.validate((valid, fields) => {
-    if (valid) {
-      ElMessageBox.confirm(
-        '确认提交吗？',
-        '提示',
-        {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        },
-      ).then(() => {
-        let params
-        if (changeList.value[0].data.length) {
-          params = changeList.value[0].data
-        }
-        else {
-          params = [
-            {
-              certificateCompany: '',
-              certificateDate: '',
-              certificateName: '',
-              certificateNo: '',
-              certificateStatus: '',
-              createTime: '',
-              id: null,
-              isDel: 0,
-              minioFileName: '',
-              remark: '',
-              staffId: meterStaff.value.id,
-              updateTime: '',
-              validDate: '',
-            },
-          ]
-        }
-        (title.value === '新建'
-          ? addCertificateList
-          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
-          formEl?.resetFields()
-          ElMessage.success('提交成功')
-          emits('resetData')
-          resetFormData()
-        })
+      (title.value === '新建'
+        ? addCertificateList
+        : getCertificateUpdate)(title.value === '新建'
+        ? [{
+            ...baseInfo.value,
+            staffId: meterStaff.value.id,
+            createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+            updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+            certificateStatus: dayjs(baseInfo.value.validDate).diff(baseInfo.value.certificateDate, 'day') < 0 ? '1' : '0',
+            meterStaff: undefined,
+          }]
+        : {
+            ...baseInfo.value,
+            staffId: meterStaff.value.id,
+            createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+            updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+            certificateStatus: dayjs(baseInfo.value.validDate).diff(baseInfo.value.certificateDate, 'day') < 0 ? '1' : '0',
+            meterStaff: undefined,
+          }).then((res) => {
+        formEl1?.resetFields()
+        formEl2?.resetFields()
+        ElMessage.success('提交成功')
+        emits('resetData')
+        resetFormData()
       })
-    }
+    })
   })
 }
 // 取消
-const resetForm = (formEl: FormInstance | undefined) => {
+const resetForm = (formEl: FormInstance | undefined, formEl2: FormInstance | undefined) => {
   formEl?.resetFields()
-  changeList.value[0].data = []
+  formEl2?.resetFields()
   emits('resetData')
   resetFormData()
 }
+const selectTreeRef = ref()
 // 弹窗初始化
 const initDialog = (row: any) => {
-  changeList.value[0].data = []
   resetFormData()
   dialogVisible.value = true
   title.value = row.title
-  resetFormData()
+  name.value = row.name
+  selectTreeRef.value?.clearSelected()
   getuser()
   getPubList()
   getSexList()
@@ -303,8 +218,9 @@
   else {
     getCertificateDetail({ id: row.id }).then((res) => {
       if (res.code === 200) {
+        console.log(res, '证书记录')
         meterStaff.value = res.data.meterStaff
-        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+        baseInfo.value = res.data
       }
     })
   }
@@ -314,21 +230,16 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          证书记录-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
-            完成
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
-      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+    <detail-page :title=" `${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
+          完成
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef1, ruleFormRef2)">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef1" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="人员编号" prop="staffNo">
@@ -390,7 +301,8 @@
               </el-select>
               <com-tree-select
                 v-else
-                v-model="meterStaff.deptId" :options="PubListTree" placeholder="选择组织机构"
+                ref="selectTreeRef" v-model="meterStaff.deptId" :options="PubListTree"
+                placeholder="选择组织机构"
                 :tree-props="deptProps"
               />
             </el-form-item>
@@ -410,71 +322,52 @@
           </el-col>
         </el-row>
       </el-form>
-      <div class="header" style="margin-top: 10px;">
-        <div class="title">
-          {{ current }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title === '新建'" type="info" @click="removeRow">
-            删除行
-          </el-button>
-          <el-button v-if="title === '新建'" type="primary" @click="addRow">
-            添加行
-          </el-button>
-          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
-            编辑行
-          </el-button>
-        </span>
-      </div>
-      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
-        <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column>
-        <el-table-column type="index" label="序号" width="55" />
-        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
-      </el-table>
-    </div>
-    <!-- 添加证书信息组件 -->
-    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    </detail-page>
+    <detail-block title="证书基本信息">
+      <el-form ref="ruleFormRef2" :model="baseInfo" :rules="rules2" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="证书号" prop="certificateNo">
+              <el-input v-model.trim="baseInfo.certificateNo" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书名称" prop="certificateName">
+              <el-input v-model.trim="baseInfo.certificateName" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证单位" prop="certificateCompany">
+              <el-input v-model.trim="baseInfo.certificateCompany" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发证日期" prop="certificateDate">
+              <el-date-picker
+                v-model="baseInfo.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择发证日期"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书有效日期" prop="validDate">
+              <el-date-picker
+                v-model="baseInfo.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择有效日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block>
     <!-- 选择用户列表组件 -->
     <person-list-dialog ref="personListRef" @add="confirmPerson" />
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    background-color: #fff;
-    border-radius: 8px;
-    padding-top: 10px;
-    margin-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    display: flex;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    position: relative;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 5px;
-    }
-  }
-
   :deep(.el-radio__label) {
     display: none;
   }
@@ -487,40 +380,5 @@
       }
     }
   }
-}
-
-.marg {
-  margin-top: 20px;
-}
 </style>
 
-<style scoped>
-.avatar-uploader .avatar {
-  width: 178px;
-  height: 178px;
-  display: block;
-}
-</style>
-
-<style>
-.avatar-uploader .el-upload {
-  border: 1px dashed var(--el-border-color);
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-  transition: var(--el-transition-duration-fast);
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: var(--el-color-primary);
-}
-
-.el-icon.avatar-uploader-icon {
-  font-size: 28px;
-  color: #8c939d;
-  width: 178px;
-  height: 178px;
-  text-align: center;
-}
-</style>
diff --git a/src/views/measure/person/components/addRecordCancel.vue b/src/views/measure/person/components/addRecordCancel.vue
new file mode 100644
index 0000000..c32ac43
--- /dev/null
+++ b/src/views/measure/person/components/addRecordCancel.vue
@@ -0,0 +1,459 @@
+<!-- 计量人员新增  证书基本信息table表格   作废 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import type { technologyJobType } from '../person-interface'
+import certificateAddDialog from './certificateAddDialog.vue'
+import personListDialog from './personListDialog.vue'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import type { TreeStructure, userType } from '@/views/system/user/user-interface'
+import { getDictByCode } from '@/api/system/dict'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const meterStaff = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  idCard: '', // 身份证号
+  sex: '', // 性别
+  education: '', // 文化程度
+  technologyJob: '', // 技术职务
+  administrationJob: '', // 行政职务
+  deptId: '', // 工作部门
+  major: '', // 专业
+  workDate: '', // 从事日期
+  id: '',
+})
+const ruleForm = ref({
+  meterStaff: {}, // 人员信息
+  staffId: '', // 计量人员id
+}) // 表单
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const title = ref('')
+const name = ref('')
+// 身份证号码验证规则
+const validateIDcard = (rule: any, value: any, callback: any) => {
+  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+  if (rr.test(value)) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+const rules = ref({
+  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
+
+}) // 表单验证规则
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref<TreeStructure[]>([])
+const PubListTree = ref([])
+// 获取组织列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
+  })
+}
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sex').then((response) => {
+    sexList.value = response.data
+  })
+}
+const educationList = ref<technologyJobType[]>([])
+// 获取文化程度列表
+const geteducationList = () => {
+  getDictByCode('education').then((response) => {
+    educationList.value = response.data
+  })
+}
+// 重置表单内容
+const resetFormData = () => {
+  meterStaff.value.staffNo = ''
+  meterStaff.value.name = ''
+  meterStaff.value.idCard = ''
+  meterStaff.value.sex = ''
+  meterStaff.value.education = ''
+  meterStaff.value.technologyJob = ''
+  meterStaff.value.administrationJob = ''
+  meterStaff.value.deptId = ''
+  meterStaff.value.major = ''
+  meterStaff.value.workDate = ''
+  meterStaff.value.id = ''
+}
+const technologyJobList = ref<technologyJobType[]>([])
+// 获取技术职务列表
+const getTechnologyJobList = () => {
+  getDictByCode('technologyJob').then((response) => {
+    technologyJobList.value = response.data
+  })
+}
+const administrationJobList = ref<technologyJobType[]>([])
+// 获取行政职务列表
+const getAdministrationJob = () => {
+  getDictByCode('administrationJob').then((response) => {
+    administrationJobList.value = response.data
+  })
+}
+const personListRef = ref()
+// 选择人员
+const selectPerson = () => {
+  personListRef.value.initDialog()
+}
+// 保存选择人员信息
+const confirmPerson = (row: any) => {
+  ruleForm.value.staffId = row.staffNo
+  meterStaff.value = row
+  ruleFormRef.value?.clearValidate('staffNo')
+}
+const changeList = ref([
+  {
+    name: '证书基本信息',
+    data: [] as any[],
+    column: [
+      {
+        label: '证书号',
+        data: 'certificateNo',
+        id: 'zs02',
+      },
+      {
+        label: '证书名称',
+        data: 'certificateName',
+        id: 'zs03',
+      },
+      {
+        label: '发证日期',
+        data: 'certificateDate',
+        id: 'zs04',
+      },
+      {
+        label: '发证单位',
+        data: 'certificateCompany',
+        id: 'zs01',
+      },
+      {
+        label: '有效日期',
+        data: 'validDate',
+        id: 'zs05',
+      },
+    ],
+  },
+  {
+    name: '计量工作培训记录',
+    data: [],
+    column: [],
+  },
+  {
+    name: '业务记录',
+    data: [],
+    column: [],
+  },
+])
+const current = ref('证书基本信息')
+const currentShow = computed(() => {
+  return changeList.value.filter(item => item.name === current.value)[0]
+})
+const certificateRef = ref() // 添加证书信息弹窗
+// 添加行
+const addRow = () => {
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
+}
+// 证书信息行内添加数据
+const addRowcertificate = (row: any, flag: string) => {
+  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
+  if (flag === 'update') {
+    changeList.value[0].data = [{
+      ...changeList.value[0].data[0],
+      ...row,
+      certificateStatus: diff < 0 ? '1' : '0',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    }]
+  }
+  else {
+    changeList.value[0].data.push(
+      {
+        ...row,
+        certificateStatus: diff < 0 ? '1' : '0',
+        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        id: null,
+        isDel: 0,
+        minioFileName: '',
+        remark: '',
+        staffId: meterStaff.value.id,
+        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
+  }
+}
+const currenSelect = ref<number>(-1) // 当前选中行
+// 删除行
+const removeRow = () => {
+  console.log(currenSelect.value)
+  if (currenSelect.value >= 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
+      currenSelect.value = -1
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        let params
+        if (changeList.value[0].data.length) {
+          params = changeList.value[0].data
+        }
+        else {
+          params = [
+            {
+              certificateCompany: '',
+              certificateDate: '',
+              certificateName: '',
+              certificateNo: '',
+              certificateStatus: '',
+              createTime: '',
+              id: null,
+              isDel: 0,
+              minioFileName: '',
+              remark: '',
+              staffId: meterStaff.value.id,
+              updateTime: '',
+              validDate: '',
+            },
+          ]
+        }
+        (title.value === '新建'
+          ? addCertificateList
+          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
+          formEl?.resetFields()
+          ElMessage.success('提交成功')
+          emits('resetData')
+          resetFormData()
+        })
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  changeList.value[0].data = []
+  emits('resetData')
+  resetFormData()
+}
+const selectTreeRef = ref()
+// 弹窗初始化
+const initDialog = (row: any) => {
+  changeList.value[0].data = []
+  resetFormData()
+  dialogVisible.value = true
+  title.value = row.title
+  name.value = row.name
+  selectTreeRef.value.clearSelected()
+  resetFormData()
+  getuser()
+  getPubList()
+  getSexList()
+  geteducationList()
+  getTechnologyJobList()
+  getAdministrationJob()
+  if (row.title === '新建') {
+    console.log()
+  }
+  else {
+    getCertificateDetail({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        meterStaff.value = res.data.meterStaff
+        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+      }
+    })
+  }
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <detail-page :title=" `${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+          完成
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="人员编号" prop="staffNo">
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="selectPerson">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="meterStaff.name">
+              <el-input v-model.trim="meterStaff.name" placeholder="姓名" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="性别" prop="meterStaff.sex">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="文化程度" prop="meterStaff.education">
+              <el-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="技术职务" prop="meterStaff.technologyJob">
+              <el-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="行政职务" prop="meterStaff.administrationJob">
+              <el-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="工作部门" prop="deptId">
+              <el-select v-if="title === '详情'" v-model="meterStaff.deptId" disabled>
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+              <com-tree-select
+                v-else
+                ref="selectTreeRef" v-model="meterStaff.deptId" :options="PubListTree"
+                placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业" prop="major">
+              <el-input v-model.trim="meterStaff.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="从事日期" prop="workDate">
+              <el-date-picker
+                v-model="meterStaff.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择从事日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block :title="current">
+      <template #btns>
+        <el-button v-if="title === '新建'" type="info" @click="removeRow">
+          删除行
+        </el-button>
+        <el-button v-if="title === '新建'" type="primary" @click="addRow">
+          添加行
+        </el-button>
+        <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+          编辑行
+        </el-button>
+      </template>
+      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
+        <el-table-column width="55" align="center">
+          <template #default="scope">
+            <el-radio-group v-model="currenSelect" class="ml-4">
+              <el-radio :label="scope.$index" />
+            </el-radio-group>
+          </template>
+        </el-table-column>
+        <el-table-column type="index" label="序号" width="55" />
+        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </detail-block>
+    <!-- 添加证书信息组件 -->
+    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    <!-- 选择用户列表组件 -->
+    <person-list-dialog ref="personListRef" @add="confirmPerson" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        display: none;
+      }
+    }
+  }
+</style>
+
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 332c73c..178fc12 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -32,6 +32,7 @@
   form.validDate = ''
 }
 const initDialog = (row: any) => {
+  resetData()
   title.value = row.title
   if (row.title === '编辑') {
     form.certificateNo = row.certificateNo
@@ -50,10 +51,12 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       if (title.value === '编辑') {
-        emits('add', form, 'update')
+        const deptRow = JSON.parse(JSON.stringify(form))
+        emits('add', deptRow, 'update')
       }
       else {
-        emits('add', form, '')
+        const deptRow = JSON.parse(JSON.stringify(form))
+        emits('add', deptRow, '')
       }
       dialogFormVisible.value = false
     }
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 592d810..9c6f65d 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -30,7 +30,7 @@
   { text: '技术职务', value: 'technologyJob', align: 'center', width: '140' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '100' },
   { text: '计量专业', value: 'major', align: 'center', width: '100' },
-  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '180' },
   { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '技术考核', value: 'technologyExam', align: 'center', width: '85' },
 ]) // 表格
@@ -63,7 +63,7 @@
   loadingTable.value = true
   getStaffList(searchQuery).then((res) => {
     if (res.code === 200) {
-      res.data.records = res.data.records.map((item: StaffType) => ({ ...item, sex: item.sex == '1' ? '男' : '女', technologyExam: item.technologyExam == '0' ? '已考核' : '未考核' }))
+      res.data.records = res.data.records.map((item: StaffType) => ({ ...item, sex: item.sex == '1' ? '男' : '女', technologyExam: item.technologyExam == '0' ? '已考核' : '未考核', certificateDate: item.certificateDate.split(' ')[0] }))
       list.value = res.data.records
       total.value = Number(res.data.total)
     }
@@ -236,21 +236,11 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="proxy.hasPerm(`/measure/person/list/import`)" type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" type="primary" @click="templateDownload">
-            模板下载
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/list/add`)" type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/list/export`)" type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" type="primary" @click="print">
-            打印
-          </el-button>
+          <icon-button v-if="proxy.hasPerm(`/measure/person/list/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/list/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/list/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index 17b92d3..e44001a 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -295,15 +295,17 @@
         </el-button>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
-      <el-form-item>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer footer">
         <el-button type="primary" @click="submitForm(ruleFormRef)">
           发布
         </el-button>
         <el-button @click="resetForm(ruleFormRef)">
           关闭
         </el-button>
-      </el-form-item>
-    </el-form>
+      </div>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index 3d5c2e3..0926957 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -172,15 +172,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <el-button v-if="proxy.hasPerm('/sys/notice/list/add')" type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/sys/notice/list/export')" type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/sys/notice/list/print')" v-print="printObj" type="primary">
-          打印
-        </el-button>
+        <icon-button v-if="proxy.hasPerm('/sys/notice/list/add')" icon="icon-add" title="新建" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/sys/notice/list/export')" icon="icon-export" title="导出" @click="exportExcelBtn" />
+        <icon-button v-if="proxy.hasPerm('/sys/notice/list/print')" v-print="printObj" icon="icon-print" title="打印" />
       </template>
       <!-- 表格区域 -->
       <normal-table
diff --git a/src/views/system/notice/noticeDetail.vue b/src/views/system/notice/noticeDetail.vue
index 441ef0f..94468d4 100644
--- a/src/views/system/notice/noticeDetail.vue
+++ b/src/views/system/notice/noticeDetail.vue
@@ -97,15 +97,14 @@
         </el-link>
         <span v-else>暂无附件</span>
       </el-form-item>
-      <el-form-item>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer footer">
         <el-button type="primary" @click="submitForm()">
           确认
         </el-button>
-        <!-- <el-button @click="resetForm(ruleFormRef)">
-          关闭
-        </el-button> -->
-      </el-form-item>
-    </el-form>
+      </div>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/src/views/system/tool/autograph/addDDialog.vue b/src/views/system/tool/autograph/addDDialog.vue
index d34e8ef..e39b706 100644
--- a/src/views/system/tool/autograph/addDDialog.vue
+++ b/src/views/system/tool/autograph/addDDialog.vue
@@ -200,15 +200,17 @@
         </el-button>
         <input v-show="title === '123'" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
-      <el-form-item>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer footer">
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
           发布
         </el-button>
         <el-button @click="resetForm(ruleFormRef)">
           关闭
         </el-button>
-      </el-form-item>
-    </el-form>
+      </div>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/src/views/system/tool/autograph/autograph.vue b/src/views/system/tool/autograph/autograph.vue
index 8fffe07..ac9f000 100644
--- a/src/views/system/tool/autograph/autograph.vue
+++ b/src/views/system/tool/autograph/autograph.vue
@@ -191,15 +191,9 @@
     <table-container>
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/add')" type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/export')" type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/print')" v-print="printObj" type="primary">
-          打印
-        </el-button>
+        <icon-button v-if="proxy.hasPerm('/sys/tool/autograph/add')" icon="icon-add" title="新建" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/sys/tool/autograph/export')" icon="icon-export" title="导出" @click="exportExcelBtn" />
+        <icon-button v-if="proxy.hasPerm('/sys/tool/autograph/print')" v-print="printObj" icon="icon-print" title="打印" />
       </template>
       <!-- 表格区域 -->
       <normal-table
diff --git a/src/views/system/tool/certificate/addDDialog.vue b/src/views/system/tool/certificate/addDDialog.vue
index 330f2de..2721bf8 100644
--- a/src/views/system/tool/certificate/addDDialog.vue
+++ b/src/views/system/tool/certificate/addDDialog.vue
@@ -199,15 +199,17 @@
         </el-button>
         <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
       </el-form-item>
-      <el-form-item>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer footer">
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
           发布
         </el-button>
         <el-button @click="resetForm(ruleFormRef)">
           关闭
         </el-button>
-      </el-form-item>
-    </el-form>
+      </div>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/src/views/system/tool/certificate/certificate.vue b/src/views/system/tool/certificate/certificate.vue
index 5ac1900..9787116 100644
--- a/src/views/system/tool/certificate/certificate.vue
+++ b/src/views/system/tool/certificate/certificate.vue
@@ -192,15 +192,9 @@
     <table-container>
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button v-if="proxy.hasPerm('/sys/tool/certificate/add')" type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/sys/tool/certificate/export')" type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/sys/tool/certificate/print')" v-print="printObj" type="primary">
-          打印
-        </el-button>
+        <icon-button v-if="proxy.hasPerm('/sys/tool/certificate/add')" icon="icon-add" title="新建" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/sys/tool/certificate/export')" icon="icon-export" title="导出" @click="exportExcelBtn" />
+        <icon-button v-if="proxy.hasPerm('/sys/tool/certificate/print')" v-print="printObj" icon="icon-print" title="打印" />
       </template>
       <!-- 表格区域 -->
       <normal-table

diff --git a/src/components.d.ts b/src/components.d.ts
index 6e85584..815d62f 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -16,14 +16,13 @@
     BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default']
     BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
-    Benchcol: typeof import('./components/benchcol/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/DetailPage/index copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
+    DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
diff --git a/src/components/DetailPage/DetailBlockSwitch.vue b/src/components/DetailPage/DetailBlockSwitch.vue
new file mode 100644
index 0000000..4d92074
--- /dev/null
+++ b/src/components/DetailPage/DetailBlockSwitch.vue
@@ -0,0 +1,71 @@
+<script lang="ts" setup name="DetailBlock">
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+})
+
+const slots = useSlots()
+</script>
+
+<template>
+  <div class="detail-main">
+    <div class="header">
+      <div class="menu">
+        <slot name="menu" />
+      </div>
+      <div class="title">
+        {{ title }}
+      </div>
+      <div class="btns">
+        <slot name="btns" />
+      </div>
+    </div>
+    <div v-if="slots.default" class="content">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-main {
+  background-color: #fff;
+  border-radius: 8px;
+  margin-top: 10px;
+  padding-top: 10px;
+
+  .header {
+    position: relative;
+    height: 40px;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+
+    .title {
+      font-weight: 500;
+    }
+
+    .btns {
+      position: absolute;
+      right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+
+    .menu {
+      position: absolute;
+      left: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+
+  .content {
+    background-color: #fff;
+    padding: 0 10px 20px;
+    margin-top: 10px;
+  }
+}
+</style>
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d6c1c91..1644a80 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -314,6 +314,39 @@
       },
     ],
   },
+  {
+    path: '/borrow',
+    component: Layout,
+    redirect: '/device/borrow/borrowapply',
+    name: 'Borrow',
+    meta: {
+      title: '设备领用',
+      icon: 'ep:key',
+      auth: '/device/borrow',
+    },
+    children: [
+      {
+        path: 'borrowapply',
+        name: 'borroWapply',
+        component: () => import('@/views/device/borrow/borrwoApply.vue'),
+        meta: {
+          title: '设备借用申请',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowapply',
+        },
+      },
+      {
+        path: 'borrowhandle',
+        name: 'borrowHandle',
+        component: () => import('@/views/device/borrow/borrowHandle.vue'),
+        meta: {
+          title: '设备借用处理',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowhandle',
+        },
+      },
+    ],
+  },
 
 ]
 
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
new file mode 100644
index 0000000..1c2405e
--- /dev/null
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="borrowHandle">
+// 逻辑代码
+</script>
+
+<template>
+  <app-container>
+    设备借用处理
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
new file mode 100644
index 0000000..03d414b
--- /dev/null
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="borrowApply">
+// 逻辑代码
+</script>
+
+<template>
+  <app-container>
+    设备借用申请
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index c2682fc..5f7b347 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -339,381 +339,374 @@
 
 <template>
   <div class="body-container">
-    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资产编号" prop="assetNo">
-            <el-input v-model.trim="ruleForm.assetNo" placeholder="系统自动生成" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="资产类型" prop="assetType">
-            <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备编号" prop="equipmentNo">
-            <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备名称" prop="equipmentName">
-            <el-input v-model.trim="ruleForm.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="生产厂家" prop="manufacturer">
-            <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="厂家国别" prop="manufacturerCountry">
-            <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="出厂编号" prop="manufacturingNo">
-            <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="出厂年月" prop="manufacturingDate">
-            <el-date-picker
-              v-model="ruleForm.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '出厂年月'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="型号" prop="modelNo">
-            <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="管理状态" prop="managerState">
-            <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="ABC" prop="abc">
-            <el-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'">
-              <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="标签绑定" prop="labelBind">
-            <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === '详情' ? '' : '标签'" :disabled="title === '详情'" clearable>
-              <template #append>
-                <el-button type="primary" size="small">
-                  扫描
-                </el-button>
-              </template>
-            </el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="立卡年月" prop="cardEstablishmentDate">
-            <el-date-picker
-              v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '立卡年月'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="启用日期" prop="enableDate">
-            <el-date-picker
-              v-model="ruleForm.enableDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '启用日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定方式" prop="mesureType">
-            <el-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'">
-              <el-option v-for="item in mesureTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定周期" prop="mesureCycle">
-            <el-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="12">
-          <el-form-item label="测量范围" prop="mesureRange">
-            <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === '详情' ? '' : '测量范围'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="不确定度" prop="uncertainty">
-            <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === '详情' ? '' : '不确定度'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="使用部门" prop="useDept">
-            <com-tree-select
-              v-if="title !== '详情'"
-              v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-              :tree-props="deptProps"
-            />
-            <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
-              <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="使用人" prop="usePerson">
-            <el-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'">
-              <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="专业分类" prop="majorCategory">
-            <el-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'">
-              <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="检定部门" prop="mesureDept">
-            <com-tree-select
-              v-if="title !== '详情'"
-              v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-              :tree-props="deptProps"
-            />
-            <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
-              <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定日期" prop="mesureDate">
-            <el-date-picker
-              v-model="ruleForm.mesureDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '检定日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="有效日期" prop="validDate">
-            <el-date-picker
-              v-model="ruleForm.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '有效日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定结果" prop="mesureResult">
-            <el-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'">
-              <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="8">
-          <el-form-item label="是否是技术指标需要校准/检定的设备" prop="isCalibrationTestEquipment" label-width="260px">
-            <el-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否是测量工装台账" prop="isMeasureAccount" label-width="260px">
-            <el-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否标准配套设备" prop="isStandardSupportEquipment" label-width="260px">
-            <el-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
+    <detail-block-switch title="基本信息">
+      <template #menu>
+        <slot name="menuswitch" />
+      </template>
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资产编号" prop="assetNo">
+              <el-input v-model.trim="ruleForm.assetNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="资产类型" prop="assetType">
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备编号" prop="equipmentNo">
+              <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="生产厂家" prop="manufacturer">
+              <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="厂家国别" prop="manufacturerCountry">
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号" prop="manufacturingNo">
+              <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂年月" prop="manufacturingDate">
+              <el-date-picker
+                v-model="ruleForm.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '出厂年月'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="型号" prop="modelNo">
+              <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="管理状态" prop="managerState">
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="ABC" prop="abc">
+              <el-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'">
+                <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标签绑定" prop="labelBind">
+              <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === '详情' ? '' : '标签'" :disabled="title === '详情'" clearable>
+                <template #append>
+                  <el-button type="primary" size="small">
+                    扫描
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="立卡年月" prop="cardEstablishmentDate">
+              <el-date-picker
+                v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '立卡年月'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="启用日期" prop="enableDate">
+              <el-date-picker
+                v-model="ruleForm.enableDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '启用日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定方式" prop="mesureType">
+              <el-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'">
+                <el-option v-for="item in mesureTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定周期" prop="mesureCycle">
+              <el-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="测量范围" prop="mesureRange">
+              <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === '详情' ? '' : '测量范围'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="不确定度" prop="uncertainty">
+              <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === '详情' ? '' : '不确定度'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="使用部门" prop="useDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
+                :tree-props="deptProps"
+              />
+              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="使用人" prop="usePerson">
+              <el-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'">
+                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="专业分类" prop="majorCategory">
+              <el-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'">
+                <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="检定部门" prop="mesureDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                :tree-props="deptProps"
+              />
+              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定日期" prop="mesureDate">
+              <el-date-picker
+                v-model="ruleForm.mesureDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '检定日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="有效日期" prop="validDate">
+              <el-date-picker
+                v-model="ruleForm.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '有效日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定结果" prop="mesureResult">
+              <el-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'">
+                <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="8">
+            <el-form-item label="是否是技术指标需要校准/检定的设备" prop="isCalibrationTestEquipment" label-width="260px">
+              <el-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否是测量工装台账" prop="isMeasureAccount" label-width="260px">
+              <el-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否标准配套设备" prop="isStandardSupportEquipment" label-width="260px">
+              <el-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资产来源" prop="assetSource">
-            <el-input v-model.trim="ruleForm.assetSource" :placeholder="title === '详情' ? '' : '资产来源'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备规格" prop="equipmentSpecifications">
-            <el-input v-model.trim="ruleForm.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备类别" prop="equipmentCategory">
-            <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
-              <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备类型" prop="equipmentType">
-            <el-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'">
-              <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资本来源" prop="capitalSource">
-            <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
-              <el-option v-for="item in capitalSourceList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="管理级别" prop="managerLevel">
-            <el-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'">
-              <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="用途" prop="purpose">
-            <el-input v-model.trim="ruleForm.purpose" :placeholder="title === '详情' ? '' : '用途'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="技术水平" prop="technicalLevel">
-            <el-input v-model.trim="ruleForm.technicalLevel" :placeholder="title === '详情' ? '' : '技术水平'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="完好状态" prop="intactState">
-            <el-input v-model.trim="ruleForm.intactState" :placeholder="title === '详情' ? '' : '完好状态'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="外形尺寸" prop="overallDimension">
-            <el-input v-model.trim="ruleForm.overallDimension" :placeholder="title === '详情' ? '' : '外形尺寸'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="重量(吨)" prop="weight">
-            <el-input v-model.trim="ruleForm.weight" :placeholder="title === '详情' ? '' : '重量'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="单价" prop="singlePrice">
-            <el-input v-model.trim="ruleForm.singlePrice" :placeholder="title === '详情' ? '' : '单价'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="安装及杂费" prop="installIncidentalExpenses">
-            <el-input v-model.trim="ruleForm.installIncidentalExpenses" :placeholder="title === '详情' ? '' : '安装及杂费'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="安装地点" prop="installPlace">
-            <el-input v-model.trim="ruleForm.installPlace" :placeholder="title === '详情' ? '' : '安装地点'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="原值" prop="originValue">
-            <el-input v-model.trim="ruleForm.originValue" :placeholder="title === '详情' ? '' : '原值'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="目前原值" prop="presentOriginValue">
-            <el-input v-model.trim="ruleForm.presentOriginValue" :placeholder="title === '详情' ? '' : '目前原值'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="折旧年限" prop="depreciationPeriod">
-            <el-input v-model.trim="ruleForm.depreciationPeriod" :placeholder="title === '详情' ? '' : '折旧年限'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="折旧方法" prop="depreciationMethod">
-            <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
-              <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="属性" prop="attribute">
-            <el-input v-model.trim="ruleForm.attribute" placeholder="属性" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="12">
-          <el-form-item label="说明书" prop="minioFileName">
-            <show-photo :minio-file-name="ruleForm.fileList[0]?.minioFileName || ''" />
-            <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
-            <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
-              {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
-            </el-button>
-            <span v-if="title === '详情' && !ruleForm.fileList[0]?.minioFileName">暂无</span>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="24">
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" placeholder="备注" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资产来源" prop="assetSource">
+              <el-input v-model.trim="ruleForm.assetSource" :placeholder="title === '详情' ? '' : '资产来源'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备规格" prop="equipmentSpecifications">
+              <el-input v-model.trim="ruleForm.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备类别" prop="equipmentCategory">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+                <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备类型" prop="equipmentType">
+              <el-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'">
+                <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资本来源" prop="capitalSource">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+                <el-option v-for="item in capitalSourceList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="管理级别" prop="managerLevel">
+              <el-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'">
+                <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="用途" prop="purpose">
+              <el-input v-model.trim="ruleForm.purpose" :placeholder="title === '详情' ? '' : '用途'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="技术水平" prop="technicalLevel">
+              <el-input v-model.trim="ruleForm.technicalLevel" :placeholder="title === '详情' ? '' : '技术水平'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="完好状态" prop="intactState">
+              <el-input v-model.trim="ruleForm.intactState" :placeholder="title === '详情' ? '' : '完好状态'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="外形尺寸" prop="overallDimension">
+              <el-input v-model.trim="ruleForm.overallDimension" :placeholder="title === '详情' ? '' : '外形尺寸'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="重量(吨)" prop="weight">
+              <el-input v-model.trim="ruleForm.weight" :placeholder="title === '详情' ? '' : '重量'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="单价" prop="singlePrice">
+              <el-input v-model.trim="ruleForm.singlePrice" :placeholder="title === '详情' ? '' : '单价'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="安装及杂费" prop="installIncidentalExpenses">
+              <el-input v-model.trim="ruleForm.installIncidentalExpenses" :placeholder="title === '详情' ? '' : '安装及杂费'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="安装地点" prop="installPlace">
+              <el-input v-model.trim="ruleForm.installPlace" :placeholder="title === '详情' ? '' : '安装地点'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="原值" prop="originValue">
+              <el-input v-model.trim="ruleForm.originValue" :placeholder="title === '详情' ? '' : '原值'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="目前原值" prop="presentOriginValue">
+              <el-input v-model.trim="ruleForm.presentOriginValue" :placeholder="title === '详情' ? '' : '目前原值'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="折旧年限" prop="depreciationPeriod">
+              <el-input v-model.trim="ruleForm.depreciationPeriod" :placeholder="title === '详情' ? '' : '折旧年限'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="折旧方法" prop="depreciationMethod">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+                <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="属性" prop="attribute">
+              <el-input v-model.trim="ruleForm.attribute" placeholder="属性" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="说明书" prop="minioFileName">
+              <show-photo :minio-file-name="ruleForm.fileList[0]?.minioFileName || ''" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
+                {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
+              </el-button>
+              <span v-if="title === '详情' && !ruleForm.fileList[0]?.minioFileName">暂无</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" placeholder="备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block-switch>
   </div>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    padding-top: 20px;
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index f46553a..fc3fd54 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -360,20 +360,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          固定资产-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`固定资产-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -763,44 +758,11 @@
           </el-row>
         </div> -->
       </el-form>
-    </div>
+    </detail-page>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index 0abbdb1..6e88e96 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -74,33 +74,29 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ name }} -{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm">
-            关闭
-          </el-button>
-        </span>
-      </div>
-      <div class="body">
-        <!-- 三级菜单 -->
-        <el-radio-group v-model="current">
-          <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
-            {{ item.name }}
-          </el-radio-button>
-        </el-radio-group>
-      </div>
-      <!-- 展示区域 -->
-      <keep-alive>
-        <component :is="currentComp" ref="currentCompRef" :name="current" :title="title" :row="row" />
-      </keep-alive>
-    </div>
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <!-- 展示区域 -->
+    <keep-alive>
+      <component :is="currentComp" ref="currentCompRef" :name="current" :title="title" :row="row">
+        <template #menuswitch>
+          <!-- 三级菜单 -->
+          <el-radio-group v-model="current">
+            <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+              {{ item.name }}
+            </el-radio-button>
+          </el-radio-group>
+        </template>
+      </component>
+    </keep-alive>
   </app-container>
 </template>
 
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f9cdcd0..f653095 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -256,7 +256,7 @@
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
-  // 原生上传图片
+  // 原生上传
   // console.log(event.target.files)
   // if (event.target.files[0].type === 'application/pdf') {
   if (event.target.files?.length !== 0) {
@@ -354,7 +354,7 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" type="primary" @click="identify">
+          <!-- <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" type="primary" @click="identify">
             标签识别
           </el-button>
           <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/import`)" type="primary" @click="batchImport">
@@ -371,7 +371,13 @@
           </el-button>
           <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/print`)" v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/device/standingBook/components/templateTable.vue b/src/views/device/standingBook/components/templateTable.vue
index 8a928f0..7aa563f 100644
--- a/src/views/device/standingBook/components/templateTable.vue
+++ b/src/views/device/standingBook/components/templateTable.vue
@@ -245,11 +245,11 @@
   <div>
     <!-- 添加证书信息组件 -->
     <add-row ref="addRowRef" @add="addRowData" />
-    <div class="header">
-      <div class="title">
-        <!-- {{ $props.name }} -->
-      </div>
-      <span class="btns">
+    <detail-block-switch :title="name">
+      <template #menu>
+        <slot name="menuswitch" />
+      </template>
+      <template #btns>
         <el-button v-if="title !== '详情'" type="info" @click="removeRow">
           删除行
         </el-button>
@@ -259,55 +259,33 @@
         <el-button v-if="title !== '详情'" type="primary" @click="editRow">
           编辑行
         </el-button>
-      </span>
-    </div>
-    <!-- 表格区域 -->
-    <normal-table
-      id="print"
-      :data="list" :total="total" :columns="columns as any"
-      :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-      :list-loading="loadingTable"
-      style="padding-top: 20px;background-color: #fff;"
-      @change="changePage"
-    >
-      <template #preColumns>
-        <el-table-column label="" width="55" align="center">
-          <template #default="scope">
-            <el-radio v-model="select" :label="scope.$index" class="radio" />
-          </template>
-        </el-table-column>
-        <el-table-column label="序号" width="55" align="center">
-          <template #default="scope">
-            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-          </template>
-        </el-table-column>
       </template>
-    </normal-table>
+      <!-- 表格区域 -->
+      <normal-table
+        id="print"
+        :data="list" :total="total" :columns="columns as any"
+        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+        :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </detail-block-switch>
   </div>
 </template>
 
 <style lang="scss" scoped>
-.header {
-  background-color: #fff;
-  // height: 40px;
-  border-radius: 8px;
-  display: flex;
-  align-items: center;
-  flex-direction: column;
-  justify-content: center;
-  position: relative;
-
-  .title {
-    // font-weight: 700;
-  }
-
-  .btns {
-    position: absolute;
-    right: 40px;
-    top: -22px;
-  }
-}
-
 :deep(.el-radio__label) {
   display: none;
 }
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 7538bc8..78a3800 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -272,24 +272,12 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/identify`)" type="primary" @click="identify">
-            标签识别
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/import`)" type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/mould`)" type="primary" @click="templateDownload">
-            模板下载
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/add`)" type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/export`)" type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/print`)" v-print="printObj" type="primary">
-            打印
-          </el-button>
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/identify`)" icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index fc364c8..e74d70e 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -361,20 +361,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ name }} - {{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -458,73 +453,33 @@
           </el-col>
         </el-row>
       </el-form>
-      <div v-if="title !== '新建' ">
-        <div class="header" style="margin-top: 10px;">
-          <div class="title">
-            审批流程
-          </div>
-        </div>
-        <div class="timeline">
-          <el-timeline>
-            <el-timeline-item timestamp="2018/4/12" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/12 20:46</p>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="2018/4/3" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/3 20:46</p>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="2018/4/2" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/2 20:46</p>
-              </el-card>
-            </el-timeline-item>
-          </el-timeline>
-        </div>
-      </div>
-    </div>
+    </detail-page>
+    <detail-block v-if="title !== '新建' " title="审批流程">
+      <el-timeline>
+        <el-timeline-item timestamp="2018/4/12" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/12 20:46</p>
+          </el-card>
+        </el-timeline-item>
+        <el-timeline-item timestamp="2018/4/3" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/3 20:46</p>
+          </el-card>
+        </el-timeline-item>
+        <el-timeline-item timestamp="2018/4/2" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/2 20:46</p>
+          </el-card>
+        </el-timeline-item>
+      </el-timeline>
+    </detail-block>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .timeline {
   background-color: #fff;
 }
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index aa3963f..737568d 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -1,6 +1,6 @@
 <!-- 状态管理公共列表组件 -->
 <script lang="ts" setup>
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessageBox } from 'element-plus'
 import approve from './approvalActionDialog.vue'
 import addDialog from './templateAdd.vue'
 const props = defineProps({
@@ -142,7 +142,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: any) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     title: '详情',
@@ -150,7 +150,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: any) => {
   dialogVisible.value = true
   // addRef.value.initDialog({
   //   title: '编辑',
@@ -158,7 +158,7 @@
   // })
 }
 // 删除
-const remove = (row) => {
+const remove = (row: any) => {
   ElMessageBox.confirm(
     `确认删除${row.equipmentName}吗？`,
     '提示',
@@ -181,20 +181,20 @@
   // })
 }
 // 同意
-const agree = (row) => {
+const agree = (row: any) => {
   console.log(approveRef.value)
   approveRef.value.initDialog({
     radio: '1',
   })
 }
 // 驳回
-const reject = (row) => {
+const reject = (row: any) => {
   approveRef.value.initDialog({
     radio: '3',
   })
 }
 // 拒绝
-const refuse = (row) => {
+const refuse = (row: any) => {
   approveRef.value.initDialog(
     {
       radio: '2',
@@ -202,7 +202,7 @@
   )
 }
 // 取消
-const cancel = (row) => {
+const cancel = (rowrow: any) => {
   ElMessageBox.confirm(
     '确认取消吗？',
     '提示',
@@ -301,20 +301,20 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+          <el-input placeholder="申请编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="设备编号" clearable class="w-50 m-2" />
+          <el-input placeholder="设备编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.modelNo" placeholder="设备名称" clearable class="w-50 m-2" />
+          <el-input placeholder="设备名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请单位" clearable class="w-50 m-2" />
+          <el-input placeholder="申请单位" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.publisher" placeholder="申请状态" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" />
+          <el-select placeholder="申请状态" clearable>
+            <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" /> -->
           </el-select>
         </search-item>
       </search-area>
@@ -328,7 +328,10 @@
           <el-button type="primary" @click="templateDownload">
             模板下载
           </el-button> -->
-          <el-button type="primary" @click="add">
+          <icon-button icon="icon-add" title="新建" @click="add" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+          <!-- <el-button type="primary" @click="add">
             新建
           </el-button>
           <el-button type="primary" @click="exportExcelBtn">
@@ -336,7 +339,7 @@
           </el-button>
           <el-button v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
         </template>
         <!-- 表格区域 -->
         <normal-table
@@ -386,22 +389,3 @@
     </app-container>
   </div>
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 154px !important;
-}
-
-.normal-date {
-  width: 154px !important;
-}
-
-.normal-select {
-  width: 154px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
-
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 0763c5a..9ef0b93 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -19,7 +19,6 @@
 const effectiveStatusName = ref('')
 const title = ref('')
 const fileList = ref<UploadUserFile[]>([])
-console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -80,10 +79,9 @@
   if (row.title === '新建') {
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
-    ruleForm.publisher = ''
+    ruleForm.publisher = userInfo.$state.deptName
     ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 判断有无存储
-    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
     if (sessionStorage.getItem(fileTypeName.value)) {
       const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
       ruleForm.fileType = session.fileType
@@ -117,6 +115,8 @@
     ruleForm.remark = row.remark
     ruleForm.publishTime = row.publishTime
     ruleForm.minioFileName = row.minioFileName
+    // ruleForm.publisher = '0'
+    // ruleForm.createUserId = '1'
   }
 }
 defineExpose({ initDialog })
@@ -148,6 +148,9 @@
       type: 'warning',
     },
       ).then((res) => {
+        if (ruleForm.publisher === userInfo.$state.deptName) {
+          ruleForm.publisher === userInfo.$state.deptId
+        }
         if (flag == '提交') {
           addApi(ruleForm).then((res) => {
             if (res.code == 200) {
@@ -193,7 +196,6 @@
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        console.log(res.data[0])
         ruleForm.minioFileName = res.data[0]
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
@@ -216,7 +218,6 @@
 // ])
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
-  console.log(diffDat)
   if (diffDat < 0) {
     // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '在使用'
@@ -237,7 +238,7 @@
 
 <template>
   <app-container v-if="dialogVisible" style="overflow: hidden;">
-    <detail-page :title="`${title}${fileTypeName}`">
+    <detail-page :title="`${fileTypeName}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
           提交
@@ -278,12 +279,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="发布单位" prop="publisher">
-              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'" class="fill-input">
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled>
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
               <com-tree-select
                 v-else
-                v-model="ruleForm.publisher" :options="PubListTree" placeholder="选择组织机构"
+                v-model="ruleForm.publisher" :options="PubListTree" placeholder="请选择发布单位"
                 :tree-props="deptProps"
               />
             </el-form-item>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 44e3e4d..b45fbc3 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -324,22 +324,9 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <!-- <el-button type="primary" @click="batchImport">
-            批量导入
-          </el-button> -->
-          <!-- <el-button type="primary" @click="templateDownload">
-            模板下载
-          </el-button> -->
-          <!-- <el-button type="primary" @click="add">
-            新建
-          </el-button> -->
-          <el-button type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-print="printObj" type="primary">
-            打印
-          </el-button>
+          <!-- <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange"> -->
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 4677e48..7d4724b 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -204,13 +204,9 @@
     loading.close()
   })
 }
-// 打印
-const print = () => {
-
-}
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
-  // 原生上传图片
+  // 原生上传
   // console.log(event.target.files)
   // if (event.target.files[0].type === 'application/pdf') {
   if (event.target.files?.length !== 0) {
@@ -264,7 +260,7 @@
         <search-item>
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
-        <search-item>
+        <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
@@ -273,13 +269,13 @@
               :value="item.value"
             />
           </el-select>
-        </search-item>
+        </search-item> -->
         <search-item>
           <el-date-picker
             v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 155px;"
+            style="width: 185px;"
           />
         </search-item>
         <search-item>
@@ -287,19 +283,19 @@
             v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 155px;"
+            style="width: 185px;"
           />
         </search-item>
         <search-item>
-          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select> -->
-          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
+          </el-select>
+          <!-- <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" /> -->
         </search-item>
       </search-area>
       <table-container>
@@ -310,7 +306,7 @@
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
-          <icon-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" @click="print" />
+          <icon-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index cf0dd4f..5ca3275 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -3,11 +3,11 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { detailType } from '../measureDept-interface'
-import { getUserList } from '@/api/system/user'
+// import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
+import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import type { userType } from '@/views/system/user/user-interface'
 import { listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
-import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
 const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -31,11 +31,20 @@
   technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
+// 获取计量人员列表
 const getuser = () => {
-  getUserList({ offset: 1, limit: 99999 }).then((res) => {
-    userList.value = res.data.rows
+  getStaffList({
+    staffNo: '', // 人员编号
+    name: '', // 姓名
+    deptId: ruleForm.value.deptId, // 所在部门
+    limit: 999999,
+    offset: 1,
+  }).then((res) => {
+    if (res.code === 200) {
+      userList.value = res.data.records
+    }
   })
-} // 获取用户列表
+}
 const technologyJobList = ref<{ id: string;name: string;value: string }[]>([])
 // 获取技术职务列表
 const getTechnologyJobList = () => {
@@ -50,7 +59,16 @@
     administrationJobList.value = response.data
   })
 }
-
+// 选择负责人自动填充职务信息
+const directorChange = (val: string) => {
+  const selectUser = userList.value.filter(item => item.name === val)[0]
+  getStaffDetail(selectUser).then((res) => {
+    if (res.code === 200) {
+      ruleForm.value.administrationJob = res.data.administrationJob
+      ruleForm.value.technologyJob = res.data.technologyJob
+    }
+  })
+}
 // 提交
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
@@ -95,12 +113,6 @@
 const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
-// const searchQuery = ref({
-//   limit: 10,
-//   offset: 1,
-//   total: 0,
-//   pageSizes: [10, 20, 30],
-// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -410,20 +422,6 @@
     }
   })
 }
-// const handleSizeChange = (val: number) => {
-//   searchQuery.value.limit = val
-//   getDepartmentList()
-//   getuserInfoList()
-//   getInstrumentInfo()
-//   getDeviceInfo()
-// }
-// const handleCurrentChange = (val: number) => {
-//   searchQuery.value.offset = val
-//   getDepartmentList()
-//   getuserInfoList()
-//   getInstrumentInfo()
-//   getDeviceInfo()
-// }
 // 弹窗初始化
 const initDialog = (row: any) => {
   reset()
@@ -460,22 +458,17 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title.split('-')[2] === '编辑'" type="primary" @click="submitForm(ruleFormRef)">
-            提交
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="title">
+      <template #btns>
+        <el-button v-if="title.split('-')[2] === '编辑'" type="primary" @click="submitForm(ruleFormRef)">
+          提交
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title.split('-')[2] === '详情' ? 'isDetail' : '']">
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item :label=" `${title.split('-')[1]}编号`" prop="organizeNo">
               <el-input v-model.trim="ruleForm.organizeNo" placeholder="系统自动生成" disabled />
@@ -487,7 +480,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="title.split('-')[1] === '工程组'" :gutter="24" class="marg">
+        <el-row v-if="title.split('-')[1] === '工程组'" :gutter="24">
           <el-col :span="6">
             <el-form-item label="科室编号">
               <el-input v-model.trim="ruleForm.pDeptId" disabled />
@@ -509,10 +502,10 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
-              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" @change="directorChange">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.name" />
               </el-select>
             </el-form-item>
@@ -532,7 +525,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="24">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
               <el-input v-model.trim="ruleForm.remark" :placeholder="title.split('-')[2] === '详情' ? '' : '备注'" :disabled="title.split('-')[2] === '详情'" />
@@ -540,85 +533,24 @@
           </el-col>
         </el-row>
       </el-form>
-      <!-- 科室信息-人员信息等列表切换 -->
-      <div>
-        <div class="header" style="margin-top: 10px;">
-          <!-- 切换 -->
-          <el-radio-group v-model="current" class="change-btn">
-            <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
-              {{ item.name }}
-            </el-radio-button>
-          </el-radio-group>
-          <div class="title">
-            {{ current }}
-          </div>
-          <span class="btns">
-          <!-- <el-button type="info" :disabled="title === '详情'" @click="removeRow">
-            删除行
-          </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
-            添加行
-          </el-button> -->
-          </span>
-        </div>
-        <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <el-table-column type="index" label="序号" width="55" align="center" />
-          <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
-        </el-table>
-        <!-- <div style="width: 100%;margin-top: 10px;">
-          <el-pagination
-            :current-page="searchQuery.offset"
-            :page-sizes="searchQuery.pageSizes"
-            :page-size="searchQuery.limit"
-            :total="searchQuery.total"
-            layout="total, sizes, prev, pager, next"
-            hide-on-single-page
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-          />
-        </div> -->
-      </div>
-    </div>
+    </detail-page>
+    <detail-block-switch :title="current">
+      <template #menu>
+        <el-radio-group v-model="current" class="change-btn">
+          <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
+            {{ item.name }}
+          </el-radio-button>
+        </el-radio-group>
+      </template>
+      <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
+        <el-table-column type="index" label="序号" width="55" align="center" />
+        <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </detail-block-switch>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-    position: relative;
-
-    .change-btn {
-      position: absolute;
-      left: 40px;
-      top: 4px;
-    }
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 4px;
-    }
-  }
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
@@ -628,8 +560,4 @@
     }
   }
 }
-
-.marg {
-  margin-top: 10px;
-}
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 9ad87af..aac1ef2 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -231,12 +231,14 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
+          <!-- <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
           <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
+          <icon-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 2e3322a..3f472eb 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -41,7 +41,7 @@
   { text: '证书号', value: 'certificateNo', align: 'center' },
   { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
   { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'validDate', align: 'center', width: '200' },
   { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
 ]) // 表格
 const certificateStatusList = ref([
@@ -90,7 +90,7 @@
   loadingTable.value = true
   getCertificateList(searchQuery).then((res) => {
     if (res.code === 200) {
-      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效' }))
+      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效', validDate: item.validDate.split(' ')[0], certificateDate: item.certificateDate.split(' ')[0] }))
       list.value = res.data.records
       total.value = Number(res.data.total)
     }
@@ -115,6 +115,7 @@
   addRef.value.initDialog({
     ...row,
     title: '详情',
+    name: props.isRemind ? '证书状况' : '证书记录',
   })
 }
 // 编辑
@@ -123,6 +124,7 @@
   addRef.value.initDialog({
     ...row,
     title: '编辑',
+    name: props.isRemind ? '证书状况' : '证书记录',
   })
 }
 
@@ -193,6 +195,7 @@
   dialogVisible.value = true
   addRef.value.initDialog({
     title: '新建',
+    name: props.isRemind ? '证书状况' : '证书记录',
   })
 }
 // 导出
@@ -292,21 +295,11 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
-            模板下载
-          </el-button>
-          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
-            打印
-          </el-button>
+          <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
@@ -325,7 +318,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column fixed="right" label="操作" align="center" width="150">
+            <el-table-column fixed="right" label="操作" align="center" width="180">
               <template #default="{ row }">
                 <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
                   提醒
@@ -336,7 +329,7 @@
                 <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 4dc1b17..4352604 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -69,7 +69,16 @@
     const IdCard = ruleForm.value.idCard
     const birthday = `${IdCard.substring(6, 10)}-${IdCard.substring(10, 12)}`
     ruleForm.value.birthday = birthday
-    console.log(ruleForm.value)
+    // 获取性别 第17位  奇数为男 偶数为女
+    // ruleForm.value.sex
+    if (Number(IdCard.substring(16, 17)) % 2) {
+      // 男
+      ruleForm.value.sex = '1'
+    }
+    else {
+      //  女
+      ruleForm.value.sex = '2'
+    }
   })
 }
 const dialogVisible = ref<boolean>(false) // 弹窗显示
@@ -130,7 +139,6 @@
     technologyExam: '', // 技术考核
     remark: '', // 备注
     certificateList: [], // 证书列表
-
   }
 }
 const technologyJobList = ref<technologyJobType[]>([])
@@ -309,7 +317,7 @@
           }
           (title.value === '新建'
             ? getStaffAdd
-            : getStaffupdate) ({ ...ruleForm.value, certificateList: changeList.value[0].data }).then((res) => {
+            : getStaffupdate) ({ ...ruleForm.value, certificateList: changeList.value[0].data, birthday: `${ruleForm.value.idCard.substring(6, 10)}-${ruleForm.value.idCard.substring(10, 12)}-${ruleForm.value.idCard.substring(12, 14)}` }).then((res) => {
             if (res.code == 200) {
               formEl?.resetFields()
               ElMessage.success('提交成功')
@@ -332,12 +340,14 @@
   emits('resetData')
   resetFormData()
 }
+const selectTreeRef = ref()
 // 弹窗初始化
 const initDialog = (row: any) => {
   changeList.value[0].data = []
   dialogVisible.value = true
   title.value = row.title
   resetFormData()
+  selectTreeRef.value?.clearSelected()
   getuser()
   getPubList()
   getSexList()
@@ -370,20 +380,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          计量人员-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
-            完成
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`计量人员-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+          完成
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
         <el-row :gutter="24" class="marg">
           <el-col :span="5">
@@ -394,6 +399,7 @@
                 :http-request="uploadQuarterlyEvaluateFile"
                 :before-upload="beforeAvatarUpload"
                 :disabled="title === '详情'"
+                accept="image/png, image/jpeg,image/jpg"
               >
                 <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
                 <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
@@ -425,8 +431,8 @@
               </el-select>
               <com-tree-select
                 v-else
-                v-model="ruleForm.deptId" :options="PubListTree" placeholder="选择组织机构"
-                :tree-props="deptProps"
+                ref="selectTreeRef" v-model="ruleForm.deptId" :options="PubListTree"
+                placeholder="选择组织机构" :tree-props="deptProps"
               />
             </el-form-item>
             <el-form-item label="计量专业" prop="major" class="marg-item">
@@ -489,29 +495,19 @@
           </el-col>
         </el-row>
       </el-form>
-      <!-- 证书基本信息 -->
-      <!-- 切换 -->
-      <!-- <el-radio-group v-model="current" style="margin-bottom: -15px;">
-          <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
-            {{ item.name }}
-          </el-radio-button>
-        </el-radio-group> -->
-      <div class="header" style="margin-top: 10px;">
-        <div class="title">
-          {{ current }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="info" @click="removeRow">
-            删除行
-          </el-button>
-          <el-button v-if="title !== '详情'" type="primary" @click="addRow">
-            添加行
-          </el-button>
-          <el-button v-if="title !== '详情'" type="primary" @click="editRow">
-            编辑行
-          </el-button>
-        </span>
-      </div>
+    </detail-page>
+    <detail-block :title="current">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="info" @click="removeRow">
+          删除行
+        </el-button>
+        <el-button v-if="title !== '详情'" type="primary" @click="addRow">
+          添加行
+        </el-button>
+        <el-button v-if="title !== '详情'" type="primary" @click="editRow">
+          编辑行
+        </el-button>
+      </template>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
         <el-table-column width="55" align="center">
           <template #default="scope">
@@ -523,7 +519,7 @@
         <el-table-column type="index" label="序号" width="55" />
         <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
       </el-table>
-    </div>
+    </detail-block>
     <!-- 添加证书信息组件 -->
     <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
     <!-- 选择用户列表组件 -->
@@ -532,77 +528,38 @@
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    background-color: #fff;
-    border-radius: 8px;
-    padding-top: 10px;
-    margin-top: 10px;
-    padding-right: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    display: flex;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    position: relative;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 5px;
-    }
-  }
-
-  :deep(.el-radio__label) {
-    display: none;
-  }
-
-  :deep(.el-icon.avatar-uploader-icon) {
-    font-size: 28px;
-    color: #8c939d;
-    width: 190px;
-    height: 250px;
-    text-align: center;
-  }
-
-  :deep(.avatar-uploader .avatar) {
-    width: 190px;
-    height: 250px;
-    display: block;
-  }
-
-  .isDetail {
-    ::v-deep {
-      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-        display: none;
-      }
-    }
-  }
+:deep(.el-radio__label) {
+  display: none;
 }
 
-.marg {
-  margin-top: 20px;
+:deep(.el-icon.avatar-uploader-icon) {
+  font-size: 28px;
+  color: #8c939d;
+  width: 190px;
+  height: 250px;
+  text-align: center;
 }
 
-.marg-item {
-  margin-top: 20px;
+:deep(.avatar-uploader .avatar) {
+  width: 190px;
+  height: 250px;
+  display: block;
+}
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
 }
 </style>
 
 <style scoped>
 .avatar-uploader .avatar {
-  width: 220px;
-  height: 320px;
+  width: 190px;
+  height: 250px;
   display: block;
 }
 </style>
@@ -624,8 +581,8 @@
 .el-icon.avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
-  width: 220px;
-  height: 320px;
+  width: 190px;
+  height: 250px;
   text-align: center;
 }
 </style>
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index ae48f11..042636e 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -4,7 +4,6 @@
 import dayjs from 'dayjs'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import type { technologyJobType } from '../person-interface'
-import certificateAddDialog from './certificateAddDialog.vue'
 import personListDialog from './personListDialog.vue'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
@@ -14,7 +13,8 @@
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
-const ruleFormRef = ref<FormInstance>() // from组件
+const ruleFormRef1 = ref<FormInstance>() // from组件
+const ruleFormRef2 = ref<FormInstance>() // from组件
 const meterStaff = ref({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -28,26 +28,43 @@
   workDate: '', // 从事日期
   id: '',
 })
+const baseInfo = ref({
+  certificateCompany: '',
+  certificateDate: '',
+  certificateName: '',
+  certificateNo: '',
+  validDate: '',
+  id: '',
+  isDel: 0,
+  minioFileName: '',
+  remark: '',
+})
 const ruleForm = ref({
   meterStaff: {}, // 人员信息
   staffId: '', // 计量人员id
 }) // 表单
-const multipleTableRef = ref<InstanceType<typeof ElTable>>()
 const title = ref('')
+const name = ref('')
 // 身份证号码验证规则
-const validateIDcard = (rule: any, value: any, callback: any) => {
-  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
-  if (rr.test(value)) {
-    callback()
-  }
-  else {
-    callback(new Error('验证失败'))
-  }
-}
+// const validateIDcard = (rule: any, value: any, callback: any) => {
+//   const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+//   if (rr.test(value)) {
+//     callback()
+//   }
+//   else {
+//     callback(new Error('验证失败'))
+//   }
+// }
 const rules = ref({
   staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
   // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
-
+}) // 表单验证规则
+const rules2 = ref({
+  certificateCompany: [{ required: true, message: '发证单位不能为空', trigger: 'blur' }],
+  certificateDate: [{ required: true, message: '发证日期不能为空', trigger: 'blur' }],
+  certificateName: [{ required: true, message: '证书名称不能为空', trigger: 'blur' }],
+  certificateNo: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
+  validDate: [{ required: true, message: '有效日期不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
 const userList = ref<userType[]>([]) // 可使用人列表
@@ -96,6 +113,17 @@
   meterStaff.value.major = ''
   meterStaff.value.workDate = ''
   meterStaff.value.id = ''
+  baseInfo.value = {
+    certificateCompany: '',
+    certificateDate: '',
+    certificateName: '',
+    certificateNo: '',
+    validDate: '',
+    id: '',
+    isDel: 0,
+    minioFileName: '',
+    remark: '',
+  }
 }
 const technologyJobList = ref<technologyJobType[]>([])
 // 获取技术职务列表
@@ -120,98 +148,14 @@
 const confirmPerson = (row: any) => {
   ruleForm.value.staffId = row.staffNo
   meterStaff.value = row
-  ruleFormRef.value?.clearValidate('staffNo')
+  ruleFormRef1.value?.clearValidate('staffNo')
 }
-const changeList = ref([
-  {
-    name: '证书基本信息',
-    data: [] as any[],
-    column: [
-      {
-        label: '证书号',
-        data: 'certificateNo',
-        id: 'zs02',
-      },
-      {
-        label: '证书名称',
-        data: 'certificateName',
-        id: 'zs03',
-      },
-      {
-        label: '发证日期',
-        data: 'certificateDate',
-        id: 'zs04',
-      },
-      {
-        label: '发证单位',
-        data: 'certificateCompany',
-        id: 'zs01',
-      },
-      {
-        label: '有效日期',
-        data: 'validDate',
-        id: 'zs05',
-      },
-    ],
-  },
-  {
-    name: '计量工作培训记录',
-    data: [],
-    column: [],
-  },
-  {
-    name: '业务记录',
-    data: [],
-    column: [],
-  },
-])
-const current = ref('证书基本信息')
-const currentShow = computed(() => {
-  return changeList.value.filter(item => item.name === current.value)[0]
-})
-const certificateRef = ref() // 添加证书信息弹窗
-// 添加行
-const addRow = () => {
-  certificateRef.value.initDialog({ title: '添加' })
-}
-// 编辑行
-const editRow = () => {
-  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
-}
-// 证书信息行内添加数据
-const addRowcertificate = (row: any, flag: string) => {
-  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
-  if (flag === 'update') {
-    changeList.value[0].data = [{
-      ...changeList.value[0].data[0],
-      ...row,
-      certificateStatus: diff < 0 ? '1' : '0',
-      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-    }]
-  }
-  else {
-    changeList.value[0].data.push(
-      {
-        ...row,
-        certificateStatus: diff < 0 ? '1' : '0',
-        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-        id: null,
-        isDel: 0,
-        minioFileName: '',
-        remark: '',
-        staffId: meterStaff.value.id,
-        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-      })
-  }
-}
-const currenSelect = ref<number>(-1) // 当前选中行
-// 删除行
-const removeRow = () => {
-  console.log(currenSelect.value)
-  if (currenSelect.value >= 0) {
+// 提交
+const submitForm = async (formEl1: FormInstance | undefined, formEl2: FormInstance | undefined) => {
+  if (!formEl1 || !formEl2) { return }
+  Promise.all([formEl1.validate(), formEl2.validate()]).then((res) => {
     ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
+      '确认提交吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -219,78 +163,49 @@
         type: 'warning',
       },
     ).then(() => {
-      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
-      currenSelect.value = -1
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 提交
-const submitForm = async (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  await formEl.validate((valid, fields) => {
-    if (valid) {
-      ElMessageBox.confirm(
-        '确认提交吗？',
-        '提示',
-        {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        },
-      ).then(() => {
-        let params
-        if (changeList.value[0].data.length) {
-          params = changeList.value[0].data
-        }
-        else {
-          params = [
-            {
-              certificateCompany: '',
-              certificateDate: '',
-              certificateName: '',
-              certificateNo: '',
-              certificateStatus: '',
-              createTime: '',
-              id: null,
-              isDel: 0,
-              minioFileName: '',
-              remark: '',
-              staffId: meterStaff.value.id,
-              updateTime: '',
-              validDate: '',
-            },
-          ]
-        }
-        (title.value === '新建'
-          ? addCertificateList
-          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
-          formEl?.resetFields()
-          ElMessage.success('提交成功')
-          emits('resetData')
-          resetFormData()
-        })
+      (title.value === '新建'
+        ? addCertificateList
+        : getCertificateUpdate)(title.value === '新建'
+        ? [{
+            ...baseInfo.value,
+            staffId: meterStaff.value.id,
+            createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+            updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+            certificateStatus: dayjs(baseInfo.value.validDate).diff(baseInfo.value.certificateDate, 'day') < 0 ? '1' : '0',
+            meterStaff: undefined,
+          }]
+        : {
+            ...baseInfo.value,
+            staffId: meterStaff.value.id,
+            createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+            updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+            certificateStatus: dayjs(baseInfo.value.validDate).diff(baseInfo.value.certificateDate, 'day') < 0 ? '1' : '0',
+            meterStaff: undefined,
+          }).then((res) => {
+        formEl1?.resetFields()
+        formEl2?.resetFields()
+        ElMessage.success('提交成功')
+        emits('resetData')
+        resetFormData()
       })
-    }
+    })
   })
 }
 // 取消
-const resetForm = (formEl: FormInstance | undefined) => {
+const resetForm = (formEl: FormInstance | undefined, formEl2: FormInstance | undefined) => {
   formEl?.resetFields()
-  changeList.value[0].data = []
+  formEl2?.resetFields()
   emits('resetData')
   resetFormData()
 }
+const selectTreeRef = ref()
 // 弹窗初始化
 const initDialog = (row: any) => {
-  changeList.value[0].data = []
   resetFormData()
   dialogVisible.value = true
   title.value = row.title
-  resetFormData()
+  name.value = row.name
+  selectTreeRef.value?.clearSelected()
   getuser()
   getPubList()
   getSexList()
@@ -303,8 +218,9 @@
   else {
     getCertificateDetail({ id: row.id }).then((res) => {
       if (res.code === 200) {
+        console.log(res, '证书记录')
         meterStaff.value = res.data.meterStaff
-        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+        baseInfo.value = res.data
       }
     })
   }
@@ -314,21 +230,16 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          证书记录-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
-            完成
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
-      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+    <detail-page :title=" `${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
+          完成
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef1, ruleFormRef2)">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef1" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="人员编号" prop="staffNo">
@@ -390,7 +301,8 @@
               </el-select>
               <com-tree-select
                 v-else
-                v-model="meterStaff.deptId" :options="PubListTree" placeholder="选择组织机构"
+                ref="selectTreeRef" v-model="meterStaff.deptId" :options="PubListTree"
+                placeholder="选择组织机构"
                 :tree-props="deptProps"
               />
             </el-form-item>
@@ -410,71 +322,52 @@
           </el-col>
         </el-row>
       </el-form>
-      <div class="header" style="margin-top: 10px;">
-        <div class="title">
-          {{ current }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title === '新建'" type="info" @click="removeRow">
-            删除行
-          </el-button>
-          <el-button v-if="title === '新建'" type="primary" @click="addRow">
-            添加行
-          </el-button>
-          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
-            编辑行
-          </el-button>
-        </span>
-      </div>
-      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
-        <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column>
-        <el-table-column type="index" label="序号" width="55" />
-        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
-      </el-table>
-    </div>
-    <!-- 添加证书信息组件 -->
-    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    </detail-page>
+    <detail-block title="证书基本信息">
+      <el-form ref="ruleFormRef2" :model="baseInfo" :rules="rules2" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="证书号" prop="certificateNo">
+              <el-input v-model.trim="baseInfo.certificateNo" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书名称" prop="certificateName">
+              <el-input v-model.trim="baseInfo.certificateName" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证单位" prop="certificateCompany">
+              <el-input v-model.trim="baseInfo.certificateCompany" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发证日期" prop="certificateDate">
+              <el-date-picker
+                v-model="baseInfo.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择发证日期"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书有效日期" prop="validDate">
+              <el-date-picker
+                v-model="baseInfo.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择有效日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block>
     <!-- 选择用户列表组件 -->
     <person-list-dialog ref="personListRef" @add="confirmPerson" />
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    background-color: #fff;
-    border-radius: 8px;
-    padding-top: 10px;
-    margin-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    display: flex;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    position: relative;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 5px;
-    }
-  }
-
   :deep(.el-radio__label) {
     display: none;
   }
@@ -487,40 +380,5 @@
       }
     }
   }
-}
-
-.marg {
-  margin-top: 20px;
-}
 </style>
 
-<style scoped>
-.avatar-uploader .avatar {
-  width: 178px;
-  height: 178px;
-  display: block;
-}
-</style>
-
-<style>
-.avatar-uploader .el-upload {
-  border: 1px dashed var(--el-border-color);
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-  transition: var(--el-transition-duration-fast);
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: var(--el-color-primary);
-}
-
-.el-icon.avatar-uploader-icon {
-  font-size: 28px;
-  color: #8c939d;
-  width: 178px;
-  height: 178px;
-  text-align: center;
-}
-</style>
diff --git a/src/views/measure/person/components/addRecordCancel.vue b/src/views/measure/person/components/addRecordCancel.vue
new file mode 100644
index 0000000..c32ac43
--- /dev/null
+++ b/src/views/measure/person/components/addRecordCancel.vue
@@ -0,0 +1,459 @@
+<!-- 计量人员新增  证书基本信息table表格   作废 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import type { technologyJobType } from '../person-interface'
+import certificateAddDialog from './certificateAddDialog.vue'
+import personListDialog from './personListDialog.vue'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import type { TreeStructure, userType } from '@/views/system/user/user-interface'
+import { getDictByCode } from '@/api/system/dict'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const meterStaff = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  idCard: '', // 身份证号
+  sex: '', // 性别
+  education: '', // 文化程度
+  technologyJob: '', // 技术职务
+  administrationJob: '', // 行政职务
+  deptId: '', // 工作部门
+  major: '', // 专业
+  workDate: '', // 从事日期
+  id: '',
+})
+const ruleForm = ref({
+  meterStaff: {}, // 人员信息
+  staffId: '', // 计量人员id
+}) // 表单
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const title = ref('')
+const name = ref('')
+// 身份证号码验证规则
+const validateIDcard = (rule: any, value: any, callback: any) => {
+  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+  if (rr.test(value)) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+const rules = ref({
+  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
+
+}) // 表单验证规则
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref<TreeStructure[]>([])
+const PubListTree = ref([])
+// 获取组织列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
+  })
+}
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sex').then((response) => {
+    sexList.value = response.data
+  })
+}
+const educationList = ref<technologyJobType[]>([])
+// 获取文化程度列表
+const geteducationList = () => {
+  getDictByCode('education').then((response) => {
+    educationList.value = response.data
+  })
+}
+// 重置表单内容
+const resetFormData = () => {
+  meterStaff.value.staffNo = ''
+  meterStaff.value.name = ''
+  meterStaff.value.idCard = ''
+  meterStaff.value.sex = ''
+  meterStaff.value.education = ''
+  meterStaff.value.technologyJob = ''
+  meterStaff.value.administrationJob = ''
+  meterStaff.value.deptId = ''
+  meterStaff.value.major = ''
+  meterStaff.value.workDate = ''
+  meterStaff.value.id = ''
+}
+const technologyJobList = ref<technologyJobType[]>([])
+// 获取技术职务列表
+const getTechnologyJobList = () => {
+  getDictByCode('technologyJob').then((response) => {
+    technologyJobList.value = response.data
+  })
+}
+const administrationJobList = ref<technologyJobType[]>([])
+// 获取行政职务列表
+const getAdministrationJob = () => {
+  getDictByCode('administrationJob').then((response) => {
+    administrationJobList.value = response.data
+  })
+}
+const personListRef = ref()
+// 选择人员
+const selectPerson = () => {
+  personListRef.value.initDialog()
+}
+// 保存选择人员信息
+const confirmPerson = (row: any) => {
+  ruleForm.value.staffId = row.staffNo
+  meterStaff.value = row
+  ruleFormRef.value?.clearValidate('staffNo')
+}
+const changeList = ref([
+  {
+    name: '证书基本信息',
+    data: [] as any[],
+    column: [
+      {
+        label: '证书号',
+        data: 'certificateNo',
+        id: 'zs02',
+      },
+      {
+        label: '证书名称',
+        data: 'certificateName',
+        id: 'zs03',
+      },
+      {
+        label: '发证日期',
+        data: 'certificateDate',
+        id: 'zs04',
+      },
+      {
+        label: '发证单位',
+        data: 'certificateCompany',
+        id: 'zs01',
+      },
+      {
+        label: '有效日期',
+        data: 'validDate',
+        id: 'zs05',
+      },
+    ],
+  },
+  {
+    name: '计量工作培训记录',
+    data: [],
+    column: [],
+  },
+  {
+    name: '业务记录',
+    data: [],
+    column: [],
+  },
+])
+const current = ref('证书基本信息')
+const currentShow = computed(() => {
+  return changeList.value.filter(item => item.name === current.value)[0]
+})
+const certificateRef = ref() // 添加证书信息弹窗
+// 添加行
+const addRow = () => {
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
+}
+// 证书信息行内添加数据
+const addRowcertificate = (row: any, flag: string) => {
+  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
+  if (flag === 'update') {
+    changeList.value[0].data = [{
+      ...changeList.value[0].data[0],
+      ...row,
+      certificateStatus: diff < 0 ? '1' : '0',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    }]
+  }
+  else {
+    changeList.value[0].data.push(
+      {
+        ...row,
+        certificateStatus: diff < 0 ? '1' : '0',
+        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        id: null,
+        isDel: 0,
+        minioFileName: '',
+        remark: '',
+        staffId: meterStaff.value.id,
+        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
+  }
+}
+const currenSelect = ref<number>(-1) // 当前选中行
+// 删除行
+const removeRow = () => {
+  console.log(currenSelect.value)
+  if (currenSelect.value >= 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
+      currenSelect.value = -1
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        let params
+        if (changeList.value[0].data.length) {
+          params = changeList.value[0].data
+        }
+        else {
+          params = [
+            {
+              certificateCompany: '',
+              certificateDate: '',
+              certificateName: '',
+              certificateNo: '',
+              certificateStatus: '',
+              createTime: '',
+              id: null,
+              isDel: 0,
+              minioFileName: '',
+              remark: '',
+              staffId: meterStaff.value.id,
+              updateTime: '',
+              validDate: '',
+            },
+          ]
+        }
+        (title.value === '新建'
+          ? addCertificateList
+          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
+          formEl?.resetFields()
+          ElMessage.success('提交成功')
+          emits('resetData')
+          resetFormData()
+        })
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  changeList.value[0].data = []
+  emits('resetData')
+  resetFormData()
+}
+const selectTreeRef = ref()
+// 弹窗初始化
+const initDialog = (row: any) => {
+  changeList.value[0].data = []
+  resetFormData()
+  dialogVisible.value = true
+  title.value = row.title
+  name.value = row.name
+  selectTreeRef.value.clearSelected()
+  resetFormData()
+  getuser()
+  getPubList()
+  getSexList()
+  geteducationList()
+  getTechnologyJobList()
+  getAdministrationJob()
+  if (row.title === '新建') {
+    console.log()
+  }
+  else {
+    getCertificateDetail({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        meterStaff.value = res.data.meterStaff
+        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+      }
+    })
+  }
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <detail-page :title=" `${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+          完成
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="人员编号" prop="staffNo">
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="selectPerson">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="meterStaff.name">
+              <el-input v-model.trim="meterStaff.name" placeholder="姓名" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="性别" prop="meterStaff.sex">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="文化程度" prop="meterStaff.education">
+              <el-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="技术职务" prop="meterStaff.technologyJob">
+              <el-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="行政职务" prop="meterStaff.administrationJob">
+              <el-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="工作部门" prop="deptId">
+              <el-select v-if="title === '详情'" v-model="meterStaff.deptId" disabled>
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+              <com-tree-select
+                v-else
+                ref="selectTreeRef" v-model="meterStaff.deptId" :options="PubListTree"
+                placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业" prop="major">
+              <el-input v-model.trim="meterStaff.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="从事日期" prop="workDate">
+              <el-date-picker
+                v-model="meterStaff.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择从事日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block :title="current">
+      <template #btns>
+        <el-button v-if="title === '新建'" type="info" @click="removeRow">
+          删除行
+        </el-button>
+        <el-button v-if="title === '新建'" type="primary" @click="addRow">
+          添加行
+        </el-button>
+        <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+          编辑行
+        </el-button>
+      </template>
+      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
+        <el-table-column width="55" align="center">
+          <template #default="scope">
+            <el-radio-group v-model="currenSelect" class="ml-4">
+              <el-radio :label="scope.$index" />
+            </el-radio-group>
+          </template>
+        </el-table-column>
+        <el-table-column type="index" label="序号" width="55" />
+        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </detail-block>
+    <!-- 添加证书信息组件 -->
+    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    <!-- 选择用户列表组件 -->
+    <person-list-dialog ref="personListRef" @add="confirmPerson" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        display: none;
+      }
+    }
+  }
+</style>
+
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 332c73c..178fc12 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -32,6 +32,7 @@
   form.validDate = ''
 }
 const initDialog = (row: any) => {
+  resetData()
   title.value = row.title
   if (row.title === '编辑') {
     form.certificateNo = row.certificateNo
@@ -50,10 +51,12 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       if (title.value === '编辑') {
-        emits('add', form, 'update')
+        const deptRow = JSON.parse(JSON.stringify(form))
+        emits('add', deptRow, 'update')
       }
       else {
-        emits('add', form, '')
+        const deptRow = JSON.parse(JSON.stringify(form))
+        emits('add', deptRow, '')
       }
       dialogFormVisible.value = false
     }
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 592d810..9c6f65d 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -30,7 +30,7 @@
   { text: '技术职务', value: 'technologyJob', align: 'center', width: '140' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '100' },
   { text: '计量专业', value: 'major', align: 'center', width: '100' },
-  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '180' },
   { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '技术考核', value: 'technologyExam', align: 'center', width: '85' },
 ]) // 表格
@@ -63,7 +63,7 @@
   loadingTable.value = true
   getStaffList(searchQuery).then((res) => {
     if (res.code === 200) {
-      res.data.records = res.data.records.map((item: StaffType) => ({ ...item, sex: item.sex == '1' ? '男' : '女', technologyExam: item.technologyExam == '0' ? '已考核' : '未考核' }))
+      res.data.records = res.data.records.map((item: StaffType) => ({ ...item, sex: item.sex == '1' ? '男' : '女', technologyExam: item.technologyExam == '0' ? '已考核' : '未考核', certificateDate: item.certificateDate.split(' ')[0] }))
       list.value = res.data.records
       total.value = Number(res.data.total)
     }
@@ -236,21 +236,11 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="proxy.hasPerm(`/measure/person/list/import`)" type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" type="primary" @click="templateDownload">
-            模板下载
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/list/add`)" type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/list/export`)" type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" type="primary" @click="print">
-            打印
-          </el-button>
+          <icon-button v-if="proxy.hasPerm(`/measure/person/list/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/list/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/list/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index 17b92d3..e44001a 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -295,15 +295,17 @@
         </el-button>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
-      <el-form-item>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer footer">
         <el-button type="primary" @click="submitForm(ruleFormRef)">
           发布
         </el-button>
         <el-button @click="resetForm(ruleFormRef)">
           关闭
         </el-button>
-      </el-form-item>
-    </el-form>
+      </div>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index 3d5c2e3..0926957 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -172,15 +172,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <el-button v-if="proxy.hasPerm('/sys/notice/list/add')" type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/sys/notice/list/export')" type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/sys/notice/list/print')" v-print="printObj" type="primary">
-          打印
-        </el-button>
+        <icon-button v-if="proxy.hasPerm('/sys/notice/list/add')" icon="icon-add" title="新建" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/sys/notice/list/export')" icon="icon-export" title="导出" @click="exportExcelBtn" />
+        <icon-button v-if="proxy.hasPerm('/sys/notice/list/print')" v-print="printObj" icon="icon-print" title="打印" />
       </template>
       <!-- 表格区域 -->
       <normal-table
diff --git a/src/views/system/notice/noticeDetail.vue b/src/views/system/notice/noticeDetail.vue
index 441ef0f..94468d4 100644
--- a/src/views/system/notice/noticeDetail.vue
+++ b/src/views/system/notice/noticeDetail.vue
@@ -97,15 +97,14 @@
         </el-link>
         <span v-else>暂无附件</span>
       </el-form-item>
-      <el-form-item>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer footer">
         <el-button type="primary" @click="submitForm()">
           确认
         </el-button>
-        <!-- <el-button @click="resetForm(ruleFormRef)">
-          关闭
-        </el-button> -->
-      </el-form-item>
-    </el-form>
+      </div>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/src/views/system/tool/autograph/addDDialog.vue b/src/views/system/tool/autograph/addDDialog.vue
index d34e8ef..e39b706 100644
--- a/src/views/system/tool/autograph/addDDialog.vue
+++ b/src/views/system/tool/autograph/addDDialog.vue
@@ -200,15 +200,17 @@
         </el-button>
         <input v-show="title === '123'" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
-      <el-form-item>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer footer">
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
           发布
         </el-button>
         <el-button @click="resetForm(ruleFormRef)">
           关闭
         </el-button>
-      </el-form-item>
-    </el-form>
+      </div>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/src/views/system/tool/autograph/autograph.vue b/src/views/system/tool/autograph/autograph.vue
index 8fffe07..ac9f000 100644
--- a/src/views/system/tool/autograph/autograph.vue
+++ b/src/views/system/tool/autograph/autograph.vue
@@ -191,15 +191,9 @@
     <table-container>
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/add')" type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/export')" type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/print')" v-print="printObj" type="primary">
-          打印
-        </el-button>
+        <icon-button v-if="proxy.hasPerm('/sys/tool/autograph/add')" icon="icon-add" title="新建" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/sys/tool/autograph/export')" icon="icon-export" title="导出" @click="exportExcelBtn" />
+        <icon-button v-if="proxy.hasPerm('/sys/tool/autograph/print')" v-print="printObj" icon="icon-print" title="打印" />
       </template>
       <!-- 表格区域 -->
       <normal-table
diff --git a/src/views/system/tool/certificate/addDDialog.vue b/src/views/system/tool/certificate/addDDialog.vue
index 330f2de..2721bf8 100644
--- a/src/views/system/tool/certificate/addDDialog.vue
+++ b/src/views/system/tool/certificate/addDDialog.vue
@@ -199,15 +199,17 @@
         </el-button>
         <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
       </el-form-item>
-      <el-form-item>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer footer">
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
           发布
         </el-button>
         <el-button @click="resetForm(ruleFormRef)">
           关闭
         </el-button>
-      </el-form-item>
-    </el-form>
+      </div>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/src/views/system/tool/certificate/certificate.vue b/src/views/system/tool/certificate/certificate.vue
index 5ac1900..9787116 100644
--- a/src/views/system/tool/certificate/certificate.vue
+++ b/src/views/system/tool/certificate/certificate.vue
@@ -192,15 +192,9 @@
     <table-container>
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button v-if="proxy.hasPerm('/sys/tool/certificate/add')" type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/sys/tool/certificate/export')" type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/sys/tool/certificate/print')" v-print="printObj" type="primary">
-          打印
-        </el-button>
+        <icon-button v-if="proxy.hasPerm('/sys/tool/certificate/add')" icon="icon-add" title="新建" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/sys/tool/certificate/export')" icon="icon-export" title="导出" @click="exportExcelBtn" />
+        <icon-button v-if="proxy.hasPerm('/sys/tool/certificate/print')" v-print="printObj" icon="icon-print" title="打印" />
       </template>
       <!-- 表格区域 -->
       <normal-table
diff --git a/src/views/system/tool/document/addDDialog.vue b/src/views/system/tool/document/addDDialog.vue
index 33ffdaa..c440d1d 100644
--- a/src/views/system/tool/document/addDDialog.vue
+++ b/src/views/system/tool/document/addDDialog.vue
@@ -200,15 +200,17 @@
         </el-button>
         <input v-show="title === ''" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
-      <el-form-item>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer footer">
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
           发布
         </el-button>
         <el-button @click="resetForm(ruleFormRef)">
           关闭
         </el-button>
-      </el-form-item>
-    </el-form>
+      </div>
+    </template>
   </el-dialog>
 </template>
 

diff --git a/src/components.d.ts b/src/components.d.ts
index 6e85584..815d62f 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -16,14 +16,13 @@
     BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default']
     BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
-    Benchcol: typeof import('./components/benchcol/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/DetailPage/index copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
+    DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
diff --git a/src/components/DetailPage/DetailBlockSwitch.vue b/src/components/DetailPage/DetailBlockSwitch.vue
new file mode 100644
index 0000000..4d92074
--- /dev/null
+++ b/src/components/DetailPage/DetailBlockSwitch.vue
@@ -0,0 +1,71 @@
+<script lang="ts" setup name="DetailBlock">
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+})
+
+const slots = useSlots()
+</script>
+
+<template>
+  <div class="detail-main">
+    <div class="header">
+      <div class="menu">
+        <slot name="menu" />
+      </div>
+      <div class="title">
+        {{ title }}
+      </div>
+      <div class="btns">
+        <slot name="btns" />
+      </div>
+    </div>
+    <div v-if="slots.default" class="content">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-main {
+  background-color: #fff;
+  border-radius: 8px;
+  margin-top: 10px;
+  padding-top: 10px;
+
+  .header {
+    position: relative;
+    height: 40px;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+
+    .title {
+      font-weight: 500;
+    }
+
+    .btns {
+      position: absolute;
+      right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+
+    .menu {
+      position: absolute;
+      left: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+
+  .content {
+    background-color: #fff;
+    padding: 0 10px 20px;
+    margin-top: 10px;
+  }
+}
+</style>
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d6c1c91..1644a80 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -314,6 +314,39 @@
       },
     ],
   },
+  {
+    path: '/borrow',
+    component: Layout,
+    redirect: '/device/borrow/borrowapply',
+    name: 'Borrow',
+    meta: {
+      title: '设备领用',
+      icon: 'ep:key',
+      auth: '/device/borrow',
+    },
+    children: [
+      {
+        path: 'borrowapply',
+        name: 'borroWapply',
+        component: () => import('@/views/device/borrow/borrwoApply.vue'),
+        meta: {
+          title: '设备借用申请',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowapply',
+        },
+      },
+      {
+        path: 'borrowhandle',
+        name: 'borrowHandle',
+        component: () => import('@/views/device/borrow/borrowHandle.vue'),
+        meta: {
+          title: '设备借用处理',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowhandle',
+        },
+      },
+    ],
+  },
 
 ]
 
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
new file mode 100644
index 0000000..1c2405e
--- /dev/null
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="borrowHandle">
+// 逻辑代码
+</script>
+
+<template>
+  <app-container>
+    设备借用处理
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
new file mode 100644
index 0000000..03d414b
--- /dev/null
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="borrowApply">
+// 逻辑代码
+</script>
+
+<template>
+  <app-container>
+    设备借用申请
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index c2682fc..5f7b347 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -339,381 +339,374 @@
 
 <template>
   <div class="body-container">
-    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资产编号" prop="assetNo">
-            <el-input v-model.trim="ruleForm.assetNo" placeholder="系统自动生成" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="资产类型" prop="assetType">
-            <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备编号" prop="equipmentNo">
-            <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备名称" prop="equipmentName">
-            <el-input v-model.trim="ruleForm.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="生产厂家" prop="manufacturer">
-            <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="厂家国别" prop="manufacturerCountry">
-            <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="出厂编号" prop="manufacturingNo">
-            <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="出厂年月" prop="manufacturingDate">
-            <el-date-picker
-              v-model="ruleForm.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '出厂年月'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="型号" prop="modelNo">
-            <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="管理状态" prop="managerState">
-            <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="ABC" prop="abc">
-            <el-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'">
-              <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="标签绑定" prop="labelBind">
-            <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === '详情' ? '' : '标签'" :disabled="title === '详情'" clearable>
-              <template #append>
-                <el-button type="primary" size="small">
-                  扫描
-                </el-button>
-              </template>
-            </el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="立卡年月" prop="cardEstablishmentDate">
-            <el-date-picker
-              v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '立卡年月'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="启用日期" prop="enableDate">
-            <el-date-picker
-              v-model="ruleForm.enableDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '启用日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定方式" prop="mesureType">
-            <el-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'">
-              <el-option v-for="item in mesureTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定周期" prop="mesureCycle">
-            <el-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="12">
-          <el-form-item label="测量范围" prop="mesureRange">
-            <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === '详情' ? '' : '测量范围'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="不确定度" prop="uncertainty">
-            <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === '详情' ? '' : '不确定度'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="使用部门" prop="useDept">
-            <com-tree-select
-              v-if="title !== '详情'"
-              v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-              :tree-props="deptProps"
-            />
-            <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
-              <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="使用人" prop="usePerson">
-            <el-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'">
-              <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="专业分类" prop="majorCategory">
-            <el-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'">
-              <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="检定部门" prop="mesureDept">
-            <com-tree-select
-              v-if="title !== '详情'"
-              v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-              :tree-props="deptProps"
-            />
-            <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
-              <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定日期" prop="mesureDate">
-            <el-date-picker
-              v-model="ruleForm.mesureDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '检定日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="有效日期" prop="validDate">
-            <el-date-picker
-              v-model="ruleForm.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '有效日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定结果" prop="mesureResult">
-            <el-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'">
-              <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="8">
-          <el-form-item label="是否是技术指标需要校准/检定的设备" prop="isCalibrationTestEquipment" label-width="260px">
-            <el-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否是测量工装台账" prop="isMeasureAccount" label-width="260px">
-            <el-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否标准配套设备" prop="isStandardSupportEquipment" label-width="260px">
-            <el-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
+    <detail-block-switch title="基本信息">
+      <template #menu>
+        <slot name="menuswitch" />
+      </template>
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资产编号" prop="assetNo">
+              <el-input v-model.trim="ruleForm.assetNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="资产类型" prop="assetType">
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备编号" prop="equipmentNo">
+              <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="生产厂家" prop="manufacturer">
+              <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="厂家国别" prop="manufacturerCountry">
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号" prop="manufacturingNo">
+              <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂年月" prop="manufacturingDate">
+              <el-date-picker
+                v-model="ruleForm.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '出厂年月'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="型号" prop="modelNo">
+              <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="管理状态" prop="managerState">
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="ABC" prop="abc">
+              <el-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'">
+                <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标签绑定" prop="labelBind">
+              <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === '详情' ? '' : '标签'" :disabled="title === '详情'" clearable>
+                <template #append>
+                  <el-button type="primary" size="small">
+                    扫描
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="立卡年月" prop="cardEstablishmentDate">
+              <el-date-picker
+                v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '立卡年月'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="启用日期" prop="enableDate">
+              <el-date-picker
+                v-model="ruleForm.enableDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '启用日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定方式" prop="mesureType">
+              <el-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'">
+                <el-option v-for="item in mesureTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定周期" prop="mesureCycle">
+              <el-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="测量范围" prop="mesureRange">
+              <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === '详情' ? '' : '测量范围'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="不确定度" prop="uncertainty">
+              <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === '详情' ? '' : '不确定度'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="使用部门" prop="useDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
+                :tree-props="deptProps"
+              />
+              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="使用人" prop="usePerson">
+              <el-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'">
+                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="专业分类" prop="majorCategory">
+              <el-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'">
+                <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="检定部门" prop="mesureDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                :tree-props="deptProps"
+              />
+              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定日期" prop="mesureDate">
+              <el-date-picker
+                v-model="ruleForm.mesureDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '检定日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="有效日期" prop="validDate">
+              <el-date-picker
+                v-model="ruleForm.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '有效日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定结果" prop="mesureResult">
+              <el-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'">
+                <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="8">
+            <el-form-item label="是否是技术指标需要校准/检定的设备" prop="isCalibrationTestEquipment" label-width="260px">
+              <el-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否是测量工装台账" prop="isMeasureAccount" label-width="260px">
+              <el-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否标准配套设备" prop="isStandardSupportEquipment" label-width="260px">
+              <el-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资产来源" prop="assetSource">
-            <el-input v-model.trim="ruleForm.assetSource" :placeholder="title === '详情' ? '' : '资产来源'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备规格" prop="equipmentSpecifications">
-            <el-input v-model.trim="ruleForm.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备类别" prop="equipmentCategory">
-            <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
-              <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备类型" prop="equipmentType">
-            <el-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'">
-              <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资本来源" prop="capitalSource">
-            <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
-              <el-option v-for="item in capitalSourceList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="管理级别" prop="managerLevel">
-            <el-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'">
-              <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="用途" prop="purpose">
-            <el-input v-model.trim="ruleForm.purpose" :placeholder="title === '详情' ? '' : '用途'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="技术水平" prop="technicalLevel">
-            <el-input v-model.trim="ruleForm.technicalLevel" :placeholder="title === '详情' ? '' : '技术水平'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="完好状态" prop="intactState">
-            <el-input v-model.trim="ruleForm.intactState" :placeholder="title === '详情' ? '' : '完好状态'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="外形尺寸" prop="overallDimension">
-            <el-input v-model.trim="ruleForm.overallDimension" :placeholder="title === '详情' ? '' : '外形尺寸'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="重量(吨)" prop="weight">
-            <el-input v-model.trim="ruleForm.weight" :placeholder="title === '详情' ? '' : '重量'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="单价" prop="singlePrice">
-            <el-input v-model.trim="ruleForm.singlePrice" :placeholder="title === '详情' ? '' : '单价'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="安装及杂费" prop="installIncidentalExpenses">
-            <el-input v-model.trim="ruleForm.installIncidentalExpenses" :placeholder="title === '详情' ? '' : '安装及杂费'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="安装地点" prop="installPlace">
-            <el-input v-model.trim="ruleForm.installPlace" :placeholder="title === '详情' ? '' : '安装地点'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="原值" prop="originValue">
-            <el-input v-model.trim="ruleForm.originValue" :placeholder="title === '详情' ? '' : '原值'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="目前原值" prop="presentOriginValue">
-            <el-input v-model.trim="ruleForm.presentOriginValue" :placeholder="title === '详情' ? '' : '目前原值'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="折旧年限" prop="depreciationPeriod">
-            <el-input v-model.trim="ruleForm.depreciationPeriod" :placeholder="title === '详情' ? '' : '折旧年限'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="折旧方法" prop="depreciationMethod">
-            <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
-              <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="属性" prop="attribute">
-            <el-input v-model.trim="ruleForm.attribute" placeholder="属性" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="12">
-          <el-form-item label="说明书" prop="minioFileName">
-            <show-photo :minio-file-name="ruleForm.fileList[0]?.minioFileName || ''" />
-            <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
-            <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
-              {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
-            </el-button>
-            <span v-if="title === '详情' && !ruleForm.fileList[0]?.minioFileName">暂无</span>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="24">
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" placeholder="备注" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资产来源" prop="assetSource">
+              <el-input v-model.trim="ruleForm.assetSource" :placeholder="title === '详情' ? '' : '资产来源'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备规格" prop="equipmentSpecifications">
+              <el-input v-model.trim="ruleForm.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备类别" prop="equipmentCategory">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+                <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备类型" prop="equipmentType">
+              <el-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'">
+                <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资本来源" prop="capitalSource">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+                <el-option v-for="item in capitalSourceList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="管理级别" prop="managerLevel">
+              <el-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'">
+                <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="用途" prop="purpose">
+              <el-input v-model.trim="ruleForm.purpose" :placeholder="title === '详情' ? '' : '用途'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="技术水平" prop="technicalLevel">
+              <el-input v-model.trim="ruleForm.technicalLevel" :placeholder="title === '详情' ? '' : '技术水平'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="完好状态" prop="intactState">
+              <el-input v-model.trim="ruleForm.intactState" :placeholder="title === '详情' ? '' : '完好状态'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="外形尺寸" prop="overallDimension">
+              <el-input v-model.trim="ruleForm.overallDimension" :placeholder="title === '详情' ? '' : '外形尺寸'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="重量(吨)" prop="weight">
+              <el-input v-model.trim="ruleForm.weight" :placeholder="title === '详情' ? '' : '重量'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="单价" prop="singlePrice">
+              <el-input v-model.trim="ruleForm.singlePrice" :placeholder="title === '详情' ? '' : '单价'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="安装及杂费" prop="installIncidentalExpenses">
+              <el-input v-model.trim="ruleForm.installIncidentalExpenses" :placeholder="title === '详情' ? '' : '安装及杂费'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="安装地点" prop="installPlace">
+              <el-input v-model.trim="ruleForm.installPlace" :placeholder="title === '详情' ? '' : '安装地点'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="原值" prop="originValue">
+              <el-input v-model.trim="ruleForm.originValue" :placeholder="title === '详情' ? '' : '原值'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="目前原值" prop="presentOriginValue">
+              <el-input v-model.trim="ruleForm.presentOriginValue" :placeholder="title === '详情' ? '' : '目前原值'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="折旧年限" prop="depreciationPeriod">
+              <el-input v-model.trim="ruleForm.depreciationPeriod" :placeholder="title === '详情' ? '' : '折旧年限'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="折旧方法" prop="depreciationMethod">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+                <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="属性" prop="attribute">
+              <el-input v-model.trim="ruleForm.attribute" placeholder="属性" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="说明书" prop="minioFileName">
+              <show-photo :minio-file-name="ruleForm.fileList[0]?.minioFileName || ''" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
+                {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
+              </el-button>
+              <span v-if="title === '详情' && !ruleForm.fileList[0]?.minioFileName">暂无</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" placeholder="备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block-switch>
   </div>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    padding-top: 20px;
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index f46553a..fc3fd54 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -360,20 +360,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          固定资产-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`固定资产-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -763,44 +758,11 @@
           </el-row>
         </div> -->
       </el-form>
-    </div>
+    </detail-page>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index 0abbdb1..6e88e96 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -74,33 +74,29 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ name }} -{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm">
-            关闭
-          </el-button>
-        </span>
-      </div>
-      <div class="body">
-        <!-- 三级菜单 -->
-        <el-radio-group v-model="current">
-          <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
-            {{ item.name }}
-          </el-radio-button>
-        </el-radio-group>
-      </div>
-      <!-- 展示区域 -->
-      <keep-alive>
-        <component :is="currentComp" ref="currentCompRef" :name="current" :title="title" :row="row" />
-      </keep-alive>
-    </div>
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <!-- 展示区域 -->
+    <keep-alive>
+      <component :is="currentComp" ref="currentCompRef" :name="current" :title="title" :row="row">
+        <template #menuswitch>
+          <!-- 三级菜单 -->
+          <el-radio-group v-model="current">
+            <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+              {{ item.name }}
+            </el-radio-button>
+          </el-radio-group>
+        </template>
+      </component>
+    </keep-alive>
   </app-container>
 </template>
 
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f9cdcd0..f653095 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -256,7 +256,7 @@
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
-  // 原生上传图片
+  // 原生上传
   // console.log(event.target.files)
   // if (event.target.files[0].type === 'application/pdf') {
   if (event.target.files?.length !== 0) {
@@ -354,7 +354,7 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" type="primary" @click="identify">
+          <!-- <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" type="primary" @click="identify">
             标签识别
           </el-button>
           <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/import`)" type="primary" @click="batchImport">
@@ -371,7 +371,13 @@
           </el-button>
           <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/print`)" v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/device/standingBook/components/templateTable.vue b/src/views/device/standingBook/components/templateTable.vue
index 8a928f0..7aa563f 100644
--- a/src/views/device/standingBook/components/templateTable.vue
+++ b/src/views/device/standingBook/components/templateTable.vue
@@ -245,11 +245,11 @@
   <div>
     <!-- 添加证书信息组件 -->
     <add-row ref="addRowRef" @add="addRowData" />
-    <div class="header">
-      <div class="title">
-        <!-- {{ $props.name }} -->
-      </div>
-      <span class="btns">
+    <detail-block-switch :title="name">
+      <template #menu>
+        <slot name="menuswitch" />
+      </template>
+      <template #btns>
         <el-button v-if="title !== '详情'" type="info" @click="removeRow">
           删除行
         </el-button>
@@ -259,55 +259,33 @@
         <el-button v-if="title !== '详情'" type="primary" @click="editRow">
           编辑行
         </el-button>
-      </span>
-    </div>
-    <!-- 表格区域 -->
-    <normal-table
-      id="print"
-      :data="list" :total="total" :columns="columns as any"
-      :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-      :list-loading="loadingTable"
-      style="padding-top: 20px;background-color: #fff;"
-      @change="changePage"
-    >
-      <template #preColumns>
-        <el-table-column label="" width="55" align="center">
-          <template #default="scope">
-            <el-radio v-model="select" :label="scope.$index" class="radio" />
-          </template>
-        </el-table-column>
-        <el-table-column label="序号" width="55" align="center">
-          <template #default="scope">
-            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-          </template>
-        </el-table-column>
       </template>
-    </normal-table>
+      <!-- 表格区域 -->
+      <normal-table
+        id="print"
+        :data="list" :total="total" :columns="columns as any"
+        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+        :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </detail-block-switch>
   </div>
 </template>
 
 <style lang="scss" scoped>
-.header {
-  background-color: #fff;
-  // height: 40px;
-  border-radius: 8px;
-  display: flex;
-  align-items: center;
-  flex-direction: column;
-  justify-content: center;
-  position: relative;
-
-  .title {
-    // font-weight: 700;
-  }
-
-  .btns {
-    position: absolute;
-    right: 40px;
-    top: -22px;
-  }
-}
-
 :deep(.el-radio__label) {
   display: none;
 }
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 7538bc8..78a3800 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -272,24 +272,12 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/identify`)" type="primary" @click="identify">
-            标签识别
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/import`)" type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/mould`)" type="primary" @click="templateDownload">
-            模板下载
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/add`)" type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/export`)" type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/print`)" v-print="printObj" type="primary">
-            打印
-          </el-button>
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/identify`)" icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index fc364c8..e74d70e 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -361,20 +361,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ name }} - {{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -458,73 +453,33 @@
           </el-col>
         </el-row>
       </el-form>
-      <div v-if="title !== '新建' ">
-        <div class="header" style="margin-top: 10px;">
-          <div class="title">
-            审批流程
-          </div>
-        </div>
-        <div class="timeline">
-          <el-timeline>
-            <el-timeline-item timestamp="2018/4/12" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/12 20:46</p>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="2018/4/3" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/3 20:46</p>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="2018/4/2" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/2 20:46</p>
-              </el-card>
-            </el-timeline-item>
-          </el-timeline>
-        </div>
-      </div>
-    </div>
+    </detail-page>
+    <detail-block v-if="title !== '新建' " title="审批流程">
+      <el-timeline>
+        <el-timeline-item timestamp="2018/4/12" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/12 20:46</p>
+          </el-card>
+        </el-timeline-item>
+        <el-timeline-item timestamp="2018/4/3" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/3 20:46</p>
+          </el-card>
+        </el-timeline-item>
+        <el-timeline-item timestamp="2018/4/2" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/2 20:46</p>
+          </el-card>
+        </el-timeline-item>
+      </el-timeline>
+    </detail-block>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .timeline {
   background-color: #fff;
 }
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index aa3963f..737568d 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -1,6 +1,6 @@
 <!-- 状态管理公共列表组件 -->
 <script lang="ts" setup>
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessageBox } from 'element-plus'
 import approve from './approvalActionDialog.vue'
 import addDialog from './templateAdd.vue'
 const props = defineProps({
@@ -142,7 +142,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: any) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     title: '详情',
@@ -150,7 +150,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: any) => {
   dialogVisible.value = true
   // addRef.value.initDialog({
   //   title: '编辑',
@@ -158,7 +158,7 @@
   // })
 }
 // 删除
-const remove = (row) => {
+const remove = (row: any) => {
   ElMessageBox.confirm(
     `确认删除${row.equipmentName}吗？`,
     '提示',
@@ -181,20 +181,20 @@
   // })
 }
 // 同意
-const agree = (row) => {
+const agree = (row: any) => {
   console.log(approveRef.value)
   approveRef.value.initDialog({
     radio: '1',
   })
 }
 // 驳回
-const reject = (row) => {
+const reject = (row: any) => {
   approveRef.value.initDialog({
     radio: '3',
   })
 }
 // 拒绝
-const refuse = (row) => {
+const refuse = (row: any) => {
   approveRef.value.initDialog(
     {
       radio: '2',
@@ -202,7 +202,7 @@
   )
 }
 // 取消
-const cancel = (row) => {
+const cancel = (rowrow: any) => {
   ElMessageBox.confirm(
     '确认取消吗？',
     '提示',
@@ -301,20 +301,20 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+          <el-input placeholder="申请编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="设备编号" clearable class="w-50 m-2" />
+          <el-input placeholder="设备编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.modelNo" placeholder="设备名称" clearable class="w-50 m-2" />
+          <el-input placeholder="设备名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请单位" clearable class="w-50 m-2" />
+          <el-input placeholder="申请单位" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.publisher" placeholder="申请状态" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" />
+          <el-select placeholder="申请状态" clearable>
+            <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" /> -->
           </el-select>
         </search-item>
       </search-area>
@@ -328,7 +328,10 @@
           <el-button type="primary" @click="templateDownload">
             模板下载
           </el-button> -->
-          <el-button type="primary" @click="add">
+          <icon-button icon="icon-add" title="新建" @click="add" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+          <!-- <el-button type="primary" @click="add">
             新建
           </el-button>
           <el-button type="primary" @click="exportExcelBtn">
@@ -336,7 +339,7 @@
           </el-button>
           <el-button v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
         </template>
         <!-- 表格区域 -->
         <normal-table
@@ -386,22 +389,3 @@
     </app-container>
   </div>
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 154px !important;
-}
-
-.normal-date {
-  width: 154px !important;
-}
-
-.normal-select {
-  width: 154px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
-
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 0763c5a..9ef0b93 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -19,7 +19,6 @@
 const effectiveStatusName = ref('')
 const title = ref('')
 const fileList = ref<UploadUserFile[]>([])
-console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -80,10 +79,9 @@
   if (row.title === '新建') {
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
-    ruleForm.publisher = ''
+    ruleForm.publisher = userInfo.$state.deptName
     ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 判断有无存储
-    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
     if (sessionStorage.getItem(fileTypeName.value)) {
       const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
       ruleForm.fileType = session.fileType
@@ -117,6 +115,8 @@
     ruleForm.remark = row.remark
     ruleForm.publishTime = row.publishTime
     ruleForm.minioFileName = row.minioFileName
+    // ruleForm.publisher = '0'
+    // ruleForm.createUserId = '1'
   }
 }
 defineExpose({ initDialog })
@@ -148,6 +148,9 @@
       type: 'warning',
     },
       ).then((res) => {
+        if (ruleForm.publisher === userInfo.$state.deptName) {
+          ruleForm.publisher === userInfo.$state.deptId
+        }
         if (flag == '提交') {
           addApi(ruleForm).then((res) => {
             if (res.code == 200) {
@@ -193,7 +196,6 @@
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        console.log(res.data[0])
         ruleForm.minioFileName = res.data[0]
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
@@ -216,7 +218,6 @@
 // ])
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
-  console.log(diffDat)
   if (diffDat < 0) {
     // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '在使用'
@@ -237,7 +238,7 @@
 
 <template>
   <app-container v-if="dialogVisible" style="overflow: hidden;">
-    <detail-page :title="`${title}${fileTypeName}`">
+    <detail-page :title="`${fileTypeName}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
           提交
@@ -278,12 +279,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="发布单位" prop="publisher">
-              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'" class="fill-input">
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled>
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
               <com-tree-select
                 v-else
-                v-model="ruleForm.publisher" :options="PubListTree" placeholder="选择组织机构"
+                v-model="ruleForm.publisher" :options="PubListTree" placeholder="请选择发布单位"
                 :tree-props="deptProps"
               />
             </el-form-item>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 44e3e4d..b45fbc3 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -324,22 +324,9 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <!-- <el-button type="primary" @click="batchImport">
-            批量导入
-          </el-button> -->
-          <!-- <el-button type="primary" @click="templateDownload">
-            模板下载
-          </el-button> -->
-          <!-- <el-button type="primary" @click="add">
-            新建
-          </el-button> -->
-          <el-button type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-print="printObj" type="primary">
-            打印
-          </el-button>
+          <!-- <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange"> -->
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 4677e48..7d4724b 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -204,13 +204,9 @@
     loading.close()
   })
 }
-// 打印
-const print = () => {
-
-}
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
-  // 原生上传图片
+  // 原生上传
   // console.log(event.target.files)
   // if (event.target.files[0].type === 'application/pdf') {
   if (event.target.files?.length !== 0) {
@@ -264,7 +260,7 @@
         <search-item>
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
-        <search-item>
+        <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
@@ -273,13 +269,13 @@
               :value="item.value"
             />
           </el-select>
-        </search-item>
+        </search-item> -->
         <search-item>
           <el-date-picker
             v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 155px;"
+            style="width: 185px;"
           />
         </search-item>
         <search-item>
@@ -287,19 +283,19 @@
             v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 155px;"
+            style="width: 185px;"
           />
         </search-item>
         <search-item>
-          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select> -->
-          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
+          </el-select>
+          <!-- <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" /> -->
         </search-item>
       </search-area>
       <table-container>
@@ -310,7 +306,7 @@
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
-          <icon-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" @click="print" />
+          <icon-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index cf0dd4f..5ca3275 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -3,11 +3,11 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { detailType } from '../measureDept-interface'
-import { getUserList } from '@/api/system/user'
+// import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
+import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import type { userType } from '@/views/system/user/user-interface'
 import { listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
-import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
 const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -31,11 +31,20 @@
   technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
+// 获取计量人员列表
 const getuser = () => {
-  getUserList({ offset: 1, limit: 99999 }).then((res) => {
-    userList.value = res.data.rows
+  getStaffList({
+    staffNo: '', // 人员编号
+    name: '', // 姓名
+    deptId: ruleForm.value.deptId, // 所在部门
+    limit: 999999,
+    offset: 1,
+  }).then((res) => {
+    if (res.code === 200) {
+      userList.value = res.data.records
+    }
   })
-} // 获取用户列表
+}
 const technologyJobList = ref<{ id: string;name: string;value: string }[]>([])
 // 获取技术职务列表
 const getTechnologyJobList = () => {
@@ -50,7 +59,16 @@
     administrationJobList.value = response.data
   })
 }
-
+// 选择负责人自动填充职务信息
+const directorChange = (val: string) => {
+  const selectUser = userList.value.filter(item => item.name === val)[0]
+  getStaffDetail(selectUser).then((res) => {
+    if (res.code === 200) {
+      ruleForm.value.administrationJob = res.data.administrationJob
+      ruleForm.value.technologyJob = res.data.technologyJob
+    }
+  })
+}
 // 提交
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
@@ -95,12 +113,6 @@
 const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
-// const searchQuery = ref({
-//   limit: 10,
-//   offset: 1,
-//   total: 0,
-//   pageSizes: [10, 20, 30],
-// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -410,20 +422,6 @@
     }
   })
 }
-// const handleSizeChange = (val: number) => {
-//   searchQuery.value.limit = val
-//   getDepartmentList()
-//   getuserInfoList()
-//   getInstrumentInfo()
-//   getDeviceInfo()
-// }
-// const handleCurrentChange = (val: number) => {
-//   searchQuery.value.offset = val
-//   getDepartmentList()
-//   getuserInfoList()
-//   getInstrumentInfo()
-//   getDeviceInfo()
-// }
 // 弹窗初始化
 const initDialog = (row: any) => {
   reset()
@@ -460,22 +458,17 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title.split('-')[2] === '编辑'" type="primary" @click="submitForm(ruleFormRef)">
-            提交
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="title">
+      <template #btns>
+        <el-button v-if="title.split('-')[2] === '编辑'" type="primary" @click="submitForm(ruleFormRef)">
+          提交
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title.split('-')[2] === '详情' ? 'isDetail' : '']">
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item :label=" `${title.split('-')[1]}编号`" prop="organizeNo">
               <el-input v-model.trim="ruleForm.organizeNo" placeholder="系统自动生成" disabled />
@@ -487,7 +480,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="title.split('-')[1] === '工程组'" :gutter="24" class="marg">
+        <el-row v-if="title.split('-')[1] === '工程组'" :gutter="24">
           <el-col :span="6">
             <el-form-item label="科室编号">
               <el-input v-model.trim="ruleForm.pDeptId" disabled />
@@ -509,10 +502,10 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
-              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" @change="directorChange">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.name" />
               </el-select>
             </el-form-item>
@@ -532,7 +525,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="24">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
               <el-input v-model.trim="ruleForm.remark" :placeholder="title.split('-')[2] === '详情' ? '' : '备注'" :disabled="title.split('-')[2] === '详情'" />
@@ -540,85 +533,24 @@
           </el-col>
         </el-row>
       </el-form>
-      <!-- 科室信息-人员信息等列表切换 -->
-      <div>
-        <div class="header" style="margin-top: 10px;">
-          <!-- 切换 -->
-          <el-radio-group v-model="current" class="change-btn">
-            <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
-              {{ item.name }}
-            </el-radio-button>
-          </el-radio-group>
-          <div class="title">
-            {{ current }}
-          </div>
-          <span class="btns">
-          <!-- <el-button type="info" :disabled="title === '详情'" @click="removeRow">
-            删除行
-          </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
-            添加行
-          </el-button> -->
-          </span>
-        </div>
-        <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <el-table-column type="index" label="序号" width="55" align="center" />
-          <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
-        </el-table>
-        <!-- <div style="width: 100%;margin-top: 10px;">
-          <el-pagination
-            :current-page="searchQuery.offset"
-            :page-sizes="searchQuery.pageSizes"
-            :page-size="searchQuery.limit"
-            :total="searchQuery.total"
-            layout="total, sizes, prev, pager, next"
-            hide-on-single-page
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-          />
-        </div> -->
-      </div>
-    </div>
+    </detail-page>
+    <detail-block-switch :title="current">
+      <template #menu>
+        <el-radio-group v-model="current" class="change-btn">
+          <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
+            {{ item.name }}
+          </el-radio-button>
+        </el-radio-group>
+      </template>
+      <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
+        <el-table-column type="index" label="序号" width="55" align="center" />
+        <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </detail-block-switch>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-    position: relative;
-
-    .change-btn {
-      position: absolute;
-      left: 40px;
-      top: 4px;
-    }
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 4px;
-    }
-  }
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
@@ -628,8 +560,4 @@
     }
   }
 }
-
-.marg {
-  margin-top: 10px;
-}
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 9ad87af..aac1ef2 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -231,12 +231,14 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
+          <!-- <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
           <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
+          <icon-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 2e3322a..3f472eb 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -41,7 +41,7 @@
   { text: '证书号', value: 'certificateNo', align: 'center' },
   { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
   { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'validDate', align: 'center', width: '200' },
   { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
 ]) // 表格
 const certificateStatusList = ref([
@@ -90,7 +90,7 @@
   loadingTable.value = true
   getCertificateList(searchQuery).then((res) => {
     if (res.code === 200) {
-      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效' }))
+      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效', validDate: item.validDate.split(' ')[0], certificateDate: item.certificateDate.split(' ')[0] }))
       list.value = res.data.records
       total.value = Number(res.data.total)
     }
@@ -115,6 +115,7 @@
   addRef.value.initDialog({
     ...row,
     title: '详情',
+    name: props.isRemind ? '证书状况' : '证书记录',
   })
 }
 // 编辑
@@ -123,6 +124,7 @@
   addRef.value.initDialog({
     ...row,
     title: '编辑',
+    name: props.isRemind ? '证书状况' : '证书记录',
   })
 }
 
@@ -193,6 +195,7 @@
   dialogVisible.value = true
   addRef.value.initDialog({
     title: '新建',
+    name: props.isRemind ? '证书状况' : '证书记录',
   })
 }
 // 导出
@@ -292,21 +295,11 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
-            模板下载
-          </el-button>
-          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
-            打印
-          </el-button>
+          <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
@@ -325,7 +318,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column fixed="right" label="操作" align="center" width="150">
+            <el-table-column fixed="right" label="操作" align="center" width="180">
               <template #default="{ row }">
                 <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
                   提醒
@@ -336,7 +329,7 @@
                 <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 4dc1b17..4352604 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -69,7 +69,16 @@
     const IdCard = ruleForm.value.idCard
     const birthday = `${IdCard.substring(6, 10)}-${IdCard.substring(10, 12)}`
     ruleForm.value.birthday = birthday
-    console.log(ruleForm.value)
+    // 获取性别 第17位  奇数为男 偶数为女
+    // ruleForm.value.sex
+    if (Number(IdCard.substring(16, 17)) % 2) {
+      // 男
+      ruleForm.value.sex = '1'
+    }
+    else {
+      //  女
+      ruleForm.value.sex = '2'
+    }
   })
 }
 const dialogVisible = ref<boolean>(false) // 弹窗显示
@@ -130,7 +139,6 @@
     technologyExam: '', // 技术考核
     remark: '', // 备注
     certificateList: [], // 证书列表
-
   }
 }
 const technologyJobList = ref<technologyJobType[]>([])
@@ -309,7 +317,7 @@
           }
           (title.value === '新建'
             ? getStaffAdd
-            : getStaffupdate) ({ ...ruleForm.value, certificateList: changeList.value[0].data }).then((res) => {
+            : getStaffupdate) ({ ...ruleForm.value, certificateList: changeList.value[0].data, birthday: `${ruleForm.value.idCard.substring(6, 10)}-${ruleForm.value.idCard.substring(10, 12)}-${ruleForm.value.idCard.substring(12, 14)}` }).then((res) => {
             if (res.code == 200) {
               formEl?.resetFields()
               ElMessage.success('提交成功')
@@ -332,12 +340,14 @@
   emits('resetData')
   resetFormData()
 }
+const selectTreeRef = ref()
 // 弹窗初始化
 const initDialog = (row: any) => {
   changeList.value[0].data = []
   dialogVisible.value = true
   title.value = row.title
   resetFormData()
+  selectTreeRef.value?.clearSelected()
   getuser()
   getPubList()
   getSexList()
@@ -370,20 +380,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          计量人员-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
-            完成
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`计量人员-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+          完成
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
         <el-row :gutter="24" class="marg">
           <el-col :span="5">
@@ -394,6 +399,7 @@
                 :http-request="uploadQuarterlyEvaluateFile"
                 :before-upload="beforeAvatarUpload"
                 :disabled="title === '详情'"
+                accept="image/png, image/jpeg,image/jpg"
               >
                 <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
                 <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
@@ -425,8 +431,8 @@
               </el-select>
               <com-tree-select
                 v-else
-                v-model="ruleForm.deptId" :options="PubListTree" placeholder="选择组织机构"
-                :tree-props="deptProps"
+                ref="selectTreeRef" v-model="ruleForm.deptId" :options="PubListTree"
+                placeholder="选择组织机构" :tree-props="deptProps"
               />
             </el-form-item>
             <el-form-item label="计量专业" prop="major" class="marg-item">
@@ -489,29 +495,19 @@
           </el-col>
         </el-row>
       </el-form>
-      <!-- 证书基本信息 -->
-      <!-- 切换 -->
-      <!-- <el-radio-group v-model="current" style="margin-bottom: -15px;">
-          <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
-            {{ item.name }}
-          </el-radio-button>
-        </el-radio-group> -->
-      <div class="header" style="margin-top: 10px;">
-        <div class="title">
-          {{ current }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="info" @click="removeRow">
-            删除行
-          </el-button>
-          <el-button v-if="title !== '详情'" type="primary" @click="addRow">
-            添加行
-          </el-button>
-          <el-button v-if="title !== '详情'" type="primary" @click="editRow">
-            编辑行
-          </el-button>
-        </span>
-      </div>
+    </detail-page>
+    <detail-block :title="current">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="info" @click="removeRow">
+          删除行
+        </el-button>
+        <el-button v-if="title !== '详情'" type="primary" @click="addRow">
+          添加行
+        </el-button>
+        <el-button v-if="title !== '详情'" type="primary" @click="editRow">
+          编辑行
+        </el-button>
+      </template>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
         <el-table-column width="55" align="center">
           <template #default="scope">
@@ -523,7 +519,7 @@
         <el-table-column type="index" label="序号" width="55" />
         <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
       </el-table>
-    </div>
+    </detail-block>
     <!-- 添加证书信息组件 -->
     <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
     <!-- 选择用户列表组件 -->
@@ -532,77 +528,38 @@
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    background-color: #fff;
-    border-radius: 8px;
-    padding-top: 10px;
-    margin-top: 10px;
-    padding-right: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    display: flex;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    position: relative;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 5px;
-    }
-  }
-
-  :deep(.el-radio__label) {
-    display: none;
-  }
-
-  :deep(.el-icon.avatar-uploader-icon) {
-    font-size: 28px;
-    color: #8c939d;
-    width: 190px;
-    height: 250px;
-    text-align: center;
-  }
-
-  :deep(.avatar-uploader .avatar) {
-    width: 190px;
-    height: 250px;
-    display: block;
-  }
-
-  .isDetail {
-    ::v-deep {
-      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-        display: none;
-      }
-    }
-  }
+:deep(.el-radio__label) {
+  display: none;
 }
 
-.marg {
-  margin-top: 20px;
+:deep(.el-icon.avatar-uploader-icon) {
+  font-size: 28px;
+  color: #8c939d;
+  width: 190px;
+  height: 250px;
+  text-align: center;
 }
 
-.marg-item {
-  margin-top: 20px;
+:deep(.avatar-uploader .avatar) {
+  width: 190px;
+  height: 250px;
+  display: block;
+}
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
 }
 </style>
 
 <style scoped>
 .avatar-uploader .avatar {
-  width: 220px;
-  height: 320px;
+  width: 190px;
+  height: 250px;
   display: block;
 }
 </style>
@@ -624,8 +581,8 @@
 .el-icon.avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
-  width: 220px;
-  height: 320px;
+  width: 190px;
+  height: 250px;
   text-align: center;
 }
 </style>
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index ae48f11..042636e 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -4,7 +4,6 @@
 import dayjs from 'dayjs'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import type { technologyJobType } from '../person-interface'
-import certificateAddDialog from './certificateAddDialog.vue'
 import personListDialog from './personListDialog.vue'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
@@ -14,7 +13,8 @@
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
-const ruleFormRef = ref<FormInstance>() // from组件
+const ruleFormRef1 = ref<FormInstance>() // from组件
+const ruleFormRef2 = ref<FormInstance>() // from组件
 const meterStaff = ref({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -28,26 +28,43 @@
   workDate: '', // 从事日期
   id: '',
 })
+const baseInfo = ref({
+  certificateCompany: '',
+  certificateDate: '',
+  certificateName: '',
+  certificateNo: '',
+  validDate: '',
+  id: '',
+  isDel: 0,
+  minioFileName: '',
+  remark: '',
+})
 const ruleForm = ref({
   meterStaff: {}, // 人员信息
   staffId: '', // 计量人员id
 }) // 表单
-const multipleTableRef = ref<InstanceType<typeof ElTable>>()
 const title = ref('')
+const name = ref('')
 // 身份证号码验证规则
-const validateIDcard = (rule: any, value: any, callback: any) => {
-  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
-  if (rr.test(value)) {
-    callback()
-  }
-  else {
-    callback(new Error('验证失败'))
-  }
-}
+// const validateIDcard = (rule: any, value: any, callback: any) => {
+//   const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+//   if (rr.test(value)) {
+//     callback()
+//   }
+//   else {
+//     callback(new Error('验证失败'))
+//   }
+// }
 const rules = ref({
   staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
   // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
-
+}) // 表单验证规则
+const rules2 = ref({
+  certificateCompany: [{ required: true, message: '发证单位不能为空', trigger: 'blur' }],
+  certificateDate: [{ required: true, message: '发证日期不能为空', trigger: 'blur' }],
+  certificateName: [{ required: true, message: '证书名称不能为空', trigger: 'blur' }],
+  certificateNo: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
+  validDate: [{ required: true, message: '有效日期不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
 const userList = ref<userType[]>([]) // 可使用人列表
@@ -96,6 +113,17 @@
   meterStaff.value.major = ''
   meterStaff.value.workDate = ''
   meterStaff.value.id = ''
+  baseInfo.value = {
+    certificateCompany: '',
+    certificateDate: '',
+    certificateName: '',
+    certificateNo: '',
+    validDate: '',
+    id: '',
+    isDel: 0,
+    minioFileName: '',
+    remark: '',
+  }
 }
 const technologyJobList = ref<technologyJobType[]>([])
 // 获取技术职务列表
@@ -120,98 +148,14 @@
 const confirmPerson = (row: any) => {
   ruleForm.value.staffId = row.staffNo
   meterStaff.value = row
-  ruleFormRef.value?.clearValidate('staffNo')
+  ruleFormRef1.value?.clearValidate('staffNo')
 }
-const changeList = ref([
-  {
-    name: '证书基本信息',
-    data: [] as any[],
-    column: [
-      {
-        label: '证书号',
-        data: 'certificateNo',
-        id: 'zs02',
-      },
-      {
-        label: '证书名称',
-        data: 'certificateName',
-        id: 'zs03',
-      },
-      {
-        label: '发证日期',
-        data: 'certificateDate',
-        id: 'zs04',
-      },
-      {
-        label: '发证单位',
-        data: 'certificateCompany',
-        id: 'zs01',
-      },
-      {
-        label: '有效日期',
-        data: 'validDate',
-        id: 'zs05',
-      },
-    ],
-  },
-  {
-    name: '计量工作培训记录',
-    data: [],
-    column: [],
-  },
-  {
-    name: '业务记录',
-    data: [],
-    column: [],
-  },
-])
-const current = ref('证书基本信息')
-const currentShow = computed(() => {
-  return changeList.value.filter(item => item.name === current.value)[0]
-})
-const certificateRef = ref() // 添加证书信息弹窗
-// 添加行
-const addRow = () => {
-  certificateRef.value.initDialog({ title: '添加' })
-}
-// 编辑行
-const editRow = () => {
-  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
-}
-// 证书信息行内添加数据
-const addRowcertificate = (row: any, flag: string) => {
-  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
-  if (flag === 'update') {
-    changeList.value[0].data = [{
-      ...changeList.value[0].data[0],
-      ...row,
-      certificateStatus: diff < 0 ? '1' : '0',
-      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-    }]
-  }
-  else {
-    changeList.value[0].data.push(
-      {
-        ...row,
-        certificateStatus: diff < 0 ? '1' : '0',
-        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-        id: null,
-        isDel: 0,
-        minioFileName: '',
-        remark: '',
-        staffId: meterStaff.value.id,
-        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-      })
-  }
-}
-const currenSelect = ref<number>(-1) // 当前选中行
-// 删除行
-const removeRow = () => {
-  console.log(currenSelect.value)
-  if (currenSelect.value >= 0) {
+// 提交
+const submitForm = async (formEl1: FormInstance | undefined, formEl2: FormInstance | undefined) => {
+  if (!formEl1 || !formEl2) { return }
+  Promise.all([formEl1.validate(), formEl2.validate()]).then((res) => {
     ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
+      '确认提交吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -219,78 +163,49 @@
         type: 'warning',
       },
     ).then(() => {
-      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
-      currenSelect.value = -1
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 提交
-const submitForm = async (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  await formEl.validate((valid, fields) => {
-    if (valid) {
-      ElMessageBox.confirm(
-        '确认提交吗？',
-        '提示',
-        {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        },
-      ).then(() => {
-        let params
-        if (changeList.value[0].data.length) {
-          params = changeList.value[0].data
-        }
-        else {
-          params = [
-            {
-              certificateCompany: '',
-              certificateDate: '',
-              certificateName: '',
-              certificateNo: '',
-              certificateStatus: '',
-              createTime: '',
-              id: null,
-              isDel: 0,
-              minioFileName: '',
-              remark: '',
-              staffId: meterStaff.value.id,
-              updateTime: '',
-              validDate: '',
-            },
-          ]
-        }
-        (title.value === '新建'
-          ? addCertificateList
-          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
-          formEl?.resetFields()
-          ElMessage.success('提交成功')
-          emits('resetData')
-          resetFormData()
-        })
+      (title.value === '新建'
+        ? addCertificateList
+        : getCertificateUpdate)(title.value === '新建'
+        ? [{
+            ...baseInfo.value,
+            staffId: meterStaff.value.id,
+            createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+            updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+            certificateStatus: dayjs(baseInfo.value.validDate).diff(baseInfo.value.certificateDate, 'day') < 0 ? '1' : '0',
+            meterStaff: undefined,
+          }]
+        : {
+            ...baseInfo.value,
+            staffId: meterStaff.value.id,
+            createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+            updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+            certificateStatus: dayjs(baseInfo.value.validDate).diff(baseInfo.value.certificateDate, 'day') < 0 ? '1' : '0',
+            meterStaff: undefined,
+          }).then((res) => {
+        formEl1?.resetFields()
+        formEl2?.resetFields()
+        ElMessage.success('提交成功')
+        emits('resetData')
+        resetFormData()
       })
-    }
+    })
   })
 }
 // 取消
-const resetForm = (formEl: FormInstance | undefined) => {
+const resetForm = (formEl: FormInstance | undefined, formEl2: FormInstance | undefined) => {
   formEl?.resetFields()
-  changeList.value[0].data = []
+  formEl2?.resetFields()
   emits('resetData')
   resetFormData()
 }
+const selectTreeRef = ref()
 // 弹窗初始化
 const initDialog = (row: any) => {
-  changeList.value[0].data = []
   resetFormData()
   dialogVisible.value = true
   title.value = row.title
-  resetFormData()
+  name.value = row.name
+  selectTreeRef.value?.clearSelected()
   getuser()
   getPubList()
   getSexList()
@@ -303,8 +218,9 @@
   else {
     getCertificateDetail({ id: row.id }).then((res) => {
       if (res.code === 200) {
+        console.log(res, '证书记录')
         meterStaff.value = res.data.meterStaff
-        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+        baseInfo.value = res.data
       }
     })
   }
@@ -314,21 +230,16 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          证书记录-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
-            完成
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
-      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+    <detail-page :title=" `${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
+          完成
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef1, ruleFormRef2)">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef1" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="人员编号" prop="staffNo">
@@ -390,7 +301,8 @@
               </el-select>
               <com-tree-select
                 v-else
-                v-model="meterStaff.deptId" :options="PubListTree" placeholder="选择组织机构"
+                ref="selectTreeRef" v-model="meterStaff.deptId" :options="PubListTree"
+                placeholder="选择组织机构"
                 :tree-props="deptProps"
               />
             </el-form-item>
@@ -410,71 +322,52 @@
           </el-col>
         </el-row>
       </el-form>
-      <div class="header" style="margin-top: 10px;">
-        <div class="title">
-          {{ current }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title === '新建'" type="info" @click="removeRow">
-            删除行
-          </el-button>
-          <el-button v-if="title === '新建'" type="primary" @click="addRow">
-            添加行
-          </el-button>
-          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
-            编辑行
-          </el-button>
-        </span>
-      </div>
-      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
-        <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column>
-        <el-table-column type="index" label="序号" width="55" />
-        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
-      </el-table>
-    </div>
-    <!-- 添加证书信息组件 -->
-    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    </detail-page>
+    <detail-block title="证书基本信息">
+      <el-form ref="ruleFormRef2" :model="baseInfo" :rules="rules2" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="证书号" prop="certificateNo">
+              <el-input v-model.trim="baseInfo.certificateNo" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书名称" prop="certificateName">
+              <el-input v-model.trim="baseInfo.certificateName" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证单位" prop="certificateCompany">
+              <el-input v-model.trim="baseInfo.certificateCompany" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发证日期" prop="certificateDate">
+              <el-date-picker
+                v-model="baseInfo.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择发证日期"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书有效日期" prop="validDate">
+              <el-date-picker
+                v-model="baseInfo.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择有效日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block>
     <!-- 选择用户列表组件 -->
     <person-list-dialog ref="personListRef" @add="confirmPerson" />
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    background-color: #fff;
-    border-radius: 8px;
-    padding-top: 10px;
-    margin-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    display: flex;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    position: relative;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 5px;
-    }
-  }
-
   :deep(.el-radio__label) {
     display: none;
   }
@@ -487,40 +380,5 @@
       }
     }
   }
-}
-
-.marg {
-  margin-top: 20px;
-}
 </style>
 
-<style scoped>
-.avatar-uploader .avatar {
-  width: 178px;
-  height: 178px;
-  display: block;
-}
-</style>
-
-<style>
-.avatar-uploader .el-upload {
-  border: 1px dashed var(--el-border-color);
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-  transition: var(--el-transition-duration-fast);
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: var(--el-color-primary);
-}
-
-.el-icon.avatar-uploader-icon {
-  font-size: 28px;
-  color: #8c939d;
-  width: 178px;
-  height: 178px;
-  text-align: center;
-}
-</style>
diff --git a/src/views/measure/person/components/addRecordCancel.vue b/src/views/measure/person/components/addRecordCancel.vue
new file mode 100644
index 0000000..c32ac43
--- /dev/null
+++ b/src/views/measure/person/components/addRecordCancel.vue
@@ -0,0 +1,459 @@
+<!-- 计量人员新增  证书基本信息table表格   作废 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import type { technologyJobType } from '../person-interface'
+import certificateAddDialog from './certificateAddDialog.vue'
+import personListDialog from './personListDialog.vue'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import type { TreeStructure, userType } from '@/views/system/user/user-interface'
+import { getDictByCode } from '@/api/system/dict'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const meterStaff = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  idCard: '', // 身份证号
+  sex: '', // 性别
+  education: '', // 文化程度
+  technologyJob: '', // 技术职务
+  administrationJob: '', // 行政职务
+  deptId: '', // 工作部门
+  major: '', // 专业
+  workDate: '', // 从事日期
+  id: '',
+})
+const ruleForm = ref({
+  meterStaff: {}, // 人员信息
+  staffId: '', // 计量人员id
+}) // 表单
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const title = ref('')
+const name = ref('')
+// 身份证号码验证规则
+const validateIDcard = (rule: any, value: any, callback: any) => {
+  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+  if (rr.test(value)) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+const rules = ref({
+  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
+
+}) // 表单验证规则
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref<TreeStructure[]>([])
+const PubListTree = ref([])
+// 获取组织列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
+  })
+}
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sex').then((response) => {
+    sexList.value = response.data
+  })
+}
+const educationList = ref<technologyJobType[]>([])
+// 获取文化程度列表
+const geteducationList = () => {
+  getDictByCode('education').then((response) => {
+    educationList.value = response.data
+  })
+}
+// 重置表单内容
+const resetFormData = () => {
+  meterStaff.value.staffNo = ''
+  meterStaff.value.name = ''
+  meterStaff.value.idCard = ''
+  meterStaff.value.sex = ''
+  meterStaff.value.education = ''
+  meterStaff.value.technologyJob = ''
+  meterStaff.value.administrationJob = ''
+  meterStaff.value.deptId = ''
+  meterStaff.value.major = ''
+  meterStaff.value.workDate = ''
+  meterStaff.value.id = ''
+}
+const technologyJobList = ref<technologyJobType[]>([])
+// 获取技术职务列表
+const getTechnologyJobList = () => {
+  getDictByCode('technologyJob').then((response) => {
+    technologyJobList.value = response.data
+  })
+}
+const administrationJobList = ref<technologyJobType[]>([])
+// 获取行政职务列表
+const getAdministrationJob = () => {
+  getDictByCode('administrationJob').then((response) => {
+    administrationJobList.value = response.data
+  })
+}
+const personListRef = ref()
+// 选择人员
+const selectPerson = () => {
+  personListRef.value.initDialog()
+}
+// 保存选择人员信息
+const confirmPerson = (row: any) => {
+  ruleForm.value.staffId = row.staffNo
+  meterStaff.value = row
+  ruleFormRef.value?.clearValidate('staffNo')
+}
+const changeList = ref([
+  {
+    name: '证书基本信息',
+    data: [] as any[],
+    column: [
+      {
+        label: '证书号',
+        data: 'certificateNo',
+        id: 'zs02',
+      },
+      {
+        label: '证书名称',
+        data: 'certificateName',
+        id: 'zs03',
+      },
+      {
+        label: '发证日期',
+        data: 'certificateDate',
+        id: 'zs04',
+      },
+      {
+        label: '发证单位',
+        data: 'certificateCompany',
+        id: 'zs01',
+      },
+      {
+        label: '有效日期',
+        data: 'validDate',
+        id: 'zs05',
+      },
+    ],
+  },
+  {
+    name: '计量工作培训记录',
+    data: [],
+    column: [],
+  },
+  {
+    name: '业务记录',
+    data: [],
+    column: [],
+  },
+])
+const current = ref('证书基本信息')
+const currentShow = computed(() => {
+  return changeList.value.filter(item => item.name === current.value)[0]
+})
+const certificateRef = ref() // 添加证书信息弹窗
+// 添加行
+const addRow = () => {
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
+}
+// 证书信息行内添加数据
+const addRowcertificate = (row: any, flag: string) => {
+  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
+  if (flag === 'update') {
+    changeList.value[0].data = [{
+      ...changeList.value[0].data[0],
+      ...row,
+      certificateStatus: diff < 0 ? '1' : '0',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    }]
+  }
+  else {
+    changeList.value[0].data.push(
+      {
+        ...row,
+        certificateStatus: diff < 0 ? '1' : '0',
+        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        id: null,
+        isDel: 0,
+        minioFileName: '',
+        remark: '',
+        staffId: meterStaff.value.id,
+        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
+  }
+}
+const currenSelect = ref<number>(-1) // 当前选中行
+// 删除行
+const removeRow = () => {
+  console.log(currenSelect.value)
+  if (currenSelect.value >= 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
+      currenSelect.value = -1
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        let params
+        if (changeList.value[0].data.length) {
+          params = changeList.value[0].data
+        }
+        else {
+          params = [
+            {
+              certificateCompany: '',
+              certificateDate: '',
+              certificateName: '',
+              certificateNo: '',
+              certificateStatus: '',
+              createTime: '',
+              id: null,
+              isDel: 0,
+              minioFileName: '',
+              remark: '',
+              staffId: meterStaff.value.id,
+              updateTime: '',
+              validDate: '',
+            },
+          ]
+        }
+        (title.value === '新建'
+          ? addCertificateList
+          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
+          formEl?.resetFields()
+          ElMessage.success('提交成功')
+          emits('resetData')
+          resetFormData()
+        })
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  changeList.value[0].data = []
+  emits('resetData')
+  resetFormData()
+}
+const selectTreeRef = ref()
+// 弹窗初始化
+const initDialog = (row: any) => {
+  changeList.value[0].data = []
+  resetFormData()
+  dialogVisible.value = true
+  title.value = row.title
+  name.value = row.name
+  selectTreeRef.value.clearSelected()
+  resetFormData()
+  getuser()
+  getPubList()
+  getSexList()
+  geteducationList()
+  getTechnologyJobList()
+  getAdministrationJob()
+  if (row.title === '新建') {
+    console.log()
+  }
+  else {
+    getCertificateDetail({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        meterStaff.value = res.data.meterStaff
+        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+      }
+    })
+  }
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <detail-page :title=" `${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+          完成
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="人员编号" prop="staffNo">
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="selectPerson">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="meterStaff.name">
+              <el-input v-model.trim="meterStaff.name" placeholder="姓名" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="性别" prop="meterStaff.sex">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="文化程度" prop="meterStaff.education">
+              <el-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="技术职务" prop="meterStaff.technologyJob">
+              <el-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="行政职务" prop="meterStaff.administrationJob">
+              <el-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="工作部门" prop="deptId">
+              <el-select v-if="title === '详情'" v-model="meterStaff.deptId" disabled>
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+              <com-tree-select
+                v-else
+                ref="selectTreeRef" v-model="meterStaff.deptId" :options="PubListTree"
+                placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业" prop="major">
+              <el-input v-model.trim="meterStaff.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="从事日期" prop="workDate">
+              <el-date-picker
+                v-model="meterStaff.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择从事日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block :title="current">
+      <template #btns>
+        <el-button v-if="title === '新建'" type="info" @click="removeRow">
+          删除行
+        </el-button>
+        <el-button v-if="title === '新建'" type="primary" @click="addRow">
+          添加行
+        </el-button>
+        <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+          编辑行
+        </el-button>
+      </template>
+      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
+        <el-table-column width="55" align="center">
+          <template #default="scope">
+            <el-radio-group v-model="currenSelect" class="ml-4">
+              <el-radio :label="scope.$index" />
+            </el-radio-group>
+          </template>
+        </el-table-column>
+        <el-table-column type="index" label="序号" width="55" />
+        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </detail-block>
+    <!-- 添加证书信息组件 -->
+    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    <!-- 选择用户列表组件 -->
+    <person-list-dialog ref="personListRef" @add="confirmPerson" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        display: none;
+      }
+    }
+  }
+</style>
+
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 332c73c..178fc12 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -32,6 +32,7 @@
   form.validDate = ''
 }
 const initDialog = (row: any) => {
+  resetData()
   title.value = row.title
   if (row.title === '编辑') {
     form.certificateNo = row.certificateNo
@@ -50,10 +51,12 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       if (title.value === '编辑') {
-        emits('add', form, 'update')
+        const deptRow = JSON.parse(JSON.stringify(form))
+        emits('add', deptRow, 'update')
       }
       else {
-        emits('add', form, '')
+        const deptRow = JSON.parse(JSON.stringify(form))
+        emits('add', deptRow, '')
       }
       dialogFormVisible.value = false
     }
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 592d810..9c6f65d 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -30,7 +30,7 @@
   { text: '技术职务', value: 'technologyJob', align: 'center', width: '140' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '100' },
   { text: '计量专业', value: 'major', align: 'center', width: '100' },
-  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '180' },
   { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '技术考核', value: 'technologyExam', align: 'center', width: '85' },
 ]) // 表格
@@ -63,7 +63,7 @@
   loadingTable.value = true
   getStaffList(searchQuery).then((res) => {
     if (res.code === 200) {
-      res.data.records = res.data.records.map((item: StaffType) => ({ ...item, sex: item.sex == '1' ? '男' : '女', technologyExam: item.technologyExam == '0' ? '已考核' : '未考核' }))
+      res.data.records = res.data.records.map((item: StaffType) => ({ ...item, sex: item.sex == '1' ? '男' : '女', technologyExam: item.technologyExam == '0' ? '已考核' : '未考核', certificateDate: item.certificateDate.split(' ')[0] }))
       list.value = res.data.records
       total.value = Number(res.data.total)
     }
@@ -236,21 +236,11 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="proxy.hasPerm(`/measure/person/list/import`)" type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" type="primary" @click="templateDownload">
-            模板下载
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/list/add`)" type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/list/export`)" type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" type="primary" @click="print">
-            打印
-          </el-button>
+          <icon-button v-if="proxy.hasPerm(`/measure/person/list/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/list/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/list/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index 17b92d3..e44001a 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -295,15 +295,17 @@
         </el-button>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
-      <el-form-item>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer footer">
         <el-button type="primary" @click="submitForm(ruleFormRef)">
           发布
         </el-button>
         <el-button @click="resetForm(ruleFormRef)">
           关闭
         </el-button>
-      </el-form-item>
-    </el-form>
+      </div>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index 3d5c2e3..0926957 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -172,15 +172,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <el-button v-if="proxy.hasPerm('/sys/notice/list/add')" type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/sys/notice/list/export')" type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/sys/notice/list/print')" v-print="printObj" type="primary">
-          打印
-        </el-button>
+        <icon-button v-if="proxy.hasPerm('/sys/notice/list/add')" icon="icon-add" title="新建" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/sys/notice/list/export')" icon="icon-export" title="导出" @click="exportExcelBtn" />
+        <icon-button v-if="proxy.hasPerm('/sys/notice/list/print')" v-print="printObj" icon="icon-print" title="打印" />
       </template>
       <!-- 表格区域 -->
       <normal-table
diff --git a/src/views/system/notice/noticeDetail.vue b/src/views/system/notice/noticeDetail.vue
index 441ef0f..94468d4 100644
--- a/src/views/system/notice/noticeDetail.vue
+++ b/src/views/system/notice/noticeDetail.vue
@@ -97,15 +97,14 @@
         </el-link>
         <span v-else>暂无附件</span>
       </el-form-item>
-      <el-form-item>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer footer">
         <el-button type="primary" @click="submitForm()">
           确认
         </el-button>
-        <!-- <el-button @click="resetForm(ruleFormRef)">
-          关闭
-        </el-button> -->
-      </el-form-item>
-    </el-form>
+      </div>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/src/views/system/tool/autograph/addDDialog.vue b/src/views/system/tool/autograph/addDDialog.vue
index d34e8ef..e39b706 100644
--- a/src/views/system/tool/autograph/addDDialog.vue
+++ b/src/views/system/tool/autograph/addDDialog.vue
@@ -200,15 +200,17 @@
         </el-button>
         <input v-show="title === '123'" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
-      <el-form-item>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer footer">
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
           发布
         </el-button>
         <el-button @click="resetForm(ruleFormRef)">
           关闭
         </el-button>
-      </el-form-item>
-    </el-form>
+      </div>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/src/views/system/tool/autograph/autograph.vue b/src/views/system/tool/autograph/autograph.vue
index 8fffe07..ac9f000 100644
--- a/src/views/system/tool/autograph/autograph.vue
+++ b/src/views/system/tool/autograph/autograph.vue
@@ -191,15 +191,9 @@
     <table-container>
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/add')" type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/export')" type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/print')" v-print="printObj" type="primary">
-          打印
-        </el-button>
+        <icon-button v-if="proxy.hasPerm('/sys/tool/autograph/add')" icon="icon-add" title="新建" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/sys/tool/autograph/export')" icon="icon-export" title="导出" @click="exportExcelBtn" />
+        <icon-button v-if="proxy.hasPerm('/sys/tool/autograph/print')" v-print="printObj" icon="icon-print" title="打印" />
       </template>
       <!-- 表格区域 -->
       <normal-table
diff --git a/src/views/system/tool/certificate/addDDialog.vue b/src/views/system/tool/certificate/addDDialog.vue
index 330f2de..2721bf8 100644
--- a/src/views/system/tool/certificate/addDDialog.vue
+++ b/src/views/system/tool/certificate/addDDialog.vue
@@ -199,15 +199,17 @@
         </el-button>
         <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
       </el-form-item>
-      <el-form-item>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer footer">
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
           发布
         </el-button>
         <el-button @click="resetForm(ruleFormRef)">
           关闭
         </el-button>
-      </el-form-item>
-    </el-form>
+      </div>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/src/views/system/tool/certificate/certificate.vue b/src/views/system/tool/certificate/certificate.vue
index 5ac1900..9787116 100644
--- a/src/views/system/tool/certificate/certificate.vue
+++ b/src/views/system/tool/certificate/certificate.vue
@@ -192,15 +192,9 @@
     <table-container>
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button v-if="proxy.hasPerm('/sys/tool/certificate/add')" type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/sys/tool/certificate/export')" type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/sys/tool/certificate/print')" v-print="printObj" type="primary">
-          打印
-        </el-button>
+        <icon-button v-if="proxy.hasPerm('/sys/tool/certificate/add')" icon="icon-add" title="新建" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/sys/tool/certificate/export')" icon="icon-export" title="导出" @click="exportExcelBtn" />
+        <icon-button v-if="proxy.hasPerm('/sys/tool/certificate/print')" v-print="printObj" icon="icon-print" title="打印" />
       </template>
       <!-- 表格区域 -->
       <normal-table
diff --git a/src/views/system/tool/document/addDDialog.vue b/src/views/system/tool/document/addDDialog.vue
index 33ffdaa..c440d1d 100644
--- a/src/views/system/tool/document/addDDialog.vue
+++ b/src/views/system/tool/document/addDDialog.vue
@@ -200,15 +200,17 @@
         </el-button>
         <input v-show="title === ''" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
-      <el-form-item>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer footer">
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
           发布
         </el-button>
         <el-button @click="resetForm(ruleFormRef)">
           关闭
         </el-button>
-      </el-form-item>
-    </el-form>
+      </div>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/src/views/system/tool/document/document.vue b/src/views/system/tool/document/document.vue
index 58d12f9..774e498 100644
--- a/src/views/system/tool/document/document.vue
+++ b/src/views/system/tool/document/document.vue
@@ -191,15 +191,9 @@
     <table-container>
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button v-if="proxy.hasPerm('/sys/tool/document/add')" type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/sys/tool/document/export')" type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/sys/tool/document/print')" v-print="printObj" type="primary">
-          打印
-        </el-button>
+        <icon-button v-if="proxy.hasPerm('/sys/tool/document/add')" icon="icon-add" title="新建" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/sys/tool/document/export')" icon="icon-export" title="导出" @click="exportExcelBtn" />
+        <icon-button v-if="proxy.hasPerm('/sys/tool/document/print')" v-print="printObj" icon="icon-print" title="打印" />
       </template>
       <!-- 表格区域 -->
       <normal-table

diff --git a/src/components.d.ts b/src/components.d.ts
index 6e85584..815d62f 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -16,14 +16,13 @@
     BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default']
     BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
-    Benchcol: typeof import('./components/benchcol/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/DetailPage/index copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
+    DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
diff --git a/src/components/DetailPage/DetailBlockSwitch.vue b/src/components/DetailPage/DetailBlockSwitch.vue
new file mode 100644
index 0000000..4d92074
--- /dev/null
+++ b/src/components/DetailPage/DetailBlockSwitch.vue
@@ -0,0 +1,71 @@
+<script lang="ts" setup name="DetailBlock">
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+})
+
+const slots = useSlots()
+</script>
+
+<template>
+  <div class="detail-main">
+    <div class="header">
+      <div class="menu">
+        <slot name="menu" />
+      </div>
+      <div class="title">
+        {{ title }}
+      </div>
+      <div class="btns">
+        <slot name="btns" />
+      </div>
+    </div>
+    <div v-if="slots.default" class="content">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-main {
+  background-color: #fff;
+  border-radius: 8px;
+  margin-top: 10px;
+  padding-top: 10px;
+
+  .header {
+    position: relative;
+    height: 40px;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+
+    .title {
+      font-weight: 500;
+    }
+
+    .btns {
+      position: absolute;
+      right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+
+    .menu {
+      position: absolute;
+      left: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+
+  .content {
+    background-color: #fff;
+    padding: 0 10px 20px;
+    margin-top: 10px;
+  }
+}
+</style>
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d6c1c91..1644a80 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -314,6 +314,39 @@
       },
     ],
   },
+  {
+    path: '/borrow',
+    component: Layout,
+    redirect: '/device/borrow/borrowapply',
+    name: 'Borrow',
+    meta: {
+      title: '设备领用',
+      icon: 'ep:key',
+      auth: '/device/borrow',
+    },
+    children: [
+      {
+        path: 'borrowapply',
+        name: 'borroWapply',
+        component: () => import('@/views/device/borrow/borrwoApply.vue'),
+        meta: {
+          title: '设备借用申请',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowapply',
+        },
+      },
+      {
+        path: 'borrowhandle',
+        name: 'borrowHandle',
+        component: () => import('@/views/device/borrow/borrowHandle.vue'),
+        meta: {
+          title: '设备借用处理',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowhandle',
+        },
+      },
+    ],
+  },
 
 ]
 
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
new file mode 100644
index 0000000..1c2405e
--- /dev/null
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="borrowHandle">
+// 逻辑代码
+</script>
+
+<template>
+  <app-container>
+    设备借用处理
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
new file mode 100644
index 0000000..03d414b
--- /dev/null
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="borrowApply">
+// 逻辑代码
+</script>
+
+<template>
+  <app-container>
+    设备借用申请
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index c2682fc..5f7b347 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -339,381 +339,374 @@
 
 <template>
   <div class="body-container">
-    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资产编号" prop="assetNo">
-            <el-input v-model.trim="ruleForm.assetNo" placeholder="系统自动生成" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="资产类型" prop="assetType">
-            <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备编号" prop="equipmentNo">
-            <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备名称" prop="equipmentName">
-            <el-input v-model.trim="ruleForm.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="生产厂家" prop="manufacturer">
-            <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="厂家国别" prop="manufacturerCountry">
-            <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="出厂编号" prop="manufacturingNo">
-            <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="出厂年月" prop="manufacturingDate">
-            <el-date-picker
-              v-model="ruleForm.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '出厂年月'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="型号" prop="modelNo">
-            <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="管理状态" prop="managerState">
-            <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="ABC" prop="abc">
-            <el-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'">
-              <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="标签绑定" prop="labelBind">
-            <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === '详情' ? '' : '标签'" :disabled="title === '详情'" clearable>
-              <template #append>
-                <el-button type="primary" size="small">
-                  扫描
-                </el-button>
-              </template>
-            </el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="立卡年月" prop="cardEstablishmentDate">
-            <el-date-picker
-              v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '立卡年月'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="启用日期" prop="enableDate">
-            <el-date-picker
-              v-model="ruleForm.enableDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '启用日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定方式" prop="mesureType">
-            <el-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'">
-              <el-option v-for="item in mesureTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定周期" prop="mesureCycle">
-            <el-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="12">
-          <el-form-item label="测量范围" prop="mesureRange">
-            <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === '详情' ? '' : '测量范围'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="不确定度" prop="uncertainty">
-            <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === '详情' ? '' : '不确定度'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="使用部门" prop="useDept">
-            <com-tree-select
-              v-if="title !== '详情'"
-              v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-              :tree-props="deptProps"
-            />
-            <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
-              <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="使用人" prop="usePerson">
-            <el-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'">
-              <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="专业分类" prop="majorCategory">
-            <el-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'">
-              <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="检定部门" prop="mesureDept">
-            <com-tree-select
-              v-if="title !== '详情'"
-              v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-              :tree-props="deptProps"
-            />
-            <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
-              <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定日期" prop="mesureDate">
-            <el-date-picker
-              v-model="ruleForm.mesureDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '检定日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="有效日期" prop="validDate">
-            <el-date-picker
-              v-model="ruleForm.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '有效日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定结果" prop="mesureResult">
-            <el-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'">
-              <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="8">
-          <el-form-item label="是否是技术指标需要校准/检定的设备" prop="isCalibrationTestEquipment" label-width="260px">
-            <el-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否是测量工装台账" prop="isMeasureAccount" label-width="260px">
-            <el-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否标准配套设备" prop="isStandardSupportEquipment" label-width="260px">
-            <el-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
+    <detail-block-switch title="基本信息">
+      <template #menu>
+        <slot name="menuswitch" />
+      </template>
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资产编号" prop="assetNo">
+              <el-input v-model.trim="ruleForm.assetNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="资产类型" prop="assetType">
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备编号" prop="equipmentNo">
+              <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="生产厂家" prop="manufacturer">
+              <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="厂家国别" prop="manufacturerCountry">
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号" prop="manufacturingNo">
+              <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂年月" prop="manufacturingDate">
+              <el-date-picker
+                v-model="ruleForm.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '出厂年月'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="型号" prop="modelNo">
+              <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="管理状态" prop="managerState">
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="ABC" prop="abc">
+              <el-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'">
+                <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标签绑定" prop="labelBind">
+              <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === '详情' ? '' : '标签'" :disabled="title === '详情'" clearable>
+                <template #append>
+                  <el-button type="primary" size="small">
+                    扫描
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="立卡年月" prop="cardEstablishmentDate">
+              <el-date-picker
+                v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '立卡年月'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="启用日期" prop="enableDate">
+              <el-date-picker
+                v-model="ruleForm.enableDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '启用日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定方式" prop="mesureType">
+              <el-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'">
+                <el-option v-for="item in mesureTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定周期" prop="mesureCycle">
+              <el-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="测量范围" prop="mesureRange">
+              <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === '详情' ? '' : '测量范围'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="不确定度" prop="uncertainty">
+              <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === '详情' ? '' : '不确定度'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="使用部门" prop="useDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
+                :tree-props="deptProps"
+              />
+              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="使用人" prop="usePerson">
+              <el-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'">
+                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="专业分类" prop="majorCategory">
+              <el-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'">
+                <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="检定部门" prop="mesureDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                :tree-props="deptProps"
+              />
+              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定日期" prop="mesureDate">
+              <el-date-picker
+                v-model="ruleForm.mesureDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '检定日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="有效日期" prop="validDate">
+              <el-date-picker
+                v-model="ruleForm.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '有效日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定结果" prop="mesureResult">
+              <el-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'">
+                <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="8">
+            <el-form-item label="是否是技术指标需要校准/检定的设备" prop="isCalibrationTestEquipment" label-width="260px">
+              <el-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否是测量工装台账" prop="isMeasureAccount" label-width="260px">
+              <el-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否标准配套设备" prop="isStandardSupportEquipment" label-width="260px">
+              <el-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资产来源" prop="assetSource">
-            <el-input v-model.trim="ruleForm.assetSource" :placeholder="title === '详情' ? '' : '资产来源'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备规格" prop="equipmentSpecifications">
-            <el-input v-model.trim="ruleForm.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备类别" prop="equipmentCategory">
-            <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
-              <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备类型" prop="equipmentType">
-            <el-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'">
-              <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资本来源" prop="capitalSource">
-            <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
-              <el-option v-for="item in capitalSourceList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="管理级别" prop="managerLevel">
-            <el-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'">
-              <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="用途" prop="purpose">
-            <el-input v-model.trim="ruleForm.purpose" :placeholder="title === '详情' ? '' : '用途'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="技术水平" prop="technicalLevel">
-            <el-input v-model.trim="ruleForm.technicalLevel" :placeholder="title === '详情' ? '' : '技术水平'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="完好状态" prop="intactState">
-            <el-input v-model.trim="ruleForm.intactState" :placeholder="title === '详情' ? '' : '完好状态'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="外形尺寸" prop="overallDimension">
-            <el-input v-model.trim="ruleForm.overallDimension" :placeholder="title === '详情' ? '' : '外形尺寸'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="重量(吨)" prop="weight">
-            <el-input v-model.trim="ruleForm.weight" :placeholder="title === '详情' ? '' : '重量'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="单价" prop="singlePrice">
-            <el-input v-model.trim="ruleForm.singlePrice" :placeholder="title === '详情' ? '' : '单价'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="安装及杂费" prop="installIncidentalExpenses">
-            <el-input v-model.trim="ruleForm.installIncidentalExpenses" :placeholder="title === '详情' ? '' : '安装及杂费'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="安装地点" prop="installPlace">
-            <el-input v-model.trim="ruleForm.installPlace" :placeholder="title === '详情' ? '' : '安装地点'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="原值" prop="originValue">
-            <el-input v-model.trim="ruleForm.originValue" :placeholder="title === '详情' ? '' : '原值'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="目前原值" prop="presentOriginValue">
-            <el-input v-model.trim="ruleForm.presentOriginValue" :placeholder="title === '详情' ? '' : '目前原值'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="折旧年限" prop="depreciationPeriod">
-            <el-input v-model.trim="ruleForm.depreciationPeriod" :placeholder="title === '详情' ? '' : '折旧年限'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="折旧方法" prop="depreciationMethod">
-            <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
-              <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="属性" prop="attribute">
-            <el-input v-model.trim="ruleForm.attribute" placeholder="属性" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="12">
-          <el-form-item label="说明书" prop="minioFileName">
-            <show-photo :minio-file-name="ruleForm.fileList[0]?.minioFileName || ''" />
-            <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
-            <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
-              {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
-            </el-button>
-            <span v-if="title === '详情' && !ruleForm.fileList[0]?.minioFileName">暂无</span>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="24">
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" placeholder="备注" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资产来源" prop="assetSource">
+              <el-input v-model.trim="ruleForm.assetSource" :placeholder="title === '详情' ? '' : '资产来源'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备规格" prop="equipmentSpecifications">
+              <el-input v-model.trim="ruleForm.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备类别" prop="equipmentCategory">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+                <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备类型" prop="equipmentType">
+              <el-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'">
+                <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资本来源" prop="capitalSource">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+                <el-option v-for="item in capitalSourceList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="管理级别" prop="managerLevel">
+              <el-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'">
+                <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="用途" prop="purpose">
+              <el-input v-model.trim="ruleForm.purpose" :placeholder="title === '详情' ? '' : '用途'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="技术水平" prop="technicalLevel">
+              <el-input v-model.trim="ruleForm.technicalLevel" :placeholder="title === '详情' ? '' : '技术水平'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="完好状态" prop="intactState">
+              <el-input v-model.trim="ruleForm.intactState" :placeholder="title === '详情' ? '' : '完好状态'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="外形尺寸" prop="overallDimension">
+              <el-input v-model.trim="ruleForm.overallDimension" :placeholder="title === '详情' ? '' : '外形尺寸'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="重量(吨)" prop="weight">
+              <el-input v-model.trim="ruleForm.weight" :placeholder="title === '详情' ? '' : '重量'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="单价" prop="singlePrice">
+              <el-input v-model.trim="ruleForm.singlePrice" :placeholder="title === '详情' ? '' : '单价'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="安装及杂费" prop="installIncidentalExpenses">
+              <el-input v-model.trim="ruleForm.installIncidentalExpenses" :placeholder="title === '详情' ? '' : '安装及杂费'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="安装地点" prop="installPlace">
+              <el-input v-model.trim="ruleForm.installPlace" :placeholder="title === '详情' ? '' : '安装地点'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="原值" prop="originValue">
+              <el-input v-model.trim="ruleForm.originValue" :placeholder="title === '详情' ? '' : '原值'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="目前原值" prop="presentOriginValue">
+              <el-input v-model.trim="ruleForm.presentOriginValue" :placeholder="title === '详情' ? '' : '目前原值'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="折旧年限" prop="depreciationPeriod">
+              <el-input v-model.trim="ruleForm.depreciationPeriod" :placeholder="title === '详情' ? '' : '折旧年限'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="折旧方法" prop="depreciationMethod">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+                <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="属性" prop="attribute">
+              <el-input v-model.trim="ruleForm.attribute" placeholder="属性" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="说明书" prop="minioFileName">
+              <show-photo :minio-file-name="ruleForm.fileList[0]?.minioFileName || ''" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
+                {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
+              </el-button>
+              <span v-if="title === '详情' && !ruleForm.fileList[0]?.minioFileName">暂无</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" placeholder="备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block-switch>
   </div>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    padding-top: 20px;
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index f46553a..fc3fd54 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -360,20 +360,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          固定资产-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`固定资产-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -763,44 +758,11 @@
           </el-row>
         </div> -->
       </el-form>
-    </div>
+    </detail-page>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index 0abbdb1..6e88e96 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -74,33 +74,29 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ name }} -{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm">
-            关闭
-          </el-button>
-        </span>
-      </div>
-      <div class="body">
-        <!-- 三级菜单 -->
-        <el-radio-group v-model="current">
-          <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
-            {{ item.name }}
-          </el-radio-button>
-        </el-radio-group>
-      </div>
-      <!-- 展示区域 -->
-      <keep-alive>
-        <component :is="currentComp" ref="currentCompRef" :name="current" :title="title" :row="row" />
-      </keep-alive>
-    </div>
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <!-- 展示区域 -->
+    <keep-alive>
+      <component :is="currentComp" ref="currentCompRef" :name="current" :title="title" :row="row">
+        <template #menuswitch>
+          <!-- 三级菜单 -->
+          <el-radio-group v-model="current">
+            <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+              {{ item.name }}
+            </el-radio-button>
+          </el-radio-group>
+        </template>
+      </component>
+    </keep-alive>
   </app-container>
 </template>
 
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f9cdcd0..f653095 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -256,7 +256,7 @@
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
-  // 原生上传图片
+  // 原生上传
   // console.log(event.target.files)
   // if (event.target.files[0].type === 'application/pdf') {
   if (event.target.files?.length !== 0) {
@@ -354,7 +354,7 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" type="primary" @click="identify">
+          <!-- <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" type="primary" @click="identify">
             标签识别
           </el-button>
           <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/import`)" type="primary" @click="batchImport">
@@ -371,7 +371,13 @@
           </el-button>
           <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/print`)" v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/device/standingBook/components/templateTable.vue b/src/views/device/standingBook/components/templateTable.vue
index 8a928f0..7aa563f 100644
--- a/src/views/device/standingBook/components/templateTable.vue
+++ b/src/views/device/standingBook/components/templateTable.vue
@@ -245,11 +245,11 @@
   <div>
     <!-- 添加证书信息组件 -->
     <add-row ref="addRowRef" @add="addRowData" />
-    <div class="header">
-      <div class="title">
-        <!-- {{ $props.name }} -->
-      </div>
-      <span class="btns">
+    <detail-block-switch :title="name">
+      <template #menu>
+        <slot name="menuswitch" />
+      </template>
+      <template #btns>
         <el-button v-if="title !== '详情'" type="info" @click="removeRow">
           删除行
         </el-button>
@@ -259,55 +259,33 @@
         <el-button v-if="title !== '详情'" type="primary" @click="editRow">
           编辑行
         </el-button>
-      </span>
-    </div>
-    <!-- 表格区域 -->
-    <normal-table
-      id="print"
-      :data="list" :total="total" :columns="columns as any"
-      :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-      :list-loading="loadingTable"
-      style="padding-top: 20px;background-color: #fff;"
-      @change="changePage"
-    >
-      <template #preColumns>
-        <el-table-column label="" width="55" align="center">
-          <template #default="scope">
-            <el-radio v-model="select" :label="scope.$index" class="radio" />
-          </template>
-        </el-table-column>
-        <el-table-column label="序号" width="55" align="center">
-          <template #default="scope">
-            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-          </template>
-        </el-table-column>
       </template>
-    </normal-table>
+      <!-- 表格区域 -->
+      <normal-table
+        id="print"
+        :data="list" :total="total" :columns="columns as any"
+        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+        :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </detail-block-switch>
   </div>
 </template>
 
 <style lang="scss" scoped>
-.header {
-  background-color: #fff;
-  // height: 40px;
-  border-radius: 8px;
-  display: flex;
-  align-items: center;
-  flex-direction: column;
-  justify-content: center;
-  position: relative;
-
-  .title {
-    // font-weight: 700;
-  }
-
-  .btns {
-    position: absolute;
-    right: 40px;
-    top: -22px;
-  }
-}
-
 :deep(.el-radio__label) {
   display: none;
 }
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 7538bc8..78a3800 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -272,24 +272,12 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/identify`)" type="primary" @click="identify">
-            标签识别
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/import`)" type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/mould`)" type="primary" @click="templateDownload">
-            模板下载
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/add`)" type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/export`)" type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/print`)" v-print="printObj" type="primary">
-            打印
-          </el-button>
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/identify`)" icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index fc364c8..e74d70e 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -361,20 +361,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ name }} - {{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -458,73 +453,33 @@
           </el-col>
         </el-row>
       </el-form>
-      <div v-if="title !== '新建' ">
-        <div class="header" style="margin-top: 10px;">
-          <div class="title">
-            审批流程
-          </div>
-        </div>
-        <div class="timeline">
-          <el-timeline>
-            <el-timeline-item timestamp="2018/4/12" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/12 20:46</p>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="2018/4/3" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/3 20:46</p>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="2018/4/2" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/2 20:46</p>
-              </el-card>
-            </el-timeline-item>
-          </el-timeline>
-        </div>
-      </div>
-    </div>
+    </detail-page>
+    <detail-block v-if="title !== '新建' " title="审批流程">
+      <el-timeline>
+        <el-timeline-item timestamp="2018/4/12" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/12 20:46</p>
+          </el-card>
+        </el-timeline-item>
+        <el-timeline-item timestamp="2018/4/3" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/3 20:46</p>
+          </el-card>
+        </el-timeline-item>
+        <el-timeline-item timestamp="2018/4/2" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/2 20:46</p>
+          </el-card>
+        </el-timeline-item>
+      </el-timeline>
+    </detail-block>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .timeline {
   background-color: #fff;
 }
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index aa3963f..737568d 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -1,6 +1,6 @@
 <!-- 状态管理公共列表组件 -->
 <script lang="ts" setup>
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessageBox } from 'element-plus'
 import approve from './approvalActionDialog.vue'
 import addDialog from './templateAdd.vue'
 const props = defineProps({
@@ -142,7 +142,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: any) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     title: '详情',
@@ -150,7 +150,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: any) => {
   dialogVisible.value = true
   // addRef.value.initDialog({
   //   title: '编辑',
@@ -158,7 +158,7 @@
   // })
 }
 // 删除
-const remove = (row) => {
+const remove = (row: any) => {
   ElMessageBox.confirm(
     `确认删除${row.equipmentName}吗？`,
     '提示',
@@ -181,20 +181,20 @@
   // })
 }
 // 同意
-const agree = (row) => {
+const agree = (row: any) => {
   console.log(approveRef.value)
   approveRef.value.initDialog({
     radio: '1',
   })
 }
 // 驳回
-const reject = (row) => {
+const reject = (row: any) => {
   approveRef.value.initDialog({
     radio: '3',
   })
 }
 // 拒绝
-const refuse = (row) => {
+const refuse = (row: any) => {
   approveRef.value.initDialog(
     {
       radio: '2',
@@ -202,7 +202,7 @@
   )
 }
 // 取消
-const cancel = (row) => {
+const cancel = (rowrow: any) => {
   ElMessageBox.confirm(
     '确认取消吗？',
     '提示',
@@ -301,20 +301,20 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+          <el-input placeholder="申请编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="设备编号" clearable class="w-50 m-2" />
+          <el-input placeholder="设备编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.modelNo" placeholder="设备名称" clearable class="w-50 m-2" />
+          <el-input placeholder="设备名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请单位" clearable class="w-50 m-2" />
+          <el-input placeholder="申请单位" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.publisher" placeholder="申请状态" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" />
+          <el-select placeholder="申请状态" clearable>
+            <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" /> -->
           </el-select>
         </search-item>
       </search-area>
@@ -328,7 +328,10 @@
           <el-button type="primary" @click="templateDownload">
             模板下载
           </el-button> -->
-          <el-button type="primary" @click="add">
+          <icon-button icon="icon-add" title="新建" @click="add" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+          <!-- <el-button type="primary" @click="add">
             新建
           </el-button>
           <el-button type="primary" @click="exportExcelBtn">
@@ -336,7 +339,7 @@
           </el-button>
           <el-button v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
         </template>
         <!-- 表格区域 -->
         <normal-table
@@ -386,22 +389,3 @@
     </app-container>
   </div>
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 154px !important;
-}
-
-.normal-date {
-  width: 154px !important;
-}
-
-.normal-select {
-  width: 154px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
-
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 0763c5a..9ef0b93 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -19,7 +19,6 @@
 const effectiveStatusName = ref('')
 const title = ref('')
 const fileList = ref<UploadUserFile[]>([])
-console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -80,10 +79,9 @@
   if (row.title === '新建') {
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
-    ruleForm.publisher = ''
+    ruleForm.publisher = userInfo.$state.deptName
     ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 判断有无存储
-    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
     if (sessionStorage.getItem(fileTypeName.value)) {
       const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
       ruleForm.fileType = session.fileType
@@ -117,6 +115,8 @@
     ruleForm.remark = row.remark
     ruleForm.publishTime = row.publishTime
     ruleForm.minioFileName = row.minioFileName
+    // ruleForm.publisher = '0'
+    // ruleForm.createUserId = '1'
   }
 }
 defineExpose({ initDialog })
@@ -148,6 +148,9 @@
       type: 'warning',
     },
       ).then((res) => {
+        if (ruleForm.publisher === userInfo.$state.deptName) {
+          ruleForm.publisher === userInfo.$state.deptId
+        }
         if (flag == '提交') {
           addApi(ruleForm).then((res) => {
             if (res.code == 200) {
@@ -193,7 +196,6 @@
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        console.log(res.data[0])
         ruleForm.minioFileName = res.data[0]
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
@@ -216,7 +218,6 @@
 // ])
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
-  console.log(diffDat)
   if (diffDat < 0) {
     // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '在使用'
@@ -237,7 +238,7 @@
 
 <template>
   <app-container v-if="dialogVisible" style="overflow: hidden;">
-    <detail-page :title="`${title}${fileTypeName}`">
+    <detail-page :title="`${fileTypeName}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
           提交
@@ -278,12 +279,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="发布单位" prop="publisher">
-              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'" class="fill-input">
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled>
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
               <com-tree-select
                 v-else
-                v-model="ruleForm.publisher" :options="PubListTree" placeholder="选择组织机构"
+                v-model="ruleForm.publisher" :options="PubListTree" placeholder="请选择发布单位"
                 :tree-props="deptProps"
               />
             </el-form-item>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 44e3e4d..b45fbc3 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -324,22 +324,9 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <!-- <el-button type="primary" @click="batchImport">
-            批量导入
-          </el-button> -->
-          <!-- <el-button type="primary" @click="templateDownload">
-            模板下载
-          </el-button> -->
-          <!-- <el-button type="primary" @click="add">
-            新建
-          </el-button> -->
-          <el-button type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-print="printObj" type="primary">
-            打印
-          </el-button>
+          <!-- <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange"> -->
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 4677e48..7d4724b 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -204,13 +204,9 @@
     loading.close()
   })
 }
-// 打印
-const print = () => {
-
-}
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
-  // 原生上传图片
+  // 原生上传
   // console.log(event.target.files)
   // if (event.target.files[0].type === 'application/pdf') {
   if (event.target.files?.length !== 0) {
@@ -264,7 +260,7 @@
         <search-item>
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
-        <search-item>
+        <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
@@ -273,13 +269,13 @@
               :value="item.value"
             />
           </el-select>
-        </search-item>
+        </search-item> -->
         <search-item>
           <el-date-picker
             v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 155px;"
+            style="width: 185px;"
           />
         </search-item>
         <search-item>
@@ -287,19 +283,19 @@
             v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 155px;"
+            style="width: 185px;"
           />
         </search-item>
         <search-item>
-          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select> -->
-          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
+          </el-select>
+          <!-- <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" /> -->
         </search-item>
       </search-area>
       <table-container>
@@ -310,7 +306,7 @@
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
-          <icon-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" @click="print" />
+          <icon-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index cf0dd4f..5ca3275 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -3,11 +3,11 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { detailType } from '../measureDept-interface'
-import { getUserList } from '@/api/system/user'
+// import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
+import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import type { userType } from '@/views/system/user/user-interface'
 import { listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
-import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
 const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -31,11 +31,20 @@
   technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
+// 获取计量人员列表
 const getuser = () => {
-  getUserList({ offset: 1, limit: 99999 }).then((res) => {
-    userList.value = res.data.rows
+  getStaffList({
+    staffNo: '', // 人员编号
+    name: '', // 姓名
+    deptId: ruleForm.value.deptId, // 所在部门
+    limit: 999999,
+    offset: 1,
+  }).then((res) => {
+    if (res.code === 200) {
+      userList.value = res.data.records
+    }
   })
-} // 获取用户列表
+}
 const technologyJobList = ref<{ id: string;name: string;value: string }[]>([])
 // 获取技术职务列表
 const getTechnologyJobList = () => {
@@ -50,7 +59,16 @@
     administrationJobList.value = response.data
   })
 }
-
+// 选择负责人自动填充职务信息
+const directorChange = (val: string) => {
+  const selectUser = userList.value.filter(item => item.name === val)[0]
+  getStaffDetail(selectUser).then((res) => {
+    if (res.code === 200) {
+      ruleForm.value.administrationJob = res.data.administrationJob
+      ruleForm.value.technologyJob = res.data.technologyJob
+    }
+  })
+}
 // 提交
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
@@ -95,12 +113,6 @@
 const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
-// const searchQuery = ref({
-//   limit: 10,
-//   offset: 1,
-//   total: 0,
-//   pageSizes: [10, 20, 30],
-// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -410,20 +422,6 @@
     }
   })
 }
-// const handleSizeChange = (val: number) => {
-//   searchQuery.value.limit = val
-//   getDepartmentList()
-//   getuserInfoList()
-//   getInstrumentInfo()
-//   getDeviceInfo()
-// }
-// const handleCurrentChange = (val: number) => {
-//   searchQuery.value.offset = val
-//   getDepartmentList()
-//   getuserInfoList()
-//   getInstrumentInfo()
-//   getDeviceInfo()
-// }
 // 弹窗初始化
 const initDialog = (row: any) => {
   reset()
@@ -460,22 +458,17 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title.split('-')[2] === '编辑'" type="primary" @click="submitForm(ruleFormRef)">
-            提交
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="title">
+      <template #btns>
+        <el-button v-if="title.split('-')[2] === '编辑'" type="primary" @click="submitForm(ruleFormRef)">
+          提交
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title.split('-')[2] === '详情' ? 'isDetail' : '']">
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item :label=" `${title.split('-')[1]}编号`" prop="organizeNo">
               <el-input v-model.trim="ruleForm.organizeNo" placeholder="系统自动生成" disabled />
@@ -487,7 +480,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="title.split('-')[1] === '工程组'" :gutter="24" class="marg">
+        <el-row v-if="title.split('-')[1] === '工程组'" :gutter="24">
           <el-col :span="6">
             <el-form-item label="科室编号">
               <el-input v-model.trim="ruleForm.pDeptId" disabled />
@@ -509,10 +502,10 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
-              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" @change="directorChange">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.name" />
               </el-select>
             </el-form-item>
@@ -532,7 +525,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="24">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
               <el-input v-model.trim="ruleForm.remark" :placeholder="title.split('-')[2] === '详情' ? '' : '备注'" :disabled="title.split('-')[2] === '详情'" />
@@ -540,85 +533,24 @@
           </el-col>
         </el-row>
       </el-form>
-      <!-- 科室信息-人员信息等列表切换 -->
-      <div>
-        <div class="header" style="margin-top: 10px;">
-          <!-- 切换 -->
-          <el-radio-group v-model="current" class="change-btn">
-            <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
-              {{ item.name }}
-            </el-radio-button>
-          </el-radio-group>
-          <div class="title">
-            {{ current }}
-          </div>
-          <span class="btns">
-          <!-- <el-button type="info" :disabled="title === '详情'" @click="removeRow">
-            删除行
-          </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
-            添加行
-          </el-button> -->
-          </span>
-        </div>
-        <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <el-table-column type="index" label="序号" width="55" align="center" />
-          <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
-        </el-table>
-        <!-- <div style="width: 100%;margin-top: 10px;">
-          <el-pagination
-            :current-page="searchQuery.offset"
-            :page-sizes="searchQuery.pageSizes"
-            :page-size="searchQuery.limit"
-            :total="searchQuery.total"
-            layout="total, sizes, prev, pager, next"
-            hide-on-single-page
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-          />
-        </div> -->
-      </div>
-    </div>
+    </detail-page>
+    <detail-block-switch :title="current">
+      <template #menu>
+        <el-radio-group v-model="current" class="change-btn">
+          <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
+            {{ item.name }}
+          </el-radio-button>
+        </el-radio-group>
+      </template>
+      <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
+        <el-table-column type="index" label="序号" width="55" align="center" />
+        <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </detail-block-switch>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-    position: relative;
-
-    .change-btn {
-      position: absolute;
-      left: 40px;
-      top: 4px;
-    }
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 4px;
-    }
-  }
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
@@ -628,8 +560,4 @@
     }
   }
 }
-
-.marg {
-  margin-top: 10px;
-}
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 9ad87af..aac1ef2 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -231,12 +231,14 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
+          <!-- <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
           <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
+          <icon-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 2e3322a..3f472eb 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -41,7 +41,7 @@
   { text: '证书号', value: 'certificateNo', align: 'center' },
   { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
   { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'validDate', align: 'center', width: '200' },
   { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
 ]) // 表格
 const certificateStatusList = ref([
@@ -90,7 +90,7 @@
   loadingTable.value = true
   getCertificateList(searchQuery).then((res) => {
     if (res.code === 200) {
-      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效' }))
+      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效', validDate: item.validDate.split(' ')[0], certificateDate: item.certificateDate.split(' ')[0] }))
       list.value = res.data.records
       total.value = Number(res.data.total)
     }
@@ -115,6 +115,7 @@
   addRef.value.initDialog({
     ...row,
     title: '详情',
+    name: props.isRemind ? '证书状况' : '证书记录',
   })
 }
 // 编辑
@@ -123,6 +124,7 @@
   addRef.value.initDialog({
     ...row,
     title: '编辑',
+    name: props.isRemind ? '证书状况' : '证书记录',
   })
 }
 
@@ -193,6 +195,7 @@
   dialogVisible.value = true
   addRef.value.initDialog({
     title: '新建',
+    name: props.isRemind ? '证书状况' : '证书记录',
   })
 }
 // 导出
@@ -292,21 +295,11 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
-            模板下载
-          </el-button>
-          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
-            打印
-          </el-button>
+          <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
@@ -325,7 +318,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column fixed="right" label="操作" align="center" width="150">
+            <el-table-column fixed="right" label="操作" align="center" width="180">
               <template #default="{ row }">
                 <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
                   提醒
@@ -336,7 +329,7 @@
                 <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 4dc1b17..4352604 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -69,7 +69,16 @@
     const IdCard = ruleForm.value.idCard
     const birthday = `${IdCard.substring(6, 10)}-${IdCard.substring(10, 12)}`
     ruleForm.value.birthday = birthday
-    console.log(ruleForm.value)
+    // 获取性别 第17位  奇数为男 偶数为女
+    // ruleForm.value.sex
+    if (Number(IdCard.substring(16, 17)) % 2) {
+      // 男
+      ruleForm.value.sex = '1'
+    }
+    else {
+      //  女
+      ruleForm.value.sex = '2'
+    }
   })
 }
 const dialogVisible = ref<boolean>(false) // 弹窗显示
@@ -130,7 +139,6 @@
     technologyExam: '', // 技术考核
     remark: '', // 备注
     certificateList: [], // 证书列表
-
   }
 }
 const technologyJobList = ref<technologyJobType[]>([])
@@ -309,7 +317,7 @@
           }
           (title.value === '新建'
             ? getStaffAdd
-            : getStaffupdate) ({ ...ruleForm.value, certificateList: changeList.value[0].data }).then((res) => {
+            : getStaffupdate) ({ ...ruleForm.value, certificateList: changeList.value[0].data, birthday: `${ruleForm.value.idCard.substring(6, 10)}-${ruleForm.value.idCard.substring(10, 12)}-${ruleForm.value.idCard.substring(12, 14)}` }).then((res) => {
             if (res.code == 200) {
               formEl?.resetFields()
               ElMessage.success('提交成功')
@@ -332,12 +340,14 @@
   emits('resetData')
   resetFormData()
 }
+const selectTreeRef = ref()
 // 弹窗初始化
 const initDialog = (row: any) => {
   changeList.value[0].data = []
   dialogVisible.value = true
   title.value = row.title
   resetFormData()
+  selectTreeRef.value?.clearSelected()
   getuser()
   getPubList()
   getSexList()
@@ -370,20 +380,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          计量人员-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
-            完成
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`计量人员-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+          完成
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
         <el-row :gutter="24" class="marg">
           <el-col :span="5">
@@ -394,6 +399,7 @@
                 :http-request="uploadQuarterlyEvaluateFile"
                 :before-upload="beforeAvatarUpload"
                 :disabled="title === '详情'"
+                accept="image/png, image/jpeg,image/jpg"
               >
                 <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
                 <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
@@ -425,8 +431,8 @@
               </el-select>
               <com-tree-select
                 v-else
-                v-model="ruleForm.deptId" :options="PubListTree" placeholder="选择组织机构"
-                :tree-props="deptProps"
+                ref="selectTreeRef" v-model="ruleForm.deptId" :options="PubListTree"
+                placeholder="选择组织机构" :tree-props="deptProps"
               />
             </el-form-item>
             <el-form-item label="计量专业" prop="major" class="marg-item">
@@ -489,29 +495,19 @@
           </el-col>
         </el-row>
       </el-form>
-      <!-- 证书基本信息 -->
-      <!-- 切换 -->
-      <!-- <el-radio-group v-model="current" style="margin-bottom: -15px;">
-          <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
-            {{ item.name }}
-          </el-radio-button>
-        </el-radio-group> -->
-      <div class="header" style="margin-top: 10px;">
-        <div class="title">
-          {{ current }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="info" @click="removeRow">
-            删除行
-          </el-button>
-          <el-button v-if="title !== '详情'" type="primary" @click="addRow">
-            添加行
-          </el-button>
-          <el-button v-if="title !== '详情'" type="primary" @click="editRow">
-            编辑行
-          </el-button>
-        </span>
-      </div>
+    </detail-page>
+    <detail-block :title="current">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="info" @click="removeRow">
+          删除行
+        </el-button>
+        <el-button v-if="title !== '详情'" type="primary" @click="addRow">
+          添加行
+        </el-button>
+        <el-button v-if="title !== '详情'" type="primary" @click="editRow">
+          编辑行
+        </el-button>
+      </template>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
         <el-table-column width="55" align="center">
           <template #default="scope">
@@ -523,7 +519,7 @@
         <el-table-column type="index" label="序号" width="55" />
         <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
       </el-table>
-    </div>
+    </detail-block>
     <!-- 添加证书信息组件 -->
     <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
     <!-- 选择用户列表组件 -->
@@ -532,77 +528,38 @@
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    background-color: #fff;
-    border-radius: 8px;
-    padding-top: 10px;
-    margin-top: 10px;
-    padding-right: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    display: flex;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    position: relative;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 5px;
-    }
-  }
-
-  :deep(.el-radio__label) {
-    display: none;
-  }
-
-  :deep(.el-icon.avatar-uploader-icon) {
-    font-size: 28px;
-    color: #8c939d;
-    width: 190px;
-    height: 250px;
-    text-align: center;
-  }
-
-  :deep(.avatar-uploader .avatar) {
-    width: 190px;
-    height: 250px;
-    display: block;
-  }
-
-  .isDetail {
-    ::v-deep {
-      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-        display: none;
-      }
-    }
-  }
+:deep(.el-radio__label) {
+  display: none;
 }
 
-.marg {
-  margin-top: 20px;
+:deep(.el-icon.avatar-uploader-icon) {
+  font-size: 28px;
+  color: #8c939d;
+  width: 190px;
+  height: 250px;
+  text-align: center;
 }
 
-.marg-item {
-  margin-top: 20px;
+:deep(.avatar-uploader .avatar) {
+  width: 190px;
+  height: 250px;
+  display: block;
+}
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
 }
 </style>
 
 <style scoped>
 .avatar-uploader .avatar {
-  width: 220px;
-  height: 320px;
+  width: 190px;
+  height: 250px;
   display: block;
 }
 </style>
@@ -624,8 +581,8 @@
 .el-icon.avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
-  width: 220px;
-  height: 320px;
+  width: 190px;
+  height: 250px;
   text-align: center;
 }
 </style>
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index ae48f11..042636e 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -4,7 +4,6 @@
 import dayjs from 'dayjs'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import type { technologyJobType } from '../person-interface'
-import certificateAddDialog from './certificateAddDialog.vue'
 import personListDialog from './personListDialog.vue'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
@@ -14,7 +13,8 @@
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
-const ruleFormRef = ref<FormInstance>() // from组件
+const ruleFormRef1 = ref<FormInstance>() // from组件
+const ruleFormRef2 = ref<FormInstance>() // from组件
 const meterStaff = ref({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -28,26 +28,43 @@
   workDate: '', // 从事日期
   id: '',
 })
+const baseInfo = ref({
+  certificateCompany: '',
+  certificateDate: '',
+  certificateName: '',
+  certificateNo: '',
+  validDate: '',
+  id: '',
+  isDel: 0,
+  minioFileName: '',
+  remark: '',
+})
 const ruleForm = ref({
   meterStaff: {}, // 人员信息
   staffId: '', // 计量人员id
 }) // 表单
-const multipleTableRef = ref<InstanceType<typeof ElTable>>()
 const title = ref('')
+const name = ref('')
 // 身份证号码验证规则
-const validateIDcard = (rule: any, value: any, callback: any) => {
-  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
-  if (rr.test(value)) {
-    callback()
-  }
-  else {
-    callback(new Error('验证失败'))
-  }
-}
+// const validateIDcard = (rule: any, value: any, callback: any) => {
+//   const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+//   if (rr.test(value)) {
+//     callback()
+//   }
+//   else {
+//     callback(new Error('验证失败'))
+//   }
+// }
 const rules = ref({
   staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
   // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
-
+}) // 表单验证规则
+const rules2 = ref({
+  certificateCompany: [{ required: true, message: '发证单位不能为空', trigger: 'blur' }],
+  certificateDate: [{ required: true, message: '发证日期不能为空', trigger: 'blur' }],
+  certificateName: [{ required: true, message: '证书名称不能为空', trigger: 'blur' }],
+  certificateNo: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
+  validDate: [{ required: true, message: '有效日期不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
 const userList = ref<userType[]>([]) // 可使用人列表
@@ -96,6 +113,17 @@
   meterStaff.value.major = ''
   meterStaff.value.workDate = ''
   meterStaff.value.id = ''
+  baseInfo.value = {
+    certificateCompany: '',
+    certificateDate: '',
+    certificateName: '',
+    certificateNo: '',
+    validDate: '',
+    id: '',
+    isDel: 0,
+    minioFileName: '',
+    remark: '',
+  }
 }
 const technologyJobList = ref<technologyJobType[]>([])
 // 获取技术职务列表
@@ -120,98 +148,14 @@
 const confirmPerson = (row: any) => {
   ruleForm.value.staffId = row.staffNo
   meterStaff.value = row
-  ruleFormRef.value?.clearValidate('staffNo')
+  ruleFormRef1.value?.clearValidate('staffNo')
 }
-const changeList = ref([
-  {
-    name: '证书基本信息',
-    data: [] as any[],
-    column: [
-      {
-        label: '证书号',
-        data: 'certificateNo',
-        id: 'zs02',
-      },
-      {
-        label: '证书名称',
-        data: 'certificateName',
-        id: 'zs03',
-      },
-      {
-        label: '发证日期',
-        data: 'certificateDate',
-        id: 'zs04',
-      },
-      {
-        label: '发证单位',
-        data: 'certificateCompany',
-        id: 'zs01',
-      },
-      {
-        label: '有效日期',
-        data: 'validDate',
-        id: 'zs05',
-      },
-    ],
-  },
-  {
-    name: '计量工作培训记录',
-    data: [],
-    column: [],
-  },
-  {
-    name: '业务记录',
-    data: [],
-    column: [],
-  },
-])
-const current = ref('证书基本信息')
-const currentShow = computed(() => {
-  return changeList.value.filter(item => item.name === current.value)[0]
-})
-const certificateRef = ref() // 添加证书信息弹窗
-// 添加行
-const addRow = () => {
-  certificateRef.value.initDialog({ title: '添加' })
-}
-// 编辑行
-const editRow = () => {
-  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
-}
-// 证书信息行内添加数据
-const addRowcertificate = (row: any, flag: string) => {
-  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
-  if (flag === 'update') {
-    changeList.value[0].data = [{
-      ...changeList.value[0].data[0],
-      ...row,
-      certificateStatus: diff < 0 ? '1' : '0',
-      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-    }]
-  }
-  else {
-    changeList.value[0].data.push(
-      {
-        ...row,
-        certificateStatus: diff < 0 ? '1' : '0',
-        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-        id: null,
-        isDel: 0,
-        minioFileName: '',
-        remark: '',
-        staffId: meterStaff.value.id,
-        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-      })
-  }
-}
-const currenSelect = ref<number>(-1) // 当前选中行
-// 删除行
-const removeRow = () => {
-  console.log(currenSelect.value)
-  if (currenSelect.value >= 0) {
+// 提交
+const submitForm = async (formEl1: FormInstance | undefined, formEl2: FormInstance | undefined) => {
+  if (!formEl1 || !formEl2) { return }
+  Promise.all([formEl1.validate(), formEl2.validate()]).then((res) => {
     ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
+      '确认提交吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -219,78 +163,49 @@
         type: 'warning',
       },
     ).then(() => {
-      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
-      currenSelect.value = -1
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 提交
-const submitForm = async (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  await formEl.validate((valid, fields) => {
-    if (valid) {
-      ElMessageBox.confirm(
-        '确认提交吗？',
-        '提示',
-        {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        },
-      ).then(() => {
-        let params
-        if (changeList.value[0].data.length) {
-          params = changeList.value[0].data
-        }
-        else {
-          params = [
-            {
-              certificateCompany: '',
-              certificateDate: '',
-              certificateName: '',
-              certificateNo: '',
-              certificateStatus: '',
-              createTime: '',
-              id: null,
-              isDel: 0,
-              minioFileName: '',
-              remark: '',
-              staffId: meterStaff.value.id,
-              updateTime: '',
-              validDate: '',
-            },
-          ]
-        }
-        (title.value === '新建'
-          ? addCertificateList
-          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
-          formEl?.resetFields()
-          ElMessage.success('提交成功')
-          emits('resetData')
-          resetFormData()
-        })
+      (title.value === '新建'
+        ? addCertificateList
+        : getCertificateUpdate)(title.value === '新建'
+        ? [{
+            ...baseInfo.value,
+            staffId: meterStaff.value.id,
+            createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+            updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+            certificateStatus: dayjs(baseInfo.value.validDate).diff(baseInfo.value.certificateDate, 'day') < 0 ? '1' : '0',
+            meterStaff: undefined,
+          }]
+        : {
+            ...baseInfo.value,
+            staffId: meterStaff.value.id,
+            createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+            updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+            certificateStatus: dayjs(baseInfo.value.validDate).diff(baseInfo.value.certificateDate, 'day') < 0 ? '1' : '0',
+            meterStaff: undefined,
+          }).then((res) => {
+        formEl1?.resetFields()
+        formEl2?.resetFields()
+        ElMessage.success('提交成功')
+        emits('resetData')
+        resetFormData()
       })
-    }
+    })
   })
 }
 // 取消
-const resetForm = (formEl: FormInstance | undefined) => {
+const resetForm = (formEl: FormInstance | undefined, formEl2: FormInstance | undefined) => {
   formEl?.resetFields()
-  changeList.value[0].data = []
+  formEl2?.resetFields()
   emits('resetData')
   resetFormData()
 }
+const selectTreeRef = ref()
 // 弹窗初始化
 const initDialog = (row: any) => {
-  changeList.value[0].data = []
   resetFormData()
   dialogVisible.value = true
   title.value = row.title
-  resetFormData()
+  name.value = row.name
+  selectTreeRef.value?.clearSelected()
   getuser()
   getPubList()
   getSexList()
@@ -303,8 +218,9 @@
   else {
     getCertificateDetail({ id: row.id }).then((res) => {
       if (res.code === 200) {
+        console.log(res, '证书记录')
         meterStaff.value = res.data.meterStaff
-        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+        baseInfo.value = res.data
       }
     })
   }
@@ -314,21 +230,16 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          证书记录-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
-            完成
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
-      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+    <detail-page :title=" `${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
+          完成
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef1, ruleFormRef2)">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef1" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="人员编号" prop="staffNo">
@@ -390,7 +301,8 @@
               </el-select>
               <com-tree-select
                 v-else
-                v-model="meterStaff.deptId" :options="PubListTree" placeholder="选择组织机构"
+                ref="selectTreeRef" v-model="meterStaff.deptId" :options="PubListTree"
+                placeholder="选择组织机构"
                 :tree-props="deptProps"
               />
             </el-form-item>
@@ -410,71 +322,52 @@
           </el-col>
         </el-row>
       </el-form>
-      <div class="header" style="margin-top: 10px;">
-        <div class="title">
-          {{ current }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title === '新建'" type="info" @click="removeRow">
-            删除行
-          </el-button>
-          <el-button v-if="title === '新建'" type="primary" @click="addRow">
-            添加行
-          </el-button>
-          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
-            编辑行
-          </el-button>
-        </span>
-      </div>
-      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
-        <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column>
-        <el-table-column type="index" label="序号" width="55" />
-        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
-      </el-table>
-    </div>
-    <!-- 添加证书信息组件 -->
-    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    </detail-page>
+    <detail-block title="证书基本信息">
+      <el-form ref="ruleFormRef2" :model="baseInfo" :rules="rules2" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="证书号" prop="certificateNo">
+              <el-input v-model.trim="baseInfo.certificateNo" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书名称" prop="certificateName">
+              <el-input v-model.trim="baseInfo.certificateName" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证单位" prop="certificateCompany">
+              <el-input v-model.trim="baseInfo.certificateCompany" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发证日期" prop="certificateDate">
+              <el-date-picker
+                v-model="baseInfo.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择发证日期"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书有效日期" prop="validDate">
+              <el-date-picker
+                v-model="baseInfo.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择有效日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block>
     <!-- 选择用户列表组件 -->
     <person-list-dialog ref="personListRef" @add="confirmPerson" />
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    background-color: #fff;
-    border-radius: 8px;
-    padding-top: 10px;
-    margin-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    display: flex;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    position: relative;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 5px;
-    }
-  }
-
   :deep(.el-radio__label) {
     display: none;
   }
@@ -487,40 +380,5 @@
       }
     }
   }
-}
-
-.marg {
-  margin-top: 20px;
-}
 </style>
 
-<style scoped>
-.avatar-uploader .avatar {
-  width: 178px;
-  height: 178px;
-  display: block;
-}
-</style>
-
-<style>
-.avatar-uploader .el-upload {
-  border: 1px dashed var(--el-border-color);
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-  transition: var(--el-transition-duration-fast);
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: var(--el-color-primary);
-}
-
-.el-icon.avatar-uploader-icon {
-  font-size: 28px;
-  color: #8c939d;
-  width: 178px;
-  height: 178px;
-  text-align: center;
-}
-</style>
diff --git a/src/views/measure/person/components/addRecordCancel.vue b/src/views/measure/person/components/addRecordCancel.vue
new file mode 100644
index 0000000..c32ac43
--- /dev/null
+++ b/src/views/measure/person/components/addRecordCancel.vue
@@ -0,0 +1,459 @@
+<!-- 计量人员新增  证书基本信息table表格   作废 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import type { technologyJobType } from '../person-interface'
+import certificateAddDialog from './certificateAddDialog.vue'
+import personListDialog from './personListDialog.vue'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import type { TreeStructure, userType } from '@/views/system/user/user-interface'
+import { getDictByCode } from '@/api/system/dict'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const meterStaff = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  idCard: '', // 身份证号
+  sex: '', // 性别
+  education: '', // 文化程度
+  technologyJob: '', // 技术职务
+  administrationJob: '', // 行政职务
+  deptId: '', // 工作部门
+  major: '', // 专业
+  workDate: '', // 从事日期
+  id: '',
+})
+const ruleForm = ref({
+  meterStaff: {}, // 人员信息
+  staffId: '', // 计量人员id
+}) // 表单
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const title = ref('')
+const name = ref('')
+// 身份证号码验证规则
+const validateIDcard = (rule: any, value: any, callback: any) => {
+  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+  if (rr.test(value)) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+const rules = ref({
+  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
+
+}) // 表单验证规则
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref<TreeStructure[]>([])
+const PubListTree = ref([])
+// 获取组织列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
+  })
+}
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sex').then((response) => {
+    sexList.value = response.data
+  })
+}
+const educationList = ref<technologyJobType[]>([])
+// 获取文化程度列表
+const geteducationList = () => {
+  getDictByCode('education').then((response) => {
+    educationList.value = response.data
+  })
+}
+// 重置表单内容
+const resetFormData = () => {
+  meterStaff.value.staffNo = ''
+  meterStaff.value.name = ''
+  meterStaff.value.idCard = ''
+  meterStaff.value.sex = ''
+  meterStaff.value.education = ''
+  meterStaff.value.technologyJob = ''
+  meterStaff.value.administrationJob = ''
+  meterStaff.value.deptId = ''
+  meterStaff.value.major = ''
+  meterStaff.value.workDate = ''
+  meterStaff.value.id = ''
+}
+const technologyJobList = ref<technologyJobType[]>([])
+// 获取技术职务列表
+const getTechnologyJobList = () => {
+  getDictByCode('technologyJob').then((response) => {
+    technologyJobList.value = response.data
+  })
+}
+const administrationJobList = ref<technologyJobType[]>([])
+// 获取行政职务列表
+const getAdministrationJob = () => {
+  getDictByCode('administrationJob').then((response) => {
+    administrationJobList.value = response.data
+  })
+}
+const personListRef = ref()
+// 选择人员
+const selectPerson = () => {
+  personListRef.value.initDialog()
+}
+// 保存选择人员信息
+const confirmPerson = (row: any) => {
+  ruleForm.value.staffId = row.staffNo
+  meterStaff.value = row
+  ruleFormRef.value?.clearValidate('staffNo')
+}
+const changeList = ref([
+  {
+    name: '证书基本信息',
+    data: [] as any[],
+    column: [
+      {
+        label: '证书号',
+        data: 'certificateNo',
+        id: 'zs02',
+      },
+      {
+        label: '证书名称',
+        data: 'certificateName',
+        id: 'zs03',
+      },
+      {
+        label: '发证日期',
+        data: 'certificateDate',
+        id: 'zs04',
+      },
+      {
+        label: '发证单位',
+        data: 'certificateCompany',
+        id: 'zs01',
+      },
+      {
+        label: '有效日期',
+        data: 'validDate',
+        id: 'zs05',
+      },
+    ],
+  },
+  {
+    name: '计量工作培训记录',
+    data: [],
+    column: [],
+  },
+  {
+    name: '业务记录',
+    data: [],
+    column: [],
+  },
+])
+const current = ref('证书基本信息')
+const currentShow = computed(() => {
+  return changeList.value.filter(item => item.name === current.value)[0]
+})
+const certificateRef = ref() // 添加证书信息弹窗
+// 添加行
+const addRow = () => {
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
+}
+// 证书信息行内添加数据
+const addRowcertificate = (row: any, flag: string) => {
+  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
+  if (flag === 'update') {
+    changeList.value[0].data = [{
+      ...changeList.value[0].data[0],
+      ...row,
+      certificateStatus: diff < 0 ? '1' : '0',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    }]
+  }
+  else {
+    changeList.value[0].data.push(
+      {
+        ...row,
+        certificateStatus: diff < 0 ? '1' : '0',
+        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        id: null,
+        isDel: 0,
+        minioFileName: '',
+        remark: '',
+        staffId: meterStaff.value.id,
+        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
+  }
+}
+const currenSelect = ref<number>(-1) // 当前选中行
+// 删除行
+const removeRow = () => {
+  console.log(currenSelect.value)
+  if (currenSelect.value >= 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
+      currenSelect.value = -1
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        let params
+        if (changeList.value[0].data.length) {
+          params = changeList.value[0].data
+        }
+        else {
+          params = [
+            {
+              certificateCompany: '',
+              certificateDate: '',
+              certificateName: '',
+              certificateNo: '',
+              certificateStatus: '',
+              createTime: '',
+              id: null,
+              isDel: 0,
+              minioFileName: '',
+              remark: '',
+              staffId: meterStaff.value.id,
+              updateTime: '',
+              validDate: '',
+            },
+          ]
+        }
+        (title.value === '新建'
+          ? addCertificateList
+          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
+          formEl?.resetFields()
+          ElMessage.success('提交成功')
+          emits('resetData')
+          resetFormData()
+        })
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  changeList.value[0].data = []
+  emits('resetData')
+  resetFormData()
+}
+const selectTreeRef = ref()
+// 弹窗初始化
+const initDialog = (row: any) => {
+  changeList.value[0].data = []
+  resetFormData()
+  dialogVisible.value = true
+  title.value = row.title
+  name.value = row.name
+  selectTreeRef.value.clearSelected()
+  resetFormData()
+  getuser()
+  getPubList()
+  getSexList()
+  geteducationList()
+  getTechnologyJobList()
+  getAdministrationJob()
+  if (row.title === '新建') {
+    console.log()
+  }
+  else {
+    getCertificateDetail({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        meterStaff.value = res.data.meterStaff
+        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+      }
+    })
+  }
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <detail-page :title=" `${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+          完成
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="人员编号" prop="staffNo">
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="selectPerson">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="meterStaff.name">
+              <el-input v-model.trim="meterStaff.name" placeholder="姓名" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="性别" prop="meterStaff.sex">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="文化程度" prop="meterStaff.education">
+              <el-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="技术职务" prop="meterStaff.technologyJob">
+              <el-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="行政职务" prop="meterStaff.administrationJob">
+              <el-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="工作部门" prop="deptId">
+              <el-select v-if="title === '详情'" v-model="meterStaff.deptId" disabled>
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+              <com-tree-select
+                v-else
+                ref="selectTreeRef" v-model="meterStaff.deptId" :options="PubListTree"
+                placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业" prop="major">
+              <el-input v-model.trim="meterStaff.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="从事日期" prop="workDate">
+              <el-date-picker
+                v-model="meterStaff.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择从事日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block :title="current">
+      <template #btns>
+        <el-button v-if="title === '新建'" type="info" @click="removeRow">
+          删除行
+        </el-button>
+        <el-button v-if="title === '新建'" type="primary" @click="addRow">
+          添加行
+        </el-button>
+        <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+          编辑行
+        </el-button>
+      </template>
+      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
+        <el-table-column width="55" align="center">
+          <template #default="scope">
+            <el-radio-group v-model="currenSelect" class="ml-4">
+              <el-radio :label="scope.$index" />
+            </el-radio-group>
+          </template>
+        </el-table-column>
+        <el-table-column type="index" label="序号" width="55" />
+        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </detail-block>
+    <!-- 添加证书信息组件 -->
+    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    <!-- 选择用户列表组件 -->
+    <person-list-dialog ref="personListRef" @add="confirmPerson" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        display: none;
+      }
+    }
+  }
+</style>
+
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 332c73c..178fc12 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -32,6 +32,7 @@
   form.validDate = ''
 }
 const initDialog = (row: any) => {
+  resetData()
   title.value = row.title
   if (row.title === '编辑') {
     form.certificateNo = row.certificateNo
@@ -50,10 +51,12 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       if (title.value === '编辑') {
-        emits('add', form, 'update')
+        const deptRow = JSON.parse(JSON.stringify(form))
+        emits('add', deptRow, 'update')
       }
       else {
-        emits('add', form, '')
+        const deptRow = JSON.parse(JSON.stringify(form))
+        emits('add', deptRow, '')
       }
       dialogFormVisible.value = false
     }
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 592d810..9c6f65d 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -30,7 +30,7 @@
   { text: '技术职务', value: 'technologyJob', align: 'center', width: '140' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '100' },
   { text: '计量专业', value: 'major', align: 'center', width: '100' },
-  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '180' },
   { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '技术考核', value: 'technologyExam', align: 'center', width: '85' },
 ]) // 表格
@@ -63,7 +63,7 @@
   loadingTable.value = true
   getStaffList(searchQuery).then((res) => {
     if (res.code === 200) {
-      res.data.records = res.data.records.map((item: StaffType) => ({ ...item, sex: item.sex == '1' ? '男' : '女', technologyExam: item.technologyExam == '0' ? '已考核' : '未考核' }))
+      res.data.records = res.data.records.map((item: StaffType) => ({ ...item, sex: item.sex == '1' ? '男' : '女', technologyExam: item.technologyExam == '0' ? '已考核' : '未考核', certificateDate: item.certificateDate.split(' ')[0] }))
       list.value = res.data.records
       total.value = Number(res.data.total)
     }
@@ -236,21 +236,11 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="proxy.hasPerm(`/measure/person/list/import`)" type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" type="primary" @click="templateDownload">
-            模板下载
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/list/add`)" type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/list/export`)" type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" type="primary" @click="print">
-            打印
-          </el-button>
+          <icon-button v-if="proxy.hasPerm(`/measure/person/list/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/list/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/list/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index 17b92d3..e44001a 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -295,15 +295,17 @@
         </el-button>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
-      <el-form-item>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer footer">
         <el-button type="primary" @click="submitForm(ruleFormRef)">
           发布
         </el-button>
         <el-button @click="resetForm(ruleFormRef)">
           关闭
         </el-button>
-      </el-form-item>
-    </el-form>
+      </div>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index 3d5c2e3..0926957 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -172,15 +172,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <el-button v-if="proxy.hasPerm('/sys/notice/list/add')" type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/sys/notice/list/export')" type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/sys/notice/list/print')" v-print="printObj" type="primary">
-          打印
-        </el-button>
+        <icon-button v-if="proxy.hasPerm('/sys/notice/list/add')" icon="icon-add" title="新建" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/sys/notice/list/export')" icon="icon-export" title="导出" @click="exportExcelBtn" />
+        <icon-button v-if="proxy.hasPerm('/sys/notice/list/print')" v-print="printObj" icon="icon-print" title="打印" />
       </template>
       <!-- 表格区域 -->
       <normal-table
diff --git a/src/views/system/notice/noticeDetail.vue b/src/views/system/notice/noticeDetail.vue
index 441ef0f..94468d4 100644
--- a/src/views/system/notice/noticeDetail.vue
+++ b/src/views/system/notice/noticeDetail.vue
@@ -97,15 +97,14 @@
         </el-link>
         <span v-else>暂无附件</span>
       </el-form-item>
-      <el-form-item>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer footer">
         <el-button type="primary" @click="submitForm()">
           确认
         </el-button>
-        <!-- <el-button @click="resetForm(ruleFormRef)">
-          关闭
-        </el-button> -->
-      </el-form-item>
-    </el-form>
+      </div>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/src/views/system/tool/autograph/addDDialog.vue b/src/views/system/tool/autograph/addDDialog.vue
index d34e8ef..e39b706 100644
--- a/src/views/system/tool/autograph/addDDialog.vue
+++ b/src/views/system/tool/autograph/addDDialog.vue
@@ -200,15 +200,17 @@
         </el-button>
         <input v-show="title === '123'" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
-      <el-form-item>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer footer">
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
           发布
         </el-button>
         <el-button @click="resetForm(ruleFormRef)">
           关闭
         </el-button>
-      </el-form-item>
-    </el-form>
+      </div>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/src/views/system/tool/autograph/autograph.vue b/src/views/system/tool/autograph/autograph.vue
index 8fffe07..ac9f000 100644
--- a/src/views/system/tool/autograph/autograph.vue
+++ b/src/views/system/tool/autograph/autograph.vue
@@ -191,15 +191,9 @@
     <table-container>
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/add')" type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/export')" type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/print')" v-print="printObj" type="primary">
-          打印
-        </el-button>
+        <icon-button v-if="proxy.hasPerm('/sys/tool/autograph/add')" icon="icon-add" title="新建" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/sys/tool/autograph/export')" icon="icon-export" title="导出" @click="exportExcelBtn" />
+        <icon-button v-if="proxy.hasPerm('/sys/tool/autograph/print')" v-print="printObj" icon="icon-print" title="打印" />
       </template>
       <!-- 表格区域 -->
       <normal-table
diff --git a/src/views/system/tool/certificate/addDDialog.vue b/src/views/system/tool/certificate/addDDialog.vue
index 330f2de..2721bf8 100644
--- a/src/views/system/tool/certificate/addDDialog.vue
+++ b/src/views/system/tool/certificate/addDDialog.vue
@@ -199,15 +199,17 @@
         </el-button>
         <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
       </el-form-item>
-      <el-form-item>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer footer">
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
           发布
         </el-button>
         <el-button @click="resetForm(ruleFormRef)">
           关闭
         </el-button>
-      </el-form-item>
-    </el-form>
+      </div>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/src/views/system/tool/certificate/certificate.vue b/src/views/system/tool/certificate/certificate.vue
index 5ac1900..9787116 100644
--- a/src/views/system/tool/certificate/certificate.vue
+++ b/src/views/system/tool/certificate/certificate.vue
@@ -192,15 +192,9 @@
     <table-container>
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button v-if="proxy.hasPerm('/sys/tool/certificate/add')" type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/sys/tool/certificate/export')" type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/sys/tool/certificate/print')" v-print="printObj" type="primary">
-          打印
-        </el-button>
+        <icon-button v-if="proxy.hasPerm('/sys/tool/certificate/add')" icon="icon-add" title="新建" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/sys/tool/certificate/export')" icon="icon-export" title="导出" @click="exportExcelBtn" />
+        <icon-button v-if="proxy.hasPerm('/sys/tool/certificate/print')" v-print="printObj" icon="icon-print" title="打印" />
       </template>
       <!-- 表格区域 -->
       <normal-table
diff --git a/src/views/system/tool/document/addDDialog.vue b/src/views/system/tool/document/addDDialog.vue
index 33ffdaa..c440d1d 100644
--- a/src/views/system/tool/document/addDDialog.vue
+++ b/src/views/system/tool/document/addDDialog.vue
@@ -200,15 +200,17 @@
         </el-button>
         <input v-show="title === ''" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
-      <el-form-item>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer footer">
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
           发布
         </el-button>
         <el-button @click="resetForm(ruleFormRef)">
           关闭
         </el-button>
-      </el-form-item>
-    </el-form>
+      </div>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/src/views/system/tool/document/document.vue b/src/views/system/tool/document/document.vue
index 58d12f9..774e498 100644
--- a/src/views/system/tool/document/document.vue
+++ b/src/views/system/tool/document/document.vue
@@ -191,15 +191,9 @@
     <table-container>
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button v-if="proxy.hasPerm('/sys/tool/document/add')" type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/sys/tool/document/export')" type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/sys/tool/document/print')" v-print="printObj" type="primary">
-          打印
-        </el-button>
+        <icon-button v-if="proxy.hasPerm('/sys/tool/document/add')" icon="icon-add" title="新建" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/sys/tool/document/export')" icon="icon-export" title="导出" @click="exportExcelBtn" />
+        <icon-button v-if="proxy.hasPerm('/sys/tool/document/print')" v-print="printObj" icon="icon-print" title="打印" />
       </template>
       <!-- 表格区域 -->
       <normal-table
diff --git a/src/views/system/tool/signature/addDDialog.vue b/src/views/system/tool/signature/addDDialog.vue
index 00046f8..509509c 100644
--- a/src/views/system/tool/signature/addDDialog.vue
+++ b/src/views/system/tool/signature/addDDialog.vue
@@ -199,15 +199,17 @@
         </el-button>
         <input v-show="title === ''" ref="fileRef" type="file" accept="image/*" @change="onFileChange">
       </el-form-item>
-      <el-form-item>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer footer">
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
           发布
         </el-button>
         <el-button @click="resetForm(ruleFormRef)">
           关闭
         </el-button>
-      </el-form-item>
-    </el-form>
+      </div>
+    </template>
   </el-dialog>
 </template>
 

diff --git a/src/components.d.ts b/src/components.d.ts
index 6e85584..815d62f 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -16,14 +16,13 @@
     BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default']
     BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
-    Benchcol: typeof import('./components/benchcol/index.vue')['default']
     BenchCol: typeof import('./components/benchCol/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/DetailPage/index copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
     DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default']
+    DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default']
     DetailPage: typeof import('./components/DetailPage/index.vue')['default']
     Editor: typeof import('./components/Editor/index.vue')['default']
     EmployeesDialog: typeof import('./components/dialog/employeesDialog.vue')['default']
diff --git a/src/components/DetailPage/DetailBlockSwitch.vue b/src/components/DetailPage/DetailBlockSwitch.vue
new file mode 100644
index 0000000..4d92074
--- /dev/null
+++ b/src/components/DetailPage/DetailBlockSwitch.vue
@@ -0,0 +1,71 @@
+<script lang="ts" setup name="DetailBlock">
+defineProps({
+  title: {
+    type: String,
+    required: true,
+  },
+})
+
+const slots = useSlots()
+</script>
+
+<template>
+  <div class="detail-main">
+    <div class="header">
+      <div class="menu">
+        <slot name="menu" />
+      </div>
+      <div class="title">
+        {{ title }}
+      </div>
+      <div class="btns">
+        <slot name="btns" />
+      </div>
+    </div>
+    <div v-if="slots.default" class="content">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.detail-main {
+  background-color: #fff;
+  border-radius: 8px;
+  margin-top: 10px;
+  padding-top: 10px;
+
+  .header {
+    position: relative;
+    height: 40px;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+
+    .title {
+      font-weight: 500;
+    }
+
+    .btns {
+      position: absolute;
+      right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+
+    .menu {
+      position: absolute;
+      left: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+
+  .content {
+    background-color: #fff;
+    padding: 0 10px 20px;
+    margin-top: 10px;
+  }
+}
+</style>
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d6c1c91..1644a80 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -314,6 +314,39 @@
       },
     ],
   },
+  {
+    path: '/borrow',
+    component: Layout,
+    redirect: '/device/borrow/borrowapply',
+    name: 'Borrow',
+    meta: {
+      title: '设备领用',
+      icon: 'ep:key',
+      auth: '/device/borrow',
+    },
+    children: [
+      {
+        path: 'borrowapply',
+        name: 'borroWapply',
+        component: () => import('@/views/device/borrow/borrwoApply.vue'),
+        meta: {
+          title: '设备借用申请',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowapply',
+        },
+      },
+      {
+        path: 'borrowhandle',
+        name: 'borrowHandle',
+        component: () => import('@/views/device/borrow/borrowHandle.vue'),
+        meta: {
+          title: '设备借用处理',
+          icon: 'ep:key',
+          auth: '/device/borrow/borrowhandle',
+        },
+      },
+    ],
+  },
 
 ]
 
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
new file mode 100644
index 0000000..1c2405e
--- /dev/null
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="borrowHandle">
+// 逻辑代码
+</script>
+
+<template>
+  <app-container>
+    设备借用处理
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
new file mode 100644
index 0000000..03d414b
--- /dev/null
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="borrowApply">
+// 逻辑代码
+</script>
+
+<template>
+  <app-container>
+    设备借用申请
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index c2682fc..5f7b347 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -339,381 +339,374 @@
 
 <template>
   <div class="body-container">
-    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资产编号" prop="assetNo">
-            <el-input v-model.trim="ruleForm.assetNo" placeholder="系统自动生成" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="资产类型" prop="assetType">
-            <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备编号" prop="equipmentNo">
-            <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备名称" prop="equipmentName">
-            <el-input v-model.trim="ruleForm.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="生产厂家" prop="manufacturer">
-            <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="厂家国别" prop="manufacturerCountry">
-            <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="出厂编号" prop="manufacturingNo">
-            <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="出厂年月" prop="manufacturingDate">
-            <el-date-picker
-              v-model="ruleForm.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '出厂年月'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="型号" prop="modelNo">
-            <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="管理状态" prop="managerState">
-            <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="ABC" prop="abc">
-            <el-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'">
-              <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="标签绑定" prop="labelBind">
-            <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === '详情' ? '' : '标签'" :disabled="title === '详情'" clearable>
-              <template #append>
-                <el-button type="primary" size="small">
-                  扫描
-                </el-button>
-              </template>
-            </el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="立卡年月" prop="cardEstablishmentDate">
-            <el-date-picker
-              v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '立卡年月'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="启用日期" prop="enableDate">
-            <el-date-picker
-              v-model="ruleForm.enableDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '启用日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定方式" prop="mesureType">
-            <el-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'">
-              <el-option v-for="item in mesureTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定周期" prop="mesureCycle">
-            <el-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable>
-              <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="12">
-          <el-form-item label="测量范围" prop="mesureRange">
-            <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === '详情' ? '' : '测量范围'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="不确定度" prop="uncertainty">
-            <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === '详情' ? '' : '不确定度'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="使用部门" prop="useDept">
-            <com-tree-select
-              v-if="title !== '详情'"
-              v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-              :tree-props="deptProps"
-            />
-            <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
-              <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="使用人" prop="usePerson">
-            <el-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'">
-              <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="专业分类" prop="majorCategory">
-            <el-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'">
-              <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="检定部门" prop="mesureDept">
-            <com-tree-select
-              v-if="title !== '详情'"
-              v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-              :tree-props="deptProps"
-            />
-            <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
-              <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定日期" prop="mesureDate">
-            <el-date-picker
-              v-model="ruleForm.mesureDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '检定日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="有效日期" prop="validDate">
-            <el-date-picker
-              v-model="ruleForm.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-              :placeholder="title === '详情' ? '' : '有效日期'"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="检定结果" prop="mesureResult">
-            <el-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'">
-              <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="8">
-          <el-form-item label="是否是技术指标需要校准/检定的设备" prop="isCalibrationTestEquipment" label-width="260px">
-            <el-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否是测量工装台账" prop="isMeasureAccount" label-width="260px">
-            <el-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否标准配套设备" prop="isStandardSupportEquipment" label-width="260px">
-            <el-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
-              <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
+    <detail-block-switch title="基本信息">
+      <template #menu>
+        <slot name="menuswitch" />
+      </template>
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资产编号" prop="assetNo">
+              <el-input v-model.trim="ruleForm.assetNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="资产类型" prop="assetType">
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备编号" prop="equipmentNo">
+              <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="生产厂家" prop="manufacturer">
+              <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="厂家国别" prop="manufacturerCountry">
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号" prop="manufacturingNo">
+              <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂年月" prop="manufacturingDate">
+              <el-date-picker
+                v-model="ruleForm.manufacturingDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '出厂年月'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="型号" prop="modelNo">
+              <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === '详情' ? '' : '型号'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="管理状态" prop="managerState">
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="ABC" prop="abc">
+              <el-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'">
+                <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标签绑定" prop="labelBind">
+              <el-input v-model.trim="ruleForm.labelBind" :placeholder="title === '详情' ? '' : '标签'" :disabled="title === '详情'" clearable>
+                <template #append>
+                  <el-button type="primary" size="small">
+                    扫描
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="立卡年月" prop="cardEstablishmentDate">
+              <el-date-picker
+                v-model="ruleForm.cardEstablishmentDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '立卡年月'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="启用日期" prop="enableDate">
+              <el-date-picker
+                v-model="ruleForm.enableDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '启用日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定方式" prop="mesureType">
+              <el-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'">
+                <el-option v-for="item in mesureTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定周期" prop="mesureCycle">
+              <el-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable>
+                <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="测量范围" prop="mesureRange">
+              <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === '详情' ? '' : '测量范围'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="不确定度" prop="uncertainty">
+              <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === '详情' ? '' : '不确定度'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="使用部门" prop="useDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
+                :tree-props="deptProps"
+              />
+              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="使用人" prop="usePerson">
+              <el-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'">
+                <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="专业分类" prop="majorCategory">
+              <el-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'">
+                <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="检定部门" prop="mesureDept">
+              <com-tree-select
+                v-if="title !== '详情'"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                :tree-props="deptProps"
+              />
+              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+                <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定日期" prop="mesureDate">
+              <el-date-picker
+                v-model="ruleForm.mesureDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '检定日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="有效日期" prop="validDate">
+              <el-date-picker
+                v-model="ruleForm.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '有效日期'"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定结果" prop="mesureResult">
+              <el-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'">
+                <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="8">
+            <el-form-item label="是否是技术指标需要校准/检定的设备" prop="isCalibrationTestEquipment" label-width="260px">
+              <el-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否是测量工装台账" prop="isMeasureAccount" label-width="260px">
+              <el-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否标准配套设备" prop="isStandardSupportEquipment" label-width="260px">
+              <el-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'">
+                <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资产来源" prop="assetSource">
-            <el-input v-model.trim="ruleForm.assetSource" :placeholder="title === '详情' ? '' : '资产来源'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备规格" prop="equipmentSpecifications">
-            <el-input v-model.trim="ruleForm.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备类别" prop="equipmentCategory">
-            <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
-              <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="设备类型" prop="equipmentType">
-            <el-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'">
-              <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="资本来源" prop="capitalSource">
-            <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
-              <el-option v-for="item in capitalSourceList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="管理级别" prop="managerLevel">
-            <el-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'">
-              <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="用途" prop="purpose">
-            <el-input v-model.trim="ruleForm.purpose" :placeholder="title === '详情' ? '' : '用途'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="技术水平" prop="technicalLevel">
-            <el-input v-model.trim="ruleForm.technicalLevel" :placeholder="title === '详情' ? '' : '技术水平'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="完好状态" prop="intactState">
-            <el-input v-model.trim="ruleForm.intactState" :placeholder="title === '详情' ? '' : '完好状态'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="外形尺寸" prop="overallDimension">
-            <el-input v-model.trim="ruleForm.overallDimension" :placeholder="title === '详情' ? '' : '外形尺寸'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="重量(吨)" prop="weight">
-            <el-input v-model.trim="ruleForm.weight" :placeholder="title === '详情' ? '' : '重量'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="单价" prop="singlePrice">
-            <el-input v-model.trim="ruleForm.singlePrice" :placeholder="title === '详情' ? '' : '单价'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="安装及杂费" prop="installIncidentalExpenses">
-            <el-input v-model.trim="ruleForm.installIncidentalExpenses" :placeholder="title === '详情' ? '' : '安装及杂费'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="安装地点" prop="installPlace">
-            <el-input v-model.trim="ruleForm.installPlace" :placeholder="title === '详情' ? '' : '安装地点'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="原值" prop="originValue">
-            <el-input v-model.trim="ruleForm.originValue" :placeholder="title === '详情' ? '' : '原值'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="目前原值" prop="presentOriginValue">
-            <el-input v-model.trim="ruleForm.presentOriginValue" :placeholder="title === '详情' ? '' : '目前原值'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="折旧年限" prop="depreciationPeriod">
-            <el-input v-model.trim="ruleForm.depreciationPeriod" :placeholder="title === '详情' ? '' : '折旧年限'" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="折旧方法" prop="depreciationMethod">
-            <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
-              <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="6">
-          <el-form-item label="属性" prop="attribute">
-            <el-input v-model.trim="ruleForm.attribute" placeholder="属性" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="12">
-          <el-form-item label="说明书" prop="minioFileName">
-            <show-photo :minio-file-name="ruleForm.fileList[0]?.minioFileName || ''" />
-            <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
-            <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
-              {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
-            </el-button>
-            <span v-if="title === '详情' && !ruleForm.fileList[0]?.minioFileName">暂无</span>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24" class="marg">
-        <el-col :span="24">
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" placeholder="备注" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资产来源" prop="assetSource">
+              <el-input v-model.trim="ruleForm.assetSource" :placeholder="title === '详情' ? '' : '资产来源'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备规格" prop="equipmentSpecifications">
+              <el-input v-model.trim="ruleForm.equipmentSpecifications" :placeholder="title === '详情' ? '' : '设备规格'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备类别" prop="equipmentCategory">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+                <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备类型" prop="equipmentType">
+              <el-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'">
+                <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="资本来源" prop="capitalSource">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+                <el-option v-for="item in capitalSourceList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="管理级别" prop="managerLevel">
+              <el-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'">
+                <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="用途" prop="purpose">
+              <el-input v-model.trim="ruleForm.purpose" :placeholder="title === '详情' ? '' : '用途'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="技术水平" prop="technicalLevel">
+              <el-input v-model.trim="ruleForm.technicalLevel" :placeholder="title === '详情' ? '' : '技术水平'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="完好状态" prop="intactState">
+              <el-input v-model.trim="ruleForm.intactState" :placeholder="title === '详情' ? '' : '完好状态'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="外形尺寸" prop="overallDimension">
+              <el-input v-model.trim="ruleForm.overallDimension" :placeholder="title === '详情' ? '' : '外形尺寸'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="重量(吨)" prop="weight">
+              <el-input v-model.trim="ruleForm.weight" :placeholder="title === '详情' ? '' : '重量'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="单价" prop="singlePrice">
+              <el-input v-model.trim="ruleForm.singlePrice" :placeholder="title === '详情' ? '' : '单价'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="安装及杂费" prop="installIncidentalExpenses">
+              <el-input v-model.trim="ruleForm.installIncidentalExpenses" :placeholder="title === '详情' ? '' : '安装及杂费'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="安装地点" prop="installPlace">
+              <el-input v-model.trim="ruleForm.installPlace" :placeholder="title === '详情' ? '' : '安装地点'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="原值" prop="originValue">
+              <el-input v-model.trim="ruleForm.originValue" :placeholder="title === '详情' ? '' : '原值'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="目前原值" prop="presentOriginValue">
+              <el-input v-model.trim="ruleForm.presentOriginValue" :placeholder="title === '详情' ? '' : '目前原值'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="折旧年限" prop="depreciationPeriod">
+              <el-input v-model.trim="ruleForm.depreciationPeriod" :placeholder="title === '详情' ? '' : '折旧年限'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="折旧方法" prop="depreciationMethod">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+                <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="属性" prop="attribute">
+              <el-input v-model.trim="ruleForm.attribute" placeholder="属性" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="说明书" prop="minioFileName">
+              <show-photo :minio-file-name="ruleForm.fileList[0]?.minioFileName || ''" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.fileList[0]?.minioFileName ? '20px' : '0px' }" @click="upload">
+                {{ ruleForm.fileList[0]?.minioFileName ? '更换' : '上传' }}
+              </el-button>
+              <span v-if="title === '详情' && !ruleForm.fileList[0]?.minioFileName">暂无</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" placeholder="备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block-switch>
   </div>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    padding-top: 20px;
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index f46553a..fc3fd54 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -360,20 +360,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          固定资产-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`固定资产-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -763,44 +758,11 @@
           </el-row>
         </div> -->
       </el-form>
-    </div>
+    </detail-page>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index 0abbdb1..6e88e96 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -74,33 +74,29 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ name }} -{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm">
-            关闭
-          </el-button>
-        </span>
-      </div>
-      <div class="body">
-        <!-- 三级菜单 -->
-        <el-radio-group v-model="current">
-          <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
-            {{ item.name }}
-          </el-radio-button>
-        </el-radio-group>
-      </div>
-      <!-- 展示区域 -->
-      <keep-alive>
-        <component :is="currentComp" ref="currentCompRef" :name="current" :title="title" :row="row" />
-      </keep-alive>
-    </div>
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <!-- 展示区域 -->
+    <keep-alive>
+      <component :is="currentComp" ref="currentCompRef" :name="current" :title="title" :row="row">
+        <template #menuswitch>
+          <!-- 三级菜单 -->
+          <el-radio-group v-model="current">
+            <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+              {{ item.name }}
+            </el-radio-button>
+          </el-radio-group>
+        </template>
+      </component>
+    </keep-alive>
   </app-container>
 </template>
 
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f9cdcd0..f653095 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -256,7 +256,7 @@
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
-  // 原生上传图片
+  // 原生上传
   // console.log(event.target.files)
   // if (event.target.files[0].type === 'application/pdf') {
   if (event.target.files?.length !== 0) {
@@ -354,7 +354,7 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" type="primary" @click="identify">
+          <!-- <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" type="primary" @click="identify">
             标签识别
           </el-button>
           <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/import`)" type="primary" @click="batchImport">
@@ -371,7 +371,13 @@
           </el-button>
           <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/print`)" v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/identify`)" icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/device/${$props.authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/device/standingBook/components/templateTable.vue b/src/views/device/standingBook/components/templateTable.vue
index 8a928f0..7aa563f 100644
--- a/src/views/device/standingBook/components/templateTable.vue
+++ b/src/views/device/standingBook/components/templateTable.vue
@@ -245,11 +245,11 @@
   <div>
     <!-- 添加证书信息组件 -->
     <add-row ref="addRowRef" @add="addRowData" />
-    <div class="header">
-      <div class="title">
-        <!-- {{ $props.name }} -->
-      </div>
-      <span class="btns">
+    <detail-block-switch :title="name">
+      <template #menu>
+        <slot name="menuswitch" />
+      </template>
+      <template #btns>
         <el-button v-if="title !== '详情'" type="info" @click="removeRow">
           删除行
         </el-button>
@@ -259,55 +259,33 @@
         <el-button v-if="title !== '详情'" type="primary" @click="editRow">
           编辑行
         </el-button>
-      </span>
-    </div>
-    <!-- 表格区域 -->
-    <normal-table
-      id="print"
-      :data="list" :total="total" :columns="columns as any"
-      :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-      :list-loading="loadingTable"
-      style="padding-top: 20px;background-color: #fff;"
-      @change="changePage"
-    >
-      <template #preColumns>
-        <el-table-column label="" width="55" align="center">
-          <template #default="scope">
-            <el-radio v-model="select" :label="scope.$index" class="radio" />
-          </template>
-        </el-table-column>
-        <el-table-column label="序号" width="55" align="center">
-          <template #default="scope">
-            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-          </template>
-        </el-table-column>
       </template>
-    </normal-table>
+      <!-- 表格区域 -->
+      <normal-table
+        id="print"
+        :data="list" :total="total" :columns="columns as any"
+        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+        :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </detail-block-switch>
   </div>
 </template>
 
 <style lang="scss" scoped>
-.header {
-  background-color: #fff;
-  // height: 40px;
-  border-radius: 8px;
-  display: flex;
-  align-items: center;
-  flex-direction: column;
-  justify-content: center;
-  position: relative;
-
-  .title {
-    // font-weight: 700;
-  }
-
-  .btns {
-    position: absolute;
-    right: 40px;
-    top: -22px;
-  }
-}
-
 :deep(.el-radio__label) {
   display: none;
 }
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 7538bc8..78a3800 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -272,24 +272,12 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/identify`)" type="primary" @click="identify">
-            标签识别
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/import`)" type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/mould`)" type="primary" @click="templateDownload">
-            模板下载
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/add`)" type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/export`)" type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/device/fixedAssets/print`)" v-print="printObj" type="primary">
-            打印
-          </el-button>
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/identify`)" icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/device/fixedAssets/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index fc364c8..e74d70e 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -361,20 +361,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ name }} - {{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
-            保存
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -458,73 +453,33 @@
           </el-col>
         </el-row>
       </el-form>
-      <div v-if="title !== '新建' ">
-        <div class="header" style="margin-top: 10px;">
-          <div class="title">
-            审批流程
-          </div>
-        </div>
-        <div class="timeline">
-          <el-timeline>
-            <el-timeline-item timestamp="2018/4/12" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/12 20:46</p>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="2018/4/3" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/3 20:46</p>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="2018/4/2" placement="top">
-              <el-card>
-                <h4>Update Github template</h4>
-                <p>Tom committed 2018/4/2 20:46</p>
-              </el-card>
-            </el-timeline-item>
-          </el-timeline>
-        </div>
-      </div>
-    </div>
+    </detail-page>
+    <detail-block v-if="title !== '新建' " title="审批流程">
+      <el-timeline>
+        <el-timeline-item timestamp="2018/4/12" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/12 20:46</p>
+          </el-card>
+        </el-timeline-item>
+        <el-timeline-item timestamp="2018/4/3" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/3 20:46</p>
+          </el-card>
+        </el-timeline-item>
+        <el-timeline-item timestamp="2018/4/2" placement="top">
+          <el-card>
+            <h4>Update Github template</h4>
+            <p>Tom committed 2018/4/2 20:46</p>
+          </el-card>
+        </el-timeline-item>
+      </el-timeline>
+    </detail-block>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 14px;
-    }
-  }
-}
-
-.marg {
-  margin-top: 5px;
-}
-
 .timeline {
   background-color: #fff;
 }
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index aa3963f..737568d 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -1,6 +1,6 @@
 <!-- 状态管理公共列表组件 -->
 <script lang="ts" setup>
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessageBox } from 'element-plus'
 import approve from './approvalActionDialog.vue'
 import addDialog from './templateAdd.vue'
 const props = defineProps({
@@ -142,7 +142,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
+const detail = (row: any) => {
   dialogVisible.value = true
   addRef.value.initDialog({
     title: '详情',
@@ -150,7 +150,7 @@
   })
 }
 // 编辑
-const update = (row) => {
+const update = (row: any) => {
   dialogVisible.value = true
   // addRef.value.initDialog({
   //   title: '编辑',
@@ -158,7 +158,7 @@
   // })
 }
 // 删除
-const remove = (row) => {
+const remove = (row: any) => {
   ElMessageBox.confirm(
     `确认删除${row.equipmentName}吗？`,
     '提示',
@@ -181,20 +181,20 @@
   // })
 }
 // 同意
-const agree = (row) => {
+const agree = (row: any) => {
   console.log(approveRef.value)
   approveRef.value.initDialog({
     radio: '1',
   })
 }
 // 驳回
-const reject = (row) => {
+const reject = (row: any) => {
   approveRef.value.initDialog({
     radio: '3',
   })
 }
 // 拒绝
-const refuse = (row) => {
+const refuse = (row: any) => {
   approveRef.value.initDialog(
     {
       radio: '2',
@@ -202,7 +202,7 @@
   )
 }
 // 取消
-const cancel = (row) => {
+const cancel = (rowrow: any) => {
   ElMessageBox.confirm(
     '确认取消吗？',
     '提示',
@@ -301,20 +301,20 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+          <el-input placeholder="申请编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="设备编号" clearable class="w-50 m-2" />
+          <el-input placeholder="设备编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.modelNo" placeholder="设备名称" clearable class="w-50 m-2" />
+          <el-input placeholder="设备名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请单位" clearable class="w-50 m-2" />
+          <el-input placeholder="申请单位" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.publisher" placeholder="申请状态" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" />
+          <el-select placeholder="申请状态" clearable>
+            <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" /> -->
           </el-select>
         </search-item>
       </search-area>
@@ -328,7 +328,10 @@
           <el-button type="primary" @click="templateDownload">
             模板下载
           </el-button> -->
-          <el-button type="primary" @click="add">
+          <icon-button icon="icon-add" title="新建" @click="add" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+          <!-- <el-button type="primary" @click="add">
             新建
           </el-button>
           <el-button type="primary" @click="exportExcelBtn">
@@ -336,7 +339,7 @@
           </el-button>
           <el-button v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
         </template>
         <!-- 表格区域 -->
         <normal-table
@@ -386,22 +389,3 @@
     </app-container>
   </div>
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 154px !important;
-}
-
-.normal-date {
-  width: 154px !important;
-}
-
-.normal-select {
-  width: 154px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
-
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 0763c5a..9ef0b93 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -19,7 +19,6 @@
 const effectiveStatusName = ref('')
 const title = ref('')
 const fileList = ref<UploadUserFile[]>([])
-console.log(sessionStorage.getItem(fileTypeName.value))
 const ruleForm = reactive({
   fileType: '', // 类型
   fileTypeName: '', // 类型名称  不传
@@ -80,10 +79,9 @@
   if (row.title === '新建') {
     // 默认发布人和发布单位
     ruleForm.createUserId = userInfo.$state.id
-    ruleForm.publisher = ''
+    ruleForm.publisher = userInfo.$state.deptName
     ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 判断有无存储
-    console.log(sessionStorage.getItem(fileTypeName.value), 'sess')
     if (sessionStorage.getItem(fileTypeName.value)) {
       const session = JSON.parse(sessionStorage.getItem(fileTypeName.value) as string)
       ruleForm.fileType = session.fileType
@@ -117,6 +115,8 @@
     ruleForm.remark = row.remark
     ruleForm.publishTime = row.publishTime
     ruleForm.minioFileName = row.minioFileName
+    // ruleForm.publisher = '0'
+    // ruleForm.createUserId = '1'
   }
 }
 defineExpose({ initDialog })
@@ -148,6 +148,9 @@
       type: 'warning',
     },
       ).then((res) => {
+        if (ruleForm.publisher === userInfo.$state.deptName) {
+          ruleForm.publisher === userInfo.$state.deptId
+        }
         if (flag == '提交') {
           addApi(ruleForm).then((res) => {
             if (res.code == 200) {
@@ -193,7 +196,6 @@
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        console.log(res.data[0])
         ruleForm.minioFileName = res.data[0]
         // 重置当前验证
         ruleFormRef.value?.clearValidate('minioFileName')
@@ -216,7 +218,6 @@
 // ])
 watch(() => ruleForm.effectiveTime, (newVal) => {
   const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
-  console.log(diffDat)
   if (diffDat < 0) {
     // ruleForm.effectiveStatusName = '已废止'
     effectiveStatusName.value = '在使用'
@@ -237,7 +238,7 @@
 
 <template>
   <app-container v-if="dialogVisible" style="overflow: hidden;">
-    <detail-page :title="`${title}${fileTypeName}`">
+    <detail-page :title="`${fileTypeName}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
           提交
@@ -278,12 +279,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="发布单位" prop="publisher">
-              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'" class="fill-input">
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled>
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
               <com-tree-select
                 v-else
-                v-model="ruleForm.publisher" :options="PubListTree" placeholder="选择组织机构"
+                v-model="ruleForm.publisher" :options="PubListTree" placeholder="请选择发布单位"
                 :tree-props="deptProps"
               />
             </el-form-item>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 44e3e4d..b45fbc3 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -324,22 +324,9 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <!-- <el-button type="primary" @click="batchImport">
-            批量导入
-          </el-button> -->
-          <!-- <el-button type="primary" @click="templateDownload">
-            模板下载
-          </el-button> -->
-          <!-- <el-button type="primary" @click="add">
-            新建
-          </el-button> -->
-          <el-button type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-print="printObj" type="primary">
-            打印
-          </el-button>
+          <!-- <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange"> -->
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 4677e48..7d4724b 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -204,13 +204,9 @@
     loading.close()
   })
 }
-// 打印
-const print = () => {
-
-}
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
-  // 原生上传图片
+  // 原生上传
   // console.log(event.target.files)
   // if (event.target.files[0].type === 'application/pdf') {
   if (event.target.files?.length !== 0) {
@@ -264,7 +260,7 @@
         <search-item>
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
-        <search-item>
+        <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
@@ -273,13 +269,13 @@
               :value="item.value"
             />
           </el-select>
-        </search-item>
+        </search-item> -->
         <search-item>
           <el-date-picker
             v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
             class="normal-date"
-            style="width: 155px;"
+            style="width: 185px;"
           />
         </search-item>
         <search-item>
@@ -287,19 +283,19 @@
             v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
             class="normal-date"
-            style="width: 155px;"
+            style="width: 185px;"
           />
         </search-item>
         <search-item>
-          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
+          <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
               :label="item.name"
               :value="item.value"
             />
-          </el-select> -->
-          <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" />
+          </el-select>
+          <!-- <el-input v-model.trim="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态" /> -->
         </search-item>
       </search-area>
       <table-container>
@@ -310,7 +306,7 @@
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
           <icon-button v-if="proxy.hasPerm(`/file/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
-          <icon-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" @click="print" />
+          <icon-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index cf0dd4f..5ca3275 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -3,11 +3,11 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { detailType } from '../measureDept-interface'
-import { getUserList } from '@/api/system/user'
+// import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
+import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import type { userType } from '@/views/system/user/user-interface'
 import { listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
-import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
 const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -31,11 +31,20 @@
   technologyJob: [{ required: true, message: '技术职务不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const userList = ref<userType[]>([]) // 用户列表
+// 获取计量人员列表
 const getuser = () => {
-  getUserList({ offset: 1, limit: 99999 }).then((res) => {
-    userList.value = res.data.rows
+  getStaffList({
+    staffNo: '', // 人员编号
+    name: '', // 姓名
+    deptId: ruleForm.value.deptId, // 所在部门
+    limit: 999999,
+    offset: 1,
+  }).then((res) => {
+    if (res.code === 200) {
+      userList.value = res.data.records
+    }
   })
-} // 获取用户列表
+}
 const technologyJobList = ref<{ id: string;name: string;value: string }[]>([])
 // 获取技术职务列表
 const getTechnologyJobList = () => {
@@ -50,7 +59,16 @@
     administrationJobList.value = response.data
   })
 }
-
+// 选择负责人自动填充职务信息
+const directorChange = (val: string) => {
+  const selectUser = userList.value.filter(item => item.name === val)[0]
+  getStaffDetail(selectUser).then((res) => {
+    if (res.code === 200) {
+      ruleForm.value.administrationJob = res.data.administrationJob
+      ruleForm.value.technologyJob = res.data.technologyJob
+    }
+  })
+}
 // 提交
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
@@ -95,12 +113,6 @@
 const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
-// const searchQuery = ref({
-//   limit: 10,
-//   offset: 1,
-//   total: 0,
-//   pageSizes: [10, 20, 30],
-// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -410,20 +422,6 @@
     }
   })
 }
-// const handleSizeChange = (val: number) => {
-//   searchQuery.value.limit = val
-//   getDepartmentList()
-//   getuserInfoList()
-//   getInstrumentInfo()
-//   getDeviceInfo()
-// }
-// const handleCurrentChange = (val: number) => {
-//   searchQuery.value.offset = val
-//   getDepartmentList()
-//   getuserInfoList()
-//   getInstrumentInfo()
-//   getDeviceInfo()
-// }
 // 弹窗初始化
 const initDialog = (row: any) => {
   reset()
@@ -460,22 +458,17 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          {{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title.split('-')[2] === '编辑'" type="primary" @click="submitForm(ruleFormRef)">
-            提交
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="title">
+      <template #btns>
+        <el-button v-if="title.split('-')[2] === '编辑'" type="primary" @click="submitForm(ruleFormRef)">
+          提交
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title.split('-')[2] === '详情' ? 'isDetail' : '']">
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item :label=" `${title.split('-')[1]}编号`" prop="organizeNo">
               <el-input v-model.trim="ruleForm.organizeNo" placeholder="系统自动生成" disabled />
@@ -487,7 +480,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="title.split('-')[1] === '工程组'" :gutter="24" class="marg">
+        <el-row v-if="title.split('-')[1] === '工程组'" :gutter="24">
           <el-col :span="6">
             <el-form-item label="科室编号">
               <el-input v-model.trim="ruleForm.pDeptId" disabled />
@@ -509,10 +502,10 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item label="负责人" prop="director">
-              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" @change="directorChange">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.name" />
               </el-select>
             </el-form-item>
@@ -532,7 +525,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="marg">
+        <el-row :gutter="24">
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
               <el-input v-model.trim="ruleForm.remark" :placeholder="title.split('-')[2] === '详情' ? '' : '备注'" :disabled="title.split('-')[2] === '详情'" />
@@ -540,85 +533,24 @@
           </el-col>
         </el-row>
       </el-form>
-      <!-- 科室信息-人员信息等列表切换 -->
-      <div>
-        <div class="header" style="margin-top: 10px;">
-          <!-- 切换 -->
-          <el-radio-group v-model="current" class="change-btn">
-            <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
-              {{ item.name }}
-            </el-radio-button>
-          </el-radio-group>
-          <div class="title">
-            {{ current }}
-          </div>
-          <span class="btns">
-          <!-- <el-button type="info" :disabled="title === '详情'" @click="removeRow">
-            删除行
-          </el-button>
-          <el-button type="primary" :disabled="title === '详情'" @click="addRow">
-            添加行
-          </el-button> -->
-          </span>
-        </div>
-        <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <el-table-column type="index" label="序号" width="55" align="center" />
-          <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
-        </el-table>
-        <!-- <div style="width: 100%;margin-top: 10px;">
-          <el-pagination
-            :current-page="searchQuery.offset"
-            :page-sizes="searchQuery.pageSizes"
-            :page-size="searchQuery.limit"
-            :total="searchQuery.total"
-            layout="total, sizes, prev, pager, next"
-            hide-on-single-page
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-          />
-        </div> -->
-      </div>
-    </div>
+    </detail-page>
+    <detail-block-switch :title="current">
+      <template #menu>
+        <el-radio-group v-model="current" class="change-btn">
+          <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
+            {{ item.name }}
+          </el-radio-button>
+        </el-radio-group>
+      </template>
+      <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
+        <el-table-column type="index" label="序号" width="55" align="center" />
+        <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </detail-block-switch>
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    border-radius: 8px;
-    background-color: #fff;
-    margin-top: 10px;
-    padding-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    display: flex;
-    position: relative;
-
-    .change-btn {
-      position: absolute;
-      left: 40px;
-      top: 4px;
-    }
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 4px;
-    }
-  }
-}
-
 .isDetail {
   ::v-deep {
     .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
@@ -628,8 +560,4 @@
     }
   }
 }
-
-.marg {
-  margin-top: 10px;
-}
 </style>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 9ad87af..aac1ef2 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -231,12 +231,14 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
+          <!-- <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
           <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
-          </el-button>
+          </el-button> -->
+          <icon-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 2e3322a..3f472eb 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -41,7 +41,7 @@
   { text: '证书号', value: 'certificateNo', align: 'center' },
   { text: '发证单位', value: 'certificateCompany', align: 'center', width: '90' },
   { text: '发证日期', value: 'certificateDate', align: 'center', width: '200' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
+  { text: '证书有效日期', value: 'validDate', align: 'center', width: '200' },
   { text: '证书状况', value: 'certificateStatus', align: 'center', width: '85' },
 ]) // 表格
 const certificateStatusList = ref([
@@ -90,7 +90,7 @@
   loadingTable.value = true
   getCertificateList(searchQuery).then((res) => {
     if (res.code === 200) {
-      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效' }))
+      res.data.records = res.data.records.map(item => ({ ...item, sex: item.sex == '1' ? '男' : '女', certificateStatus: item.certificateStatus == '0' ? '正常' : '已失效', validDate: item.validDate.split(' ')[0], certificateDate: item.certificateDate.split(' ')[0] }))
       list.value = res.data.records
       total.value = Number(res.data.total)
     }
@@ -115,6 +115,7 @@
   addRef.value.initDialog({
     ...row,
     title: '详情',
+    name: props.isRemind ? '证书状况' : '证书记录',
   })
 }
 // 编辑
@@ -123,6 +124,7 @@
   addRef.value.initDialog({
     ...row,
     title: '编辑',
+    name: props.isRemind ? '证书状况' : '证书记录',
   })
 }
 
@@ -193,6 +195,7 @@
   dialogVisible.value = true
   addRef.value.initDialog({
     title: '新建',
+    name: props.isRemind ? '证书状况' : '证书记录',
   })
 }
 // 导出
@@ -292,21 +295,11 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
-            模板下载
-          </el-button>
-          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
-            打印
-          </el-button>
+          <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
@@ -325,7 +318,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column fixed="right" label="操作" align="center" width="150">
+            <el-table-column fixed="right" label="操作" align="center" width="180">
               <template #default="{ row }">
                 <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
                   提醒
@@ -336,7 +329,7 @@
                 <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 4dc1b17..4352604 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -69,7 +69,16 @@
     const IdCard = ruleForm.value.idCard
     const birthday = `${IdCard.substring(6, 10)}-${IdCard.substring(10, 12)}`
     ruleForm.value.birthday = birthday
-    console.log(ruleForm.value)
+    // 获取性别 第17位  奇数为男 偶数为女
+    // ruleForm.value.sex
+    if (Number(IdCard.substring(16, 17)) % 2) {
+      // 男
+      ruleForm.value.sex = '1'
+    }
+    else {
+      //  女
+      ruleForm.value.sex = '2'
+    }
   })
 }
 const dialogVisible = ref<boolean>(false) // 弹窗显示
@@ -130,7 +139,6 @@
     technologyExam: '', // 技术考核
     remark: '', // 备注
     certificateList: [], // 证书列表
-
   }
 }
 const technologyJobList = ref<technologyJobType[]>([])
@@ -309,7 +317,7 @@
           }
           (title.value === '新建'
             ? getStaffAdd
-            : getStaffupdate) ({ ...ruleForm.value, certificateList: changeList.value[0].data }).then((res) => {
+            : getStaffupdate) ({ ...ruleForm.value, certificateList: changeList.value[0].data, birthday: `${ruleForm.value.idCard.substring(6, 10)}-${ruleForm.value.idCard.substring(10, 12)}-${ruleForm.value.idCard.substring(12, 14)}` }).then((res) => {
             if (res.code == 200) {
               formEl?.resetFields()
               ElMessage.success('提交成功')
@@ -332,12 +340,14 @@
   emits('resetData')
   resetFormData()
 }
+const selectTreeRef = ref()
 // 弹窗初始化
 const initDialog = (row: any) => {
   changeList.value[0].data = []
   dialogVisible.value = true
   title.value = row.title
   resetFormData()
+  selectTreeRef.value?.clearSelected()
   getuser()
   getPubList()
   getSexList()
@@ -370,20 +380,15 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          计量人员-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
-            完成
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
+    <detail-page :title="`计量人员-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+          完成
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
       <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
         <el-row :gutter="24" class="marg">
           <el-col :span="5">
@@ -394,6 +399,7 @@
                 :http-request="uploadQuarterlyEvaluateFile"
                 :before-upload="beforeAvatarUpload"
                 :disabled="title === '详情'"
+                accept="image/png, image/jpeg,image/jpg"
               >
                 <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
                 <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
@@ -425,8 +431,8 @@
               </el-select>
               <com-tree-select
                 v-else
-                v-model="ruleForm.deptId" :options="PubListTree" placeholder="选择组织机构"
-                :tree-props="deptProps"
+                ref="selectTreeRef" v-model="ruleForm.deptId" :options="PubListTree"
+                placeholder="选择组织机构" :tree-props="deptProps"
               />
             </el-form-item>
             <el-form-item label="计量专业" prop="major" class="marg-item">
@@ -489,29 +495,19 @@
           </el-col>
         </el-row>
       </el-form>
-      <!-- 证书基本信息 -->
-      <!-- 切换 -->
-      <!-- <el-radio-group v-model="current" style="margin-bottom: -15px;">
-          <el-radio-button v-for="item in changeList" :key="item.name" :label="item.name">
-            {{ item.name }}
-          </el-radio-button>
-        </el-radio-group> -->
-      <div class="header" style="margin-top: 10px;">
-        <div class="title">
-          {{ current }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="info" @click="removeRow">
-            删除行
-          </el-button>
-          <el-button v-if="title !== '详情'" type="primary" @click="addRow">
-            添加行
-          </el-button>
-          <el-button v-if="title !== '详情'" type="primary" @click="editRow">
-            编辑行
-          </el-button>
-        </span>
-      </div>
+    </detail-page>
+    <detail-block :title="current">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="info" @click="removeRow">
+          删除行
+        </el-button>
+        <el-button v-if="title !== '详情'" type="primary" @click="addRow">
+          添加行
+        </el-button>
+        <el-button v-if="title !== '详情'" type="primary" @click="editRow">
+          编辑行
+        </el-button>
+      </template>
       <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
         <el-table-column width="55" align="center">
           <template #default="scope">
@@ -523,7 +519,7 @@
         <el-table-column type="index" label="序号" width="55" />
         <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
       </el-table>
-    </div>
+    </detail-block>
     <!-- 添加证书信息组件 -->
     <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
     <!-- 选择用户列表组件 -->
@@ -532,77 +528,38 @@
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    background-color: #fff;
-    border-radius: 8px;
-    padding-top: 10px;
-    margin-top: 10px;
-    padding-right: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    display: flex;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    position: relative;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 5px;
-    }
-  }
-
-  :deep(.el-radio__label) {
-    display: none;
-  }
-
-  :deep(.el-icon.avatar-uploader-icon) {
-    font-size: 28px;
-    color: #8c939d;
-    width: 190px;
-    height: 250px;
-    text-align: center;
-  }
-
-  :deep(.avatar-uploader .avatar) {
-    width: 190px;
-    height: 250px;
-    display: block;
-  }
-
-  .isDetail {
-    ::v-deep {
-      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-        display: none;
-      }
-    }
-  }
+:deep(.el-radio__label) {
+  display: none;
 }
 
-.marg {
-  margin-top: 20px;
+:deep(.el-icon.avatar-uploader-icon) {
+  font-size: 28px;
+  color: #8c939d;
+  width: 190px;
+  height: 250px;
+  text-align: center;
 }
 
-.marg-item {
-  margin-top: 20px;
+:deep(.avatar-uploader .avatar) {
+  width: 190px;
+  height: 250px;
+  display: block;
+}
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
 }
 </style>
 
 <style scoped>
 .avatar-uploader .avatar {
-  width: 220px;
-  height: 320px;
+  width: 190px;
+  height: 250px;
   display: block;
 }
 </style>
@@ -624,8 +581,8 @@
 .el-icon.avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
-  width: 220px;
-  height: 320px;
+  width: 190px;
+  height: 250px;
   text-align: center;
 }
 </style>
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index ae48f11..042636e 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -4,7 +4,6 @@
 import dayjs from 'dayjs'
 import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import type { technologyJobType } from '../person-interface'
-import certificateAddDialog from './certificateAddDialog.vue'
 import personListDialog from './personListDialog.vue'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
@@ -14,7 +13,8 @@
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
-const ruleFormRef = ref<FormInstance>() // from组件
+const ruleFormRef1 = ref<FormInstance>() // from组件
+const ruleFormRef2 = ref<FormInstance>() // from组件
 const meterStaff = ref({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -28,26 +28,43 @@
   workDate: '', // 从事日期
   id: '',
 })
+const baseInfo = ref({
+  certificateCompany: '',
+  certificateDate: '',
+  certificateName: '',
+  certificateNo: '',
+  validDate: '',
+  id: '',
+  isDel: 0,
+  minioFileName: '',
+  remark: '',
+})
 const ruleForm = ref({
   meterStaff: {}, // 人员信息
   staffId: '', // 计量人员id
 }) // 表单
-const multipleTableRef = ref<InstanceType<typeof ElTable>>()
 const title = ref('')
+const name = ref('')
 // 身份证号码验证规则
-const validateIDcard = (rule: any, value: any, callback: any) => {
-  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
-  if (rr.test(value)) {
-    callback()
-  }
-  else {
-    callback(new Error('验证失败'))
-  }
-}
+// const validateIDcard = (rule: any, value: any, callback: any) => {
+//   const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+//   if (rr.test(value)) {
+//     callback()
+//   }
+//   else {
+//     callback(new Error('验证失败'))
+//   }
+// }
 const rules = ref({
   staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
   // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
-
+}) // 表单验证规则
+const rules2 = ref({
+  certificateCompany: [{ required: true, message: '发证单位不能为空', trigger: 'blur' }],
+  certificateDate: [{ required: true, message: '发证日期不能为空', trigger: 'blur' }],
+  certificateName: [{ required: true, message: '证书名称不能为空', trigger: 'blur' }],
+  certificateNo: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
+  validDate: [{ required: true, message: '有效日期不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
 const userList = ref<userType[]>([]) // 可使用人列表
@@ -96,6 +113,17 @@
   meterStaff.value.major = ''
   meterStaff.value.workDate = ''
   meterStaff.value.id = ''
+  baseInfo.value = {
+    certificateCompany: '',
+    certificateDate: '',
+    certificateName: '',
+    certificateNo: '',
+    validDate: '',
+    id: '',
+    isDel: 0,
+    minioFileName: '',
+    remark: '',
+  }
 }
 const technologyJobList = ref<technologyJobType[]>([])
 // 获取技术职务列表
@@ -120,98 +148,14 @@
 const confirmPerson = (row: any) => {
   ruleForm.value.staffId = row.staffNo
   meterStaff.value = row
-  ruleFormRef.value?.clearValidate('staffNo')
+  ruleFormRef1.value?.clearValidate('staffNo')
 }
-const changeList = ref([
-  {
-    name: '证书基本信息',
-    data: [] as any[],
-    column: [
-      {
-        label: '证书号',
-        data: 'certificateNo',
-        id: 'zs02',
-      },
-      {
-        label: '证书名称',
-        data: 'certificateName',
-        id: 'zs03',
-      },
-      {
-        label: '发证日期',
-        data: 'certificateDate',
-        id: 'zs04',
-      },
-      {
-        label: '发证单位',
-        data: 'certificateCompany',
-        id: 'zs01',
-      },
-      {
-        label: '有效日期',
-        data: 'validDate',
-        id: 'zs05',
-      },
-    ],
-  },
-  {
-    name: '计量工作培训记录',
-    data: [],
-    column: [],
-  },
-  {
-    name: '业务记录',
-    data: [],
-    column: [],
-  },
-])
-const current = ref('证书基本信息')
-const currentShow = computed(() => {
-  return changeList.value.filter(item => item.name === current.value)[0]
-})
-const certificateRef = ref() // 添加证书信息弹窗
-// 添加行
-const addRow = () => {
-  certificateRef.value.initDialog({ title: '添加' })
-}
-// 编辑行
-const editRow = () => {
-  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
-}
-// 证书信息行内添加数据
-const addRowcertificate = (row: any, flag: string) => {
-  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
-  if (flag === 'update') {
-    changeList.value[0].data = [{
-      ...changeList.value[0].data[0],
-      ...row,
-      certificateStatus: diff < 0 ? '1' : '0',
-      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-    }]
-  }
-  else {
-    changeList.value[0].data.push(
-      {
-        ...row,
-        certificateStatus: diff < 0 ? '1' : '0',
-        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-        id: null,
-        isDel: 0,
-        minioFileName: '',
-        remark: '',
-        staffId: meterStaff.value.id,
-        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-      })
-  }
-}
-const currenSelect = ref<number>(-1) // 当前选中行
-// 删除行
-const removeRow = () => {
-  console.log(currenSelect.value)
-  if (currenSelect.value >= 0) {
+// 提交
+const submitForm = async (formEl1: FormInstance | undefined, formEl2: FormInstance | undefined) => {
+  if (!formEl1 || !formEl2) { return }
+  Promise.all([formEl1.validate(), formEl2.validate()]).then((res) => {
     ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
+      '确认提交吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -219,78 +163,49 @@
         type: 'warning',
       },
     ).then(() => {
-      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
-      currenSelect.value = -1
-      ElMessage.success('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 提交
-const submitForm = async (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  await formEl.validate((valid, fields) => {
-    if (valid) {
-      ElMessageBox.confirm(
-        '确认提交吗？',
-        '提示',
-        {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        },
-      ).then(() => {
-        let params
-        if (changeList.value[0].data.length) {
-          params = changeList.value[0].data
-        }
-        else {
-          params = [
-            {
-              certificateCompany: '',
-              certificateDate: '',
-              certificateName: '',
-              certificateNo: '',
-              certificateStatus: '',
-              createTime: '',
-              id: null,
-              isDel: 0,
-              minioFileName: '',
-              remark: '',
-              staffId: meterStaff.value.id,
-              updateTime: '',
-              validDate: '',
-            },
-          ]
-        }
-        (title.value === '新建'
-          ? addCertificateList
-          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
-          formEl?.resetFields()
-          ElMessage.success('提交成功')
-          emits('resetData')
-          resetFormData()
-        })
+      (title.value === '新建'
+        ? addCertificateList
+        : getCertificateUpdate)(title.value === '新建'
+        ? [{
+            ...baseInfo.value,
+            staffId: meterStaff.value.id,
+            createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+            updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+            certificateStatus: dayjs(baseInfo.value.validDate).diff(baseInfo.value.certificateDate, 'day') < 0 ? '1' : '0',
+            meterStaff: undefined,
+          }]
+        : {
+            ...baseInfo.value,
+            staffId: meterStaff.value.id,
+            createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+            updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+            certificateStatus: dayjs(baseInfo.value.validDate).diff(baseInfo.value.certificateDate, 'day') < 0 ? '1' : '0',
+            meterStaff: undefined,
+          }).then((res) => {
+        formEl1?.resetFields()
+        formEl2?.resetFields()
+        ElMessage.success('提交成功')
+        emits('resetData')
+        resetFormData()
       })
-    }
+    })
   })
 }
 // 取消
-const resetForm = (formEl: FormInstance | undefined) => {
+const resetForm = (formEl: FormInstance | undefined, formEl2: FormInstance | undefined) => {
   formEl?.resetFields()
-  changeList.value[0].data = []
+  formEl2?.resetFields()
   emits('resetData')
   resetFormData()
 }
+const selectTreeRef = ref()
 // 弹窗初始化
 const initDialog = (row: any) => {
-  changeList.value[0].data = []
   resetFormData()
   dialogVisible.value = true
   title.value = row.title
-  resetFormData()
+  name.value = row.name
+  selectTreeRef.value?.clearSelected()
   getuser()
   getPubList()
   getSexList()
@@ -303,8 +218,9 @@
   else {
     getCertificateDetail({ id: row.id }).then((res) => {
       if (res.code === 200) {
+        console.log(res, '证书记录')
         meterStaff.value = res.data.meterStaff
-        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+        baseInfo.value = res.data
       }
     })
   }
@@ -314,21 +230,16 @@
 
 <template>
   <app-container style="overflow: hidden;">
-    <div class="body-container">
-      <div class="header">
-        <div class="title">
-          证书记录-{{ title }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
-            完成
-          </el-button>
-          <el-button type="info" @click="resetForm(ruleFormRef)">
-            关闭
-          </el-button>
-        </span>
-      </div>
-      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+    <detail-page :title=" `${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
+          完成
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef1, ruleFormRef2)">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef1" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="人员编号" prop="staffNo">
@@ -390,7 +301,8 @@
               </el-select>
               <com-tree-select
                 v-else
-                v-model="meterStaff.deptId" :options="PubListTree" placeholder="选择组织机构"
+                ref="selectTreeRef" v-model="meterStaff.deptId" :options="PubListTree"
+                placeholder="选择组织机构"
                 :tree-props="deptProps"
               />
             </el-form-item>
@@ -410,71 +322,52 @@
           </el-col>
         </el-row>
       </el-form>
-      <div class="header" style="margin-top: 10px;">
-        <div class="title">
-          {{ current }}
-        </div>
-        <span class="btns">
-          <el-button v-if="title === '新建'" type="info" @click="removeRow">
-            删除行
-          </el-button>
-          <el-button v-if="title === '新建'" type="primary" @click="addRow">
-            添加行
-          </el-button>
-          <el-button v-if="title === '编辑'" type="primary" @click="editRow">
-            编辑行
-          </el-button>
-        </span>
-      </div>
-      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
-        <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column>
-        <el-table-column type="index" label="序号" width="55" />
-        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
-      </el-table>
-    </div>
-    <!-- 添加证书信息组件 -->
-    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    </detail-page>
+    <detail-block title="证书基本信息">
+      <el-form ref="ruleFormRef2" :model="baseInfo" :rules="rules2" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="证书号" prop="certificateNo">
+              <el-input v-model.trim="baseInfo.certificateNo" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书名称" prop="certificateName">
+              <el-input v-model.trim="baseInfo.certificateName" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证单位" prop="certificateCompany">
+              <el-input v-model.trim="baseInfo.certificateCompany" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发证日期" prop="certificateDate">
+              <el-date-picker
+                v-model="baseInfo.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择发证日期"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书有效日期" prop="validDate">
+              <el-date-picker
+                v-model="baseInfo.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择有效日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block>
     <!-- 选择用户列表组件 -->
     <person-list-dialog ref="personListRef" @add="confirmPerson" />
   </app-container>
 </template>
 
 <style lang="scss" scoped>
-.body-container {
-  .form {
-    background-color: #fff;
-    border-radius: 8px;
-    padding-top: 10px;
-    margin-top: 10px;
-  }
-
-  .header {
-    background-color: #fff;
-    height: 40px;
-    border-radius: 8px;
-    display: flex;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    position: relative;
-
-    .title {
-      font-weight: 700;
-    }
-
-    .btns {
-      position: absolute;
-      right: 40px;
-      top: 5px;
-    }
-  }
-
   :deep(.el-radio__label) {
     display: none;
   }
@@ -487,40 +380,5 @@
       }
     }
   }
-}
-
-.marg {
-  margin-top: 20px;
-}
 </style>
 
-<style scoped>
-.avatar-uploader .avatar {
-  width: 178px;
-  height: 178px;
-  display: block;
-}
-</style>
-
-<style>
-.avatar-uploader .el-upload {
-  border: 1px dashed var(--el-border-color);
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-  transition: var(--el-transition-duration-fast);
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: var(--el-color-primary);
-}
-
-.el-icon.avatar-uploader-icon {
-  font-size: 28px;
-  color: #8c939d;
-  width: 178px;
-  height: 178px;
-  text-align: center;
-}
-</style>
diff --git a/src/views/measure/person/components/addRecordCancel.vue b/src/views/measure/person/components/addRecordCancel.vue
new file mode 100644
index 0000000..c32ac43
--- /dev/null
+++ b/src/views/measure/person/components/addRecordCancel.vue
@@ -0,0 +1,459 @@
+<!-- 计量人员新增  证书基本信息table表格   作废 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import type { technologyJobType } from '../person-interface'
+import certificateAddDialog from './certificateAddDialog.vue'
+import personListDialog from './personListDialog.vue'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import type { TreeStructure, userType } from '@/views/system/user/user-interface'
+import { getDictByCode } from '@/api/system/dict'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { addCertificateList, getCertificateDetail, getCertificateUpdate } from '@/api/measure/person'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const meterStaff = ref({
+  staffNo: '', // 人员编号
+  name: '', // 姓名
+  idCard: '', // 身份证号
+  sex: '', // 性别
+  education: '', // 文化程度
+  technologyJob: '', // 技术职务
+  administrationJob: '', // 行政职务
+  deptId: '', // 工作部门
+  major: '', // 专业
+  workDate: '', // 从事日期
+  id: '',
+})
+const ruleForm = ref({
+  meterStaff: {}, // 人员信息
+  staffId: '', // 计量人员id
+}) // 表单
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const title = ref('')
+const name = ref('')
+// 身份证号码验证规则
+const validateIDcard = (rule: any, value: any, callback: any) => {
+  const rr = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+  if (rr.test(value)) {
+    callback()
+  }
+  else {
+    callback(new Error('验证失败'))
+  }
+}
+const rules = ref({
+  staffNo: [{ required: true, message: '人员编号不能为空', trigger: 'blur' }],
+  // idCard: [{ required: false, validator: validateIDcard, message: '身份证号码不符合规范', trigger: 'change' }],
+
+}) // 表单验证规则
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const PubList = ref<TreeStructure[]>([])
+const PubListTree = ref([])
+// 获取组织列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    // 转成树结构
+    PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
+  })
+}
+const sexList = ref<{ id: string; value: string; name: string }[]>()
+// 获取性别
+const getSexList = () => {
+  getDictByCode('sex').then((response) => {
+    sexList.value = response.data
+  })
+}
+const educationList = ref<technologyJobType[]>([])
+// 获取文化程度列表
+const geteducationList = () => {
+  getDictByCode('education').then((response) => {
+    educationList.value = response.data
+  })
+}
+// 重置表单内容
+const resetFormData = () => {
+  meterStaff.value.staffNo = ''
+  meterStaff.value.name = ''
+  meterStaff.value.idCard = ''
+  meterStaff.value.sex = ''
+  meterStaff.value.education = ''
+  meterStaff.value.technologyJob = ''
+  meterStaff.value.administrationJob = ''
+  meterStaff.value.deptId = ''
+  meterStaff.value.major = ''
+  meterStaff.value.workDate = ''
+  meterStaff.value.id = ''
+}
+const technologyJobList = ref<technologyJobType[]>([])
+// 获取技术职务列表
+const getTechnologyJobList = () => {
+  getDictByCode('technologyJob').then((response) => {
+    technologyJobList.value = response.data
+  })
+}
+const administrationJobList = ref<technologyJobType[]>([])
+// 获取行政职务列表
+const getAdministrationJob = () => {
+  getDictByCode('administrationJob').then((response) => {
+    administrationJobList.value = response.data
+  })
+}
+const personListRef = ref()
+// 选择人员
+const selectPerson = () => {
+  personListRef.value.initDialog()
+}
+// 保存选择人员信息
+const confirmPerson = (row: any) => {
+  ruleForm.value.staffId = row.staffNo
+  meterStaff.value = row
+  ruleFormRef.value?.clearValidate('staffNo')
+}
+const changeList = ref([
+  {
+    name: '证书基本信息',
+    data: [] as any[],
+    column: [
+      {
+        label: '证书号',
+        data: 'certificateNo',
+        id: 'zs02',
+      },
+      {
+        label: '证书名称',
+        data: 'certificateName',
+        id: 'zs03',
+      },
+      {
+        label: '发证日期',
+        data: 'certificateDate',
+        id: 'zs04',
+      },
+      {
+        label: '发证单位',
+        data: 'certificateCompany',
+        id: 'zs01',
+      },
+      {
+        label: '有效日期',
+        data: 'validDate',
+        id: 'zs05',
+      },
+    ],
+  },
+  {
+    name: '计量工作培训记录',
+    data: [],
+    column: [],
+  },
+  {
+    name: '业务记录',
+    data: [],
+    column: [],
+  },
+])
+const current = ref('证书基本信息')
+const currentShow = computed(() => {
+  return changeList.value.filter(item => item.name === current.value)[0]
+})
+const certificateRef = ref() // 添加证书信息弹窗
+// 添加行
+const addRow = () => {
+  certificateRef.value.initDialog({ title: '添加' })
+}
+// 编辑行
+const editRow = () => {
+  certificateRef.value.initDialog({ ...changeList.value[0].data[0], title: '编辑' })
+}
+// 证书信息行内添加数据
+const addRowcertificate = (row: any, flag: string) => {
+  const diff = dayjs(row.validDate).diff(row.certificateDate, 'day')
+  if (flag === 'update') {
+    changeList.value[0].data = [{
+      ...changeList.value[0].data[0],
+      ...row,
+      certificateStatus: diff < 0 ? '1' : '0',
+      createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    }]
+  }
+  else {
+    changeList.value[0].data.push(
+      {
+        ...row,
+        certificateStatus: diff < 0 ? '1' : '0',
+        createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        id: null,
+        isDel: 0,
+        minioFileName: '',
+        remark: '',
+        staffId: meterStaff.value.id,
+        updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
+  }
+}
+const currenSelect = ref<number>(-1) // 当前选中行
+// 删除行
+const removeRow = () => {
+  console.log(currenSelect.value)
+  if (currenSelect.value >= 0) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      changeList.value[0].data = changeList.value[0].data.filter((item, index) => index !== currenSelect.value)
+      currenSelect.value = -1
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认提交吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        let params
+        if (changeList.value[0].data.length) {
+          params = changeList.value[0].data
+        }
+        else {
+          params = [
+            {
+              certificateCompany: '',
+              certificateDate: '',
+              certificateName: '',
+              certificateNo: '',
+              certificateStatus: '',
+              createTime: '',
+              id: null,
+              isDel: 0,
+              minioFileName: '',
+              remark: '',
+              staffId: meterStaff.value.id,
+              updateTime: '',
+              validDate: '',
+            },
+          ]
+        }
+        (title.value === '新建'
+          ? addCertificateList
+          : getCertificateUpdate)(title.value === '新建' ? params : changeList.value[0].data[0]).then((res) => {
+          formEl?.resetFields()
+          ElMessage.success('提交成功')
+          emits('resetData')
+          resetFormData()
+        })
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  changeList.value[0].data = []
+  emits('resetData')
+  resetFormData()
+}
+const selectTreeRef = ref()
+// 弹窗初始化
+const initDialog = (row: any) => {
+  changeList.value[0].data = []
+  resetFormData()
+  dialogVisible.value = true
+  title.value = row.title
+  name.value = row.name
+  selectTreeRef.value.clearSelected()
+  resetFormData()
+  getuser()
+  getPubList()
+  getSexList()
+  geteducationList()
+  getTechnologyJobList()
+  getAdministrationJob()
+  if (row.title === '新建') {
+    console.log()
+  }
+  else {
+    getCertificateDetail({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        meterStaff.value = res.data.meterStaff
+        changeList.value[0].data = [{ ...res.data, meterStaff: undefined }]
+      }
+    })
+  }
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <detail-page :title=" `${name}-${title}`">
+      <template #btns>
+        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
+          完成
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef" :model="meterStaff" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="人员编号" prop="staffNo">
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson">
+                <template #append>
+                  <el-button size="small" :disabled="title === '详情'" @click="selectPerson">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="姓名" prop="meterStaff.name">
+              <el-input v-model.trim="meterStaff.name" placeholder="姓名" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="性别" prop="meterStaff.sex">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+                <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="文化程度" prop="meterStaff.education">
+              <el-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'">
+                <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="技术职务" prop="meterStaff.technologyJob">
+              <el-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+                <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="行政职务" prop="meterStaff.administrationJob">
+              <el-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+                <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="工作部门" prop="deptId">
+              <el-select v-if="title === '详情'" v-model="meterStaff.deptId" disabled>
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+              <com-tree-select
+                v-else
+                ref="selectTreeRef" v-model="meterStaff.deptId" :options="PubListTree"
+                placeholder="选择组织机构"
+                :tree-props="deptProps"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业" prop="major">
+              <el-input v-model.trim="meterStaff.major" placeholder="计量专业" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="从事日期" prop="workDate">
+              <el-date-picker
+                v-model="meterStaff.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择从事日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block :title="current">
+      <template #btns>
+        <el-button v-if="title === '新建'" type="info" @click="removeRow">
+          删除行
+        </el-button>
+        <el-button v-if="title === '新建'" type="primary" @click="addRow">
+          添加行
+        </el-button>
+        <el-button v-if="title === '编辑'" type="primary" @click="editRow">
+          编辑行
+        </el-button>
+      </template>
+      <el-table ref="multipleTableRef" :data="currentShow.data" style="width: 100%;margin-top: 10px;">
+        <el-table-column width="55" align="center">
+          <template #default="scope">
+            <el-radio-group v-model="currenSelect" class="ml-4">
+              <el-radio :label="scope.$index" />
+            </el-radio-group>
+          </template>
+        </el-table-column>
+        <el-table-column type="index" label="序号" width="55" />
+        <el-table-column v-for="item in currentShow.column" :key="item.id" :prop="item.data" :label="item.label" align="center" />
+      </el-table>
+    </detail-block>
+    <!-- 添加证书信息组件 -->
+    <certificate-add-dialog ref="certificateRef" @add="addRowcertificate" />
+    <!-- 选择用户列表组件 -->
+    <person-list-dialog ref="personListRef" @add="confirmPerson" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+  :deep(.el-radio__label) {
+    display: none;
+  }
+
+  .isDetail {
+    ::v-deep {
+      .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+      .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+        display: none;
+      }
+    }
+  }
+</style>
+
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 332c73c..178fc12 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -32,6 +32,7 @@
   form.validDate = ''
 }
 const initDialog = (row: any) => {
+  resetData()
   title.value = row.title
   if (row.title === '编辑') {
     form.certificateNo = row.certificateNo
@@ -50,10 +51,12 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       if (title.value === '编辑') {
-        emits('add', form, 'update')
+        const deptRow = JSON.parse(JSON.stringify(form))
+        emits('add', deptRow, 'update')
       }
       else {
-        emits('add', form, '')
+        const deptRow = JSON.parse(JSON.stringify(form))
+        emits('add', deptRow, '')
       }
       dialogFormVisible.value = false
     }
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 592d810..9c6f65d 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -30,7 +30,7 @@
   { text: '技术职务', value: 'technologyJob', align: 'center', width: '140' },
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '100' },
   { text: '计量专业', value: 'major', align: 'center', width: '100' },
-  { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
+  { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '180' },
   { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '200' },
   { text: '技术考核', value: 'technologyExam', align: 'center', width: '85' },
 ]) // 表格
@@ -63,7 +63,7 @@
   loadingTable.value = true
   getStaffList(searchQuery).then((res) => {
     if (res.code === 200) {
-      res.data.records = res.data.records.map((item: StaffType) => ({ ...item, sex: item.sex == '1' ? '男' : '女', technologyExam: item.technologyExam == '0' ? '已考核' : '未考核' }))
+      res.data.records = res.data.records.map((item: StaffType) => ({ ...item, sex: item.sex == '1' ? '男' : '女', technologyExam: item.technologyExam == '0' ? '已考核' : '未考核', certificateDate: item.certificateDate.split(' ')[0] }))
       list.value = res.data.records
       total.value = Number(res.data.total)
     }
@@ -236,21 +236,11 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="proxy.hasPerm(`/measure/person/list/import`)" type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" type="primary" @click="templateDownload">
-            模板下载
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/list/add`)" type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/list/export`)" type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" type="primary" @click="print">
-            打印
-          </el-button>
+          <icon-button v-if="proxy.hasPerm(`/measure/person/list/add`)" icon="icon-add" title="新建" @click="add" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/list/import`)" icon="icon-import" title="批量导入" @click="batchImport" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" icon="icon-template" title="模板下载" @click="templateDownload" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/list/export`)" icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" icon="icon-print" title="打印" />
         </template>
         <!-- 表格区域 -->
         <normal-table
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index 17b92d3..e44001a 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -295,15 +295,17 @@
         </el-button>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
-      <el-form-item>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer footer">
         <el-button type="primary" @click="submitForm(ruleFormRef)">
           发布
         </el-button>
         <el-button @click="resetForm(ruleFormRef)">
           关闭
         </el-button>
-      </el-form-item>
-    </el-form>
+      </div>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index 3d5c2e3..0926957 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -172,15 +172,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <el-button v-if="proxy.hasPerm('/sys/notice/list/add')" type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/sys/notice/list/export')" type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/sys/notice/list/print')" v-print="printObj" type="primary">
-          打印
-        </el-button>
+        <icon-button v-if="proxy.hasPerm('/sys/notice/list/add')" icon="icon-add" title="新建" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/sys/notice/list/export')" icon="icon-export" title="导出" @click="exportExcelBtn" />
+        <icon-button v-if="proxy.hasPerm('/sys/notice/list/print')" v-print="printObj" icon="icon-print" title="打印" />
       </template>
       <!-- 表格区域 -->
       <normal-table
diff --git a/src/views/system/notice/noticeDetail.vue b/src/views/system/notice/noticeDetail.vue
index 441ef0f..94468d4 100644
--- a/src/views/system/notice/noticeDetail.vue
+++ b/src/views/system/notice/noticeDetail.vue
@@ -97,15 +97,14 @@
         </el-link>
         <span v-else>暂无附件</span>
       </el-form-item>
-      <el-form-item>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer footer">
         <el-button type="primary" @click="submitForm()">
           确认
         </el-button>
-        <!-- <el-button @click="resetForm(ruleFormRef)">
-          关闭
-        </el-button> -->
-      </el-form-item>
-    </el-form>
+      </div>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/src/views/system/tool/autograph/addDDialog.vue b/src/views/system/tool/autograph/addDDialog.vue
index d34e8ef..e39b706 100644
--- a/src/views/system/tool/autograph/addDDialog.vue
+++ b/src/views/system/tool/autograph/addDDialog.vue
@@ -200,15 +200,17 @@
         </el-button>
         <input v-show="title === '123'" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
-      <el-form-item>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer footer">
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
           发布
         </el-button>
         <el-button @click="resetForm(ruleFormRef)">
           关闭
         </el-button>
-      </el-form-item>
-    </el-form>
+      </div>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/src/views/system/tool/autograph/autograph.vue b/src/views/system/tool/autograph/autograph.vue
index 8fffe07..ac9f000 100644
--- a/src/views/system/tool/autograph/autograph.vue
+++ b/src/views/system/tool/autograph/autograph.vue
@@ -191,15 +191,9 @@
     <table-container>
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/add')" type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/export')" type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/print')" v-print="printObj" type="primary">
-          打印
-        </el-button>
+        <icon-button v-if="proxy.hasPerm('/sys/tool/autograph/add')" icon="icon-add" title="新建" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/sys/tool/autograph/export')" icon="icon-export" title="导出" @click="exportExcelBtn" />
+        <icon-button v-if="proxy.hasPerm('/sys/tool/autograph/print')" v-print="printObj" icon="icon-print" title="打印" />
       </template>
       <!-- 表格区域 -->
       <normal-table
diff --git a/src/views/system/tool/certificate/addDDialog.vue b/src/views/system/tool/certificate/addDDialog.vue
index 330f2de..2721bf8 100644
--- a/src/views/system/tool/certificate/addDDialog.vue
+++ b/src/views/system/tool/certificate/addDDialog.vue
@@ -199,15 +199,17 @@
         </el-button>
         <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
       </el-form-item>
-      <el-form-item>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer footer">
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
           发布
         </el-button>
         <el-button @click="resetForm(ruleFormRef)">
           关闭
         </el-button>
-      </el-form-item>
-    </el-form>
+      </div>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/src/views/system/tool/certificate/certificate.vue b/src/views/system/tool/certificate/certificate.vue
index 5ac1900..9787116 100644
--- a/src/views/system/tool/certificate/certificate.vue
+++ b/src/views/system/tool/certificate/certificate.vue
@@ -192,15 +192,9 @@
     <table-container>
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button v-if="proxy.hasPerm('/sys/tool/certificate/add')" type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/sys/tool/certificate/export')" type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/sys/tool/certificate/print')" v-print="printObj" type="primary">
-          打印
-        </el-button>
+        <icon-button v-if="proxy.hasPerm('/sys/tool/certificate/add')" icon="icon-add" title="新建" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/sys/tool/certificate/export')" icon="icon-export" title="导出" @click="exportExcelBtn" />
+        <icon-button v-if="proxy.hasPerm('/sys/tool/certificate/print')" v-print="printObj" icon="icon-print" title="打印" />
       </template>
       <!-- 表格区域 -->
       <normal-table
diff --git a/src/views/system/tool/document/addDDialog.vue b/src/views/system/tool/document/addDDialog.vue
index 33ffdaa..c440d1d 100644
--- a/src/views/system/tool/document/addDDialog.vue
+++ b/src/views/system/tool/document/addDDialog.vue
@@ -200,15 +200,17 @@
         </el-button>
         <input v-show="title === ''" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
-      <el-form-item>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer footer">
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
           发布
         </el-button>
         <el-button @click="resetForm(ruleFormRef)">
           关闭
         </el-button>
-      </el-form-item>
-    </el-form>
+      </div>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/src/views/system/tool/document/document.vue b/src/views/system/tool/document/document.vue
index 58d12f9..774e498 100644
--- a/src/views/system/tool/document/document.vue
+++ b/src/views/system/tool/document/document.vue
@@ -191,15 +191,9 @@
     <table-container>
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button v-if="proxy.hasPerm('/sys/tool/document/add')" type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/sys/tool/document/export')" type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/sys/tool/document/print')" v-print="printObj" type="primary">
-          打印
-        </el-button>
+        <icon-button v-if="proxy.hasPerm('/sys/tool/document/add')" icon="icon-add" title="新建" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/sys/tool/document/export')" icon="icon-export" title="导出" @click="exportExcelBtn" />
+        <icon-button v-if="proxy.hasPerm('/sys/tool/document/print')" v-print="printObj" icon="icon-print" title="打印" />
       </template>
       <!-- 表格区域 -->
       <normal-table
diff --git a/src/views/system/tool/signature/addDDialog.vue b/src/views/system/tool/signature/addDDialog.vue
index 00046f8..509509c 100644
--- a/src/views/system/tool/signature/addDDialog.vue
+++ b/src/views/system/tool/signature/addDDialog.vue
@@ -199,15 +199,17 @@
         </el-button>
         <input v-show="title === ''" ref="fileRef" type="file" accept="image/*" @change="onFileChange">
       </el-form-item>
-      <el-form-item>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer footer">
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef)">
           发布
         </el-button>
         <el-button @click="resetForm(ruleFormRef)">
           关闭
         </el-button>
-      </el-form-item>
-    </el-form>
+      </div>
+    </template>
   </el-dialog>
 </template>
 
diff --git a/src/views/system/tool/signature/signature.vue b/src/views/system/tool/signature/signature.vue
index 94d216e..4eb6d70 100644
--- a/src/views/system/tool/signature/signature.vue
+++ b/src/views/system/tool/signature/signature.vue
@@ -189,15 +189,9 @@
     <table-container>
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button v-if="proxy.hasPerm('/sys/tool/signature/add')" type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/sys/tool/signature/export')" type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-if="proxy.hasPerm('/sys/tool/signature/print')" v-print="printObj" type="primary">
-          打印
-        </el-button>
+        <icon-button v-if="proxy.hasPerm('/sys/tool/signature/add')" icon="icon-add" title="新建" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/sys/tool/signature/export')" icon="icon-export" title="导出" @click="exportExcelBtn" />
+        <icon-button v-if="proxy.hasPerm('/sys/tool/signature/print')" v-print="printObj" icon="icon-print" title="打印" />
       </template>
       <!-- 表格区域 -->
       <normal-table