diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index bb58885..2959118 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -53,3 +53,64 @@
   }
   return true
 }
+
+/**
+ * 验证小写字母
+ * @param str
+ * @returns
+ */
+export function validateLowerCase(str: string) {
+  const reg = /^[a-z]+$/
+  return reg.test(str)
+}
+
+/* 验证大写字母 */
+export function validateUpperCase(str: string) {
+  const reg = /^[A-Z]+$/
+  return reg.test(str)
+}
+
+/* 验证大小写字母 */
+export function validateAlphabets(str: string) {
+  const reg = /^[A-Za-z]+$/
+  return reg.test(str)
+}
+
+/**
+ * 验证邮箱
+ * @param email
+ * @returns {boolean}
+ */
+export function validateEmail(email: string) {
+  const re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
+  return re.test(email)
+}
+
+/**
+ * 验证手机号
+ * @param phone
+ * @returns {boolean}
+ */
+export function validateMobile(phone: string) {
+  const re = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/
+  return re.test(phone)
+}
+
+/**
+ * 校验身份证号
+ * @param value
+ * @returns
+ */
+export function validateIdCardNo(value: string) {
+  const re = /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/
+  return re.test(value)
+}
+/**
+ *
+ * @param value 验证电话号码
+ * @returns
+ */
+export function validatePhone(value: string) {
+  const re = /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/
+  return re.test(value)
+}

diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index bb58885..2959118 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -53,3 +53,64 @@
   }
   return true
 }
+
+/**
+ * 验证小写字母
+ * @param str
+ * @returns
+ */
+export function validateLowerCase(str: string) {
+  const reg = /^[a-z]+$/
+  return reg.test(str)
+}
+
+/* 验证大写字母 */
+export function validateUpperCase(str: string) {
+  const reg = /^[A-Z]+$/
+  return reg.test(str)
+}
+
+/* 验证大小写字母 */
+export function validateAlphabets(str: string) {
+  const reg = /^[A-Za-z]+$/
+  return reg.test(str)
+}
+
+/**
+ * 验证邮箱
+ * @param email
+ * @returns {boolean}
+ */
+export function validateEmail(email: string) {
+  const re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
+  return re.test(email)
+}
+
+/**
+ * 验证手机号
+ * @param phone
+ * @returns {boolean}
+ */
+export function validateMobile(phone: string) {
+  const re = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/
+  return re.test(phone)
+}
+
+/**
+ * 校验身份证号
+ * @param value
+ * @returns
+ */
+export function validateIdCardNo(value: string) {
+  const re = /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/
+  return re.test(value)
+}
+/**
+ *
+ * @param value 验证电话号码
+ * @returns
+ */
+export function validatePhone(value: string) {
+  const re = /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/
+  return re.test(value)
+}
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 1c2405e..bca0958 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,13 +1,46 @@
-<script lang="ts" setup name="borrowHandle">
-// 逻辑代码
+<!-- 设备借用处理 -->
+<script lang="ts" setup name="borrowApply">
+import list from './components/handleList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '待借用', comp: list },
+  { name: '已借用', comp: list },
+  { name: '已归还', comp: list },
+])
+const current = ref('待借用')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用处理
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>

diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index bb58885..2959118 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -53,3 +53,64 @@
   }
   return true
 }
+
+/**
+ * 验证小写字母
+ * @param str
+ * @returns
+ */
+export function validateLowerCase(str: string) {
+  const reg = /^[a-z]+$/
+  return reg.test(str)
+}
+
+/* 验证大写字母 */
+export function validateUpperCase(str: string) {
+  const reg = /^[A-Z]+$/
+  return reg.test(str)
+}
+
+/* 验证大小写字母 */
+export function validateAlphabets(str: string) {
+  const reg = /^[A-Za-z]+$/
+  return reg.test(str)
+}
+
+/**
+ * 验证邮箱
+ * @param email
+ * @returns {boolean}
+ */
+export function validateEmail(email: string) {
+  const re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
+  return re.test(email)
+}
+
+/**
+ * 验证手机号
+ * @param phone
+ * @returns {boolean}
+ */
+export function validateMobile(phone: string) {
+  const re = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/
+  return re.test(phone)
+}
+
+/**
+ * 校验身份证号
+ * @param value
+ * @returns
+ */
+export function validateIdCardNo(value: string) {
+  const re = /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/
+  return re.test(value)
+}
+/**
+ *
+ * @param value 验证电话号码
+ * @returns
+ */
+export function validatePhone(value: string) {
+  const re = /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/
+  return re.test(value)
+}
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 1c2405e..bca0958 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,13 +1,46 @@
-<script lang="ts" setup name="borrowHandle">
-// 逻辑代码
+<!-- 设备借用处理 -->
+<script lang="ts" setup name="borrowApply">
+import list from './components/handleList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '待借用', comp: list },
+  { name: '已借用', comp: list },
+  { name: '已归还', comp: list },
+])
+const current = ref('待借用')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用处理
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 03d414b..c5771f7 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,13 +1,50 @@
+<!-- 设备借用申请 -->
 <script lang="ts" setup name="borrowApply">
-// 逻辑代码
+import list from './components/applyList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '全部', comp: list },
+  { name: '草稿箱', comp: list },
+  { name: '待审批', comp: list },
+  { name: '审批中', comp: list },
+  { name: '已通过', comp: list },
+  { name: '未通过', comp: list },
+  { name: '已取消', comp: list },
+])
+const current = ref('全部')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用申请
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>

diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index bb58885..2959118 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -53,3 +53,64 @@
   }
   return true
 }
+
+/**
+ * 验证小写字母
+ * @param str
+ * @returns
+ */
+export function validateLowerCase(str: string) {
+  const reg = /^[a-z]+$/
+  return reg.test(str)
+}
+
+/* 验证大写字母 */
+export function validateUpperCase(str: string) {
+  const reg = /^[A-Z]+$/
+  return reg.test(str)
+}
+
+/* 验证大小写字母 */
+export function validateAlphabets(str: string) {
+  const reg = /^[A-Za-z]+$/
+  return reg.test(str)
+}
+
+/**
+ * 验证邮箱
+ * @param email
+ * @returns {boolean}
+ */
+export function validateEmail(email: string) {
+  const re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
+  return re.test(email)
+}
+
+/**
+ * 验证手机号
+ * @param phone
+ * @returns {boolean}
+ */
+export function validateMobile(phone: string) {
+  const re = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/
+  return re.test(phone)
+}
+
+/**
+ * 校验身份证号
+ * @param value
+ * @returns
+ */
+export function validateIdCardNo(value: string) {
+  const re = /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/
+  return re.test(value)
+}
+/**
+ *
+ * @param value 验证电话号码
+ * @returns
+ */
+export function validatePhone(value: string) {
+  const re = /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/
+  return re.test(value)
+}
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 1c2405e..bca0958 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,13 +1,46 @@
-<script lang="ts" setup name="borrowHandle">
-// 逻辑代码
+<!-- 设备借用处理 -->
+<script lang="ts" setup name="borrowApply">
+import list from './components/handleList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '待借用', comp: list },
+  { name: '已借用', comp: list },
+  { name: '已归还', comp: list },
+])
+const current = ref('待借用')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用处理
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 03d414b..c5771f7 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,13 +1,50 @@
+<!-- 设备借用申请 -->
 <script lang="ts" setup name="borrowApply">
-// 逻辑代码
+import list from './components/applyList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '全部', comp: list },
+  { name: '草稿箱', comp: list },
+  { name: '待审批', comp: list },
+  { name: '审批中', comp: list },
+  { name: '已通过', comp: list },
+  { name: '未通过', comp: list },
+  { name: '已取消', comp: list },
+])
+const current = ref('全部')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用申请
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
new file mode 100644
index 0000000..052f3ce
--- /dev/null
+++ b/src/views/device/borrow/components/applyList.vue
@@ -0,0 +1,328 @@
+<script lang="ts" setup name="borrowApplyList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '文件号',
+    value: 'fileNo',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '类别',
+    value: 'catergory',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '李四',
+      time: '2020-12-14 00:00:00',
+      status: '未通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const approveRef = ref()
+// 同意
+const agree = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '1',
+  })
+}
+// 驳回
+const reject = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '3',
+  })
+}
+// 拒绝
+const refuse = (row: any) => {
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
+}
+// 取消
+const cancel = (rowrow: any) => {
+  ElMessageBox.confirm(
+    '确认取消吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" @click="addBtn" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="agree(row)">
+                  同意
+                </el-button>
+                <el-button size="small" type="primary" link @click="reject(row)">
+                  驳回
+                </el-button>
+                <el-button size="small" type="primary" link @click="refuse(row)">
+                  拒绝
+                </el-button>
+                <el-button size="small" type="primary" link @click="cancel(row)">
+                  取消
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>

diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index bb58885..2959118 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -53,3 +53,64 @@
   }
   return true
 }
+
+/**
+ * 验证小写字母
+ * @param str
+ * @returns
+ */
+export function validateLowerCase(str: string) {
+  const reg = /^[a-z]+$/
+  return reg.test(str)
+}
+
+/* 验证大写字母 */
+export function validateUpperCase(str: string) {
+  const reg = /^[A-Z]+$/
+  return reg.test(str)
+}
+
+/* 验证大小写字母 */
+export function validateAlphabets(str: string) {
+  const reg = /^[A-Za-z]+$/
+  return reg.test(str)
+}
+
+/**
+ * 验证邮箱
+ * @param email
+ * @returns {boolean}
+ */
+export function validateEmail(email: string) {
+  const re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
+  return re.test(email)
+}
+
+/**
+ * 验证手机号
+ * @param phone
+ * @returns {boolean}
+ */
+export function validateMobile(phone: string) {
+  const re = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/
+  return re.test(phone)
+}
+
+/**
+ * 校验身份证号
+ * @param value
+ * @returns
+ */
+export function validateIdCardNo(value: string) {
+  const re = /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/
+  return re.test(value)
+}
+/**
+ *
+ * @param value 验证电话号码
+ * @returns
+ */
+export function validatePhone(value: string) {
+  const re = /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/
+  return re.test(value)
+}
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 1c2405e..bca0958 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,13 +1,46 @@
-<script lang="ts" setup name="borrowHandle">
-// 逻辑代码
+<!-- 设备借用处理 -->
+<script lang="ts" setup name="borrowApply">
+import list from './components/handleList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '待借用', comp: list },
+  { name: '已借用', comp: list },
+  { name: '已归还', comp: list },
+])
+const current = ref('待借用')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用处理
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 03d414b..c5771f7 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,13 +1,50 @@
+<!-- 设备借用申请 -->
 <script lang="ts" setup name="borrowApply">
-// 逻辑代码
+import list from './components/applyList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '全部', comp: list },
+  { name: '草稿箱', comp: list },
+  { name: '待审批', comp: list },
+  { name: '审批中', comp: list },
+  { name: '已通过', comp: list },
+  { name: '未通过', comp: list },
+  { name: '已取消', comp: list },
+])
+const current = ref('全部')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用申请
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
new file mode 100644
index 0000000..052f3ce
--- /dev/null
+++ b/src/views/device/borrow/components/applyList.vue
@@ -0,0 +1,328 @@
+<script lang="ts" setup name="borrowApplyList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '文件号',
+    value: 'fileNo',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '类别',
+    value: 'catergory',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '李四',
+      time: '2020-12-14 00:00:00',
+      status: '未通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const approveRef = ref()
+// 同意
+const agree = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '1',
+  })
+}
+// 驳回
+const reject = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '3',
+  })
+}
+// 拒绝
+const refuse = (row: any) => {
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
+}
+// 取消
+const cancel = (rowrow: any) => {
+  ElMessageBox.confirm(
+    '确认取消吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" @click="addBtn" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="agree(row)">
+                  同意
+                </el-button>
+                <el-button size="small" type="primary" link @click="reject(row)">
+                  驳回
+                </el-button>
+                <el-button size="small" type="primary" link @click="refuse(row)">
+                  拒绝
+                </el-button>
+                <el-button size="small" type="primary" link @click="cancel(row)">
+                  取消
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/components/approvalActionDialog.vue b/src/views/device/borrow/components/approvalActionDialog.vue
new file mode 100644
index 0000000..214876c
--- /dev/null
+++ b/src/views/device/borrow/components/approvalActionDialog.vue
@@ -0,0 +1,104 @@
+<!-- 审批操作弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
+const dialogVisibleApprove = ref(false)
+const form = reactive({
+  radio: '1',
+})
+const ruleFormRef = ref<FormInstance>()
+const rules = reactive<FormRules>({
+})
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const approvetime = ref('') // 审批时间
+const initDialog = (row: any) => {
+  dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
+}
+defineExpose({ initDialog })
+
+// 点击保存
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      dialogVisibleApprove.value = false
+      emits('resetData')
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  formEl.resetFields()
+  dialogVisibleApprove.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
+    <el-form
+      ref="ruleFormRef" :model="form"
+      :rules="rules" label-width="110px"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人">
+            <el-input disabled :value="userInfo.$state.name" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间">
+            <el-input disabled :value="approvetime" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
+        <el-button @click="resetForm(ruleFormRef)">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>

diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index bb58885..2959118 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -53,3 +53,64 @@
   }
   return true
 }
+
+/**
+ * 验证小写字母
+ * @param str
+ * @returns
+ */
+export function validateLowerCase(str: string) {
+  const reg = /^[a-z]+$/
+  return reg.test(str)
+}
+
+/* 验证大写字母 */
+export function validateUpperCase(str: string) {
+  const reg = /^[A-Z]+$/
+  return reg.test(str)
+}
+
+/* 验证大小写字母 */
+export function validateAlphabets(str: string) {
+  const reg = /^[A-Za-z]+$/
+  return reg.test(str)
+}
+
+/**
+ * 验证邮箱
+ * @param email
+ * @returns {boolean}
+ */
+export function validateEmail(email: string) {
+  const re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
+  return re.test(email)
+}
+
+/**
+ * 验证手机号
+ * @param phone
+ * @returns {boolean}
+ */
+export function validateMobile(phone: string) {
+  const re = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/
+  return re.test(phone)
+}
+
+/**
+ * 校验身份证号
+ * @param value
+ * @returns
+ */
+export function validateIdCardNo(value: string) {
+  const re = /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/
+  return re.test(value)
+}
+/**
+ *
+ * @param value 验证电话号码
+ * @returns
+ */
+export function validatePhone(value: string) {
+  const re = /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/
+  return re.test(value)
+}
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 1c2405e..bca0958 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,13 +1,46 @@
-<script lang="ts" setup name="borrowHandle">
-// 逻辑代码
+<!-- 设备借用处理 -->
+<script lang="ts" setup name="borrowApply">
+import list from './components/handleList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '待借用', comp: list },
+  { name: '已借用', comp: list },
+  { name: '已归还', comp: list },
+])
+const current = ref('待借用')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用处理
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 03d414b..c5771f7 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,13 +1,50 @@
+<!-- 设备借用申请 -->
 <script lang="ts" setup name="borrowApply">
-// 逻辑代码
+import list from './components/applyList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '全部', comp: list },
+  { name: '草稿箱', comp: list },
+  { name: '待审批', comp: list },
+  { name: '审批中', comp: list },
+  { name: '已通过', comp: list },
+  { name: '未通过', comp: list },
+  { name: '已取消', comp: list },
+])
+const current = ref('全部')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用申请
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
new file mode 100644
index 0000000..052f3ce
--- /dev/null
+++ b/src/views/device/borrow/components/applyList.vue
@@ -0,0 +1,328 @@
+<script lang="ts" setup name="borrowApplyList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '文件号',
+    value: 'fileNo',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '类别',
+    value: 'catergory',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '李四',
+      time: '2020-12-14 00:00:00',
+      status: '未通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const approveRef = ref()
+// 同意
+const agree = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '1',
+  })
+}
+// 驳回
+const reject = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '3',
+  })
+}
+// 拒绝
+const refuse = (row: any) => {
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
+}
+// 取消
+const cancel = (rowrow: any) => {
+  ElMessageBox.confirm(
+    '确认取消吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" @click="addBtn" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="agree(row)">
+                  同意
+                </el-button>
+                <el-button size="small" type="primary" link @click="reject(row)">
+                  驳回
+                </el-button>
+                <el-button size="small" type="primary" link @click="refuse(row)">
+                  拒绝
+                </el-button>
+                <el-button size="small" type="primary" link @click="cancel(row)">
+                  取消
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/components/approvalActionDialog.vue b/src/views/device/borrow/components/approvalActionDialog.vue
new file mode 100644
index 0000000..214876c
--- /dev/null
+++ b/src/views/device/borrow/components/approvalActionDialog.vue
@@ -0,0 +1,104 @@
+<!-- 审批操作弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
+const dialogVisibleApprove = ref(false)
+const form = reactive({
+  radio: '1',
+})
+const ruleFormRef = ref<FormInstance>()
+const rules = reactive<FormRules>({
+})
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const approvetime = ref('') // 审批时间
+const initDialog = (row: any) => {
+  dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
+}
+defineExpose({ initDialog })
+
+// 点击保存
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      dialogVisibleApprove.value = false
+      emits('resetData')
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  formEl.resetFields()
+  dialogVisibleApprove.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
+    <el-form
+      ref="ruleFormRef" :model="form"
+      :rules="rules" label-width="110px"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人">
+            <el-input disabled :value="userInfo.$state.name" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间">
+            <el-input disabled :value="approvetime" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
+        <el-button @click="resetForm(ruleFormRef)">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
new file mode 100644
index 0000000..cfda00a
--- /dev/null
+++ b/src/views/device/borrow/components/handleList.vue
@@ -0,0 +1,281 @@
+<script lang="ts" setup name="borrowHandleList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '申请编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'dept',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      dept: '顶级',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      dept: '徐州分中心',
+      user: '里斯',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+const borrow = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="borrow(row)">
+                  借用
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>

diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index bb58885..2959118 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -53,3 +53,64 @@
   }
   return true
 }
+
+/**
+ * 验证小写字母
+ * @param str
+ * @returns
+ */
+export function validateLowerCase(str: string) {
+  const reg = /^[a-z]+$/
+  return reg.test(str)
+}
+
+/* 验证大写字母 */
+export function validateUpperCase(str: string) {
+  const reg = /^[A-Z]+$/
+  return reg.test(str)
+}
+
+/* 验证大小写字母 */
+export function validateAlphabets(str: string) {
+  const reg = /^[A-Za-z]+$/
+  return reg.test(str)
+}
+
+/**
+ * 验证邮箱
+ * @param email
+ * @returns {boolean}
+ */
+export function validateEmail(email: string) {
+  const re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
+  return re.test(email)
+}
+
+/**
+ * 验证手机号
+ * @param phone
+ * @returns {boolean}
+ */
+export function validateMobile(phone: string) {
+  const re = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/
+  return re.test(phone)
+}
+
+/**
+ * 校验身份证号
+ * @param value
+ * @returns
+ */
+export function validateIdCardNo(value: string) {
+  const re = /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/
+  return re.test(value)
+}
+/**
+ *
+ * @param value 验证电话号码
+ * @returns
+ */
+export function validatePhone(value: string) {
+  const re = /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/
+  return re.test(value)
+}
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 1c2405e..bca0958 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,13 +1,46 @@
-<script lang="ts" setup name="borrowHandle">
-// 逻辑代码
+<!-- 设备借用处理 -->
+<script lang="ts" setup name="borrowApply">
+import list from './components/handleList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '待借用', comp: list },
+  { name: '已借用', comp: list },
+  { name: '已归还', comp: list },
+])
+const current = ref('待借用')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用处理
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 03d414b..c5771f7 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,13 +1,50 @@
+<!-- 设备借用申请 -->
 <script lang="ts" setup name="borrowApply">
-// 逻辑代码
+import list from './components/applyList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '全部', comp: list },
+  { name: '草稿箱', comp: list },
+  { name: '待审批', comp: list },
+  { name: '审批中', comp: list },
+  { name: '已通过', comp: list },
+  { name: '未通过', comp: list },
+  { name: '已取消', comp: list },
+])
+const current = ref('全部')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用申请
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
new file mode 100644
index 0000000..052f3ce
--- /dev/null
+++ b/src/views/device/borrow/components/applyList.vue
@@ -0,0 +1,328 @@
+<script lang="ts" setup name="borrowApplyList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '文件号',
+    value: 'fileNo',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '类别',
+    value: 'catergory',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '李四',
+      time: '2020-12-14 00:00:00',
+      status: '未通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const approveRef = ref()
+// 同意
+const agree = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '1',
+  })
+}
+// 驳回
+const reject = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '3',
+  })
+}
+// 拒绝
+const refuse = (row: any) => {
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
+}
+// 取消
+const cancel = (rowrow: any) => {
+  ElMessageBox.confirm(
+    '确认取消吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" @click="addBtn" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="agree(row)">
+                  同意
+                </el-button>
+                <el-button size="small" type="primary" link @click="reject(row)">
+                  驳回
+                </el-button>
+                <el-button size="small" type="primary" link @click="refuse(row)">
+                  拒绝
+                </el-button>
+                <el-button size="small" type="primary" link @click="cancel(row)">
+                  取消
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/components/approvalActionDialog.vue b/src/views/device/borrow/components/approvalActionDialog.vue
new file mode 100644
index 0000000..214876c
--- /dev/null
+++ b/src/views/device/borrow/components/approvalActionDialog.vue
@@ -0,0 +1,104 @@
+<!-- 审批操作弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
+const dialogVisibleApprove = ref(false)
+const form = reactive({
+  radio: '1',
+})
+const ruleFormRef = ref<FormInstance>()
+const rules = reactive<FormRules>({
+})
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const approvetime = ref('') // 审批时间
+const initDialog = (row: any) => {
+  dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
+}
+defineExpose({ initDialog })
+
+// 点击保存
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      dialogVisibleApprove.value = false
+      emits('resetData')
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  formEl.resetFields()
+  dialogVisibleApprove.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
+    <el-form
+      ref="ruleFormRef" :model="form"
+      :rules="rules" label-width="110px"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人">
+            <el-input disabled :value="userInfo.$state.name" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间">
+            <el-input disabled :value="approvetime" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
+        <el-button @click="resetForm(ruleFormRef)">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
new file mode 100644
index 0000000..cfda00a
--- /dev/null
+++ b/src/views/device/borrow/components/handleList.vue
@@ -0,0 +1,281 @@
+<script lang="ts" setup name="borrowHandleList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '申请编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'dept',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      dept: '顶级',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      dept: '徐州分中心',
+      user: '里斯',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+const borrow = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="borrow(row)">
+                  借用
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/addRow.vue b/src/views/device/standingBook/components/addRow.vue
index 1678cdb..07b03d1 100644
--- a/src/views/device/standingBook/components/addRow.vue
+++ b/src/views/device/standingBook/components/addRow.vue
@@ -5,7 +5,7 @@
 import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
+const formLabelWidth = '110px'
 const form = ref({})
 const formTable = ref([
   {
@@ -91,108 +91,188 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`">
+  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
     >
       <div v-if="name === '周检记录'">
-        <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录表编号" />
-        </el-form-item>
-        <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录人" />
-        </el-form-item>
-        <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="检定日期"
-          />
-        </el-form-item>
-        <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="有效日期"
-          />
-        </el-form-item>
-        <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="送检人" />
-        </el-form-item>
-        <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录表编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="检定日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="有效日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="送检人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '状态变更记录'">
-        <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="状态类型" clearable>
-            <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="结束日期"
-          />
-        </el-form-item>
-        <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="申请人" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="状态类型" clearable style="width: 100%;">
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="申请人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '使用记录'">
-        <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用人" />
-        </el-form-item>
-        <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用部门" />
-        </el-form-item>
-        <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="使用类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用结束日期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用部门" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="使用类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '检定证书'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="证书类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书出具日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书有效期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
     </el-form>
     <template #footer>

diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index bb58885..2959118 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -53,3 +53,64 @@
   }
   return true
 }
+
+/**
+ * 验证小写字母
+ * @param str
+ * @returns
+ */
+export function validateLowerCase(str: string) {
+  const reg = /^[a-z]+$/
+  return reg.test(str)
+}
+
+/* 验证大写字母 */
+export function validateUpperCase(str: string) {
+  const reg = /^[A-Z]+$/
+  return reg.test(str)
+}
+
+/* 验证大小写字母 */
+export function validateAlphabets(str: string) {
+  const reg = /^[A-Za-z]+$/
+  return reg.test(str)
+}
+
+/**
+ * 验证邮箱
+ * @param email
+ * @returns {boolean}
+ */
+export function validateEmail(email: string) {
+  const re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
+  return re.test(email)
+}
+
+/**
+ * 验证手机号
+ * @param phone
+ * @returns {boolean}
+ */
+export function validateMobile(phone: string) {
+  const re = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/
+  return re.test(phone)
+}
+
+/**
+ * 校验身份证号
+ * @param value
+ * @returns
+ */
+export function validateIdCardNo(value: string) {
+  const re = /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/
+  return re.test(value)
+}
+/**
+ *
+ * @param value 验证电话号码
+ * @returns
+ */
+export function validatePhone(value: string) {
+  const re = /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/
+  return re.test(value)
+}
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 1c2405e..bca0958 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,13 +1,46 @@
-<script lang="ts" setup name="borrowHandle">
-// 逻辑代码
+<!-- 设备借用处理 -->
+<script lang="ts" setup name="borrowApply">
+import list from './components/handleList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '待借用', comp: list },
+  { name: '已借用', comp: list },
+  { name: '已归还', comp: list },
+])
+const current = ref('待借用')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用处理
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 03d414b..c5771f7 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,13 +1,50 @@
+<!-- 设备借用申请 -->
 <script lang="ts" setup name="borrowApply">
-// 逻辑代码
+import list from './components/applyList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '全部', comp: list },
+  { name: '草稿箱', comp: list },
+  { name: '待审批', comp: list },
+  { name: '审批中', comp: list },
+  { name: '已通过', comp: list },
+  { name: '未通过', comp: list },
+  { name: '已取消', comp: list },
+])
+const current = ref('全部')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用申请
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
new file mode 100644
index 0000000..052f3ce
--- /dev/null
+++ b/src/views/device/borrow/components/applyList.vue
@@ -0,0 +1,328 @@
+<script lang="ts" setup name="borrowApplyList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '文件号',
+    value: 'fileNo',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '类别',
+    value: 'catergory',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '李四',
+      time: '2020-12-14 00:00:00',
+      status: '未通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const approveRef = ref()
+// 同意
+const agree = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '1',
+  })
+}
+// 驳回
+const reject = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '3',
+  })
+}
+// 拒绝
+const refuse = (row: any) => {
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
+}
+// 取消
+const cancel = (rowrow: any) => {
+  ElMessageBox.confirm(
+    '确认取消吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" @click="addBtn" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="agree(row)">
+                  同意
+                </el-button>
+                <el-button size="small" type="primary" link @click="reject(row)">
+                  驳回
+                </el-button>
+                <el-button size="small" type="primary" link @click="refuse(row)">
+                  拒绝
+                </el-button>
+                <el-button size="small" type="primary" link @click="cancel(row)">
+                  取消
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/components/approvalActionDialog.vue b/src/views/device/borrow/components/approvalActionDialog.vue
new file mode 100644
index 0000000..214876c
--- /dev/null
+++ b/src/views/device/borrow/components/approvalActionDialog.vue
@@ -0,0 +1,104 @@
+<!-- 审批操作弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
+const dialogVisibleApprove = ref(false)
+const form = reactive({
+  radio: '1',
+})
+const ruleFormRef = ref<FormInstance>()
+const rules = reactive<FormRules>({
+})
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const approvetime = ref('') // 审批时间
+const initDialog = (row: any) => {
+  dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
+}
+defineExpose({ initDialog })
+
+// 点击保存
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      dialogVisibleApprove.value = false
+      emits('resetData')
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  formEl.resetFields()
+  dialogVisibleApprove.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
+    <el-form
+      ref="ruleFormRef" :model="form"
+      :rules="rules" label-width="110px"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人">
+            <el-input disabled :value="userInfo.$state.name" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间">
+            <el-input disabled :value="approvetime" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
+        <el-button @click="resetForm(ruleFormRef)">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
new file mode 100644
index 0000000..cfda00a
--- /dev/null
+++ b/src/views/device/borrow/components/handleList.vue
@@ -0,0 +1,281 @@
+<script lang="ts" setup name="borrowHandleList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '申请编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'dept',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      dept: '顶级',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      dept: '徐州分中心',
+      user: '里斯',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+const borrow = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="borrow(row)">
+                  借用
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/addRow.vue b/src/views/device/standingBook/components/addRow.vue
index 1678cdb..07b03d1 100644
--- a/src/views/device/standingBook/components/addRow.vue
+++ b/src/views/device/standingBook/components/addRow.vue
@@ -5,7 +5,7 @@
 import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
+const formLabelWidth = '110px'
 const form = ref({})
 const formTable = ref([
   {
@@ -91,108 +91,188 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`">
+  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
     >
       <div v-if="name === '周检记录'">
-        <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录表编号" />
-        </el-form-item>
-        <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录人" />
-        </el-form-item>
-        <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="检定日期"
-          />
-        </el-form-item>
-        <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="有效日期"
-          />
-        </el-form-item>
-        <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="送检人" />
-        </el-form-item>
-        <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录表编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="检定日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="有效日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="送检人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '状态变更记录'">
-        <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="状态类型" clearable>
-            <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="结束日期"
-          />
-        </el-form-item>
-        <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="申请人" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="状态类型" clearable style="width: 100%;">
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="申请人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '使用记录'">
-        <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用人" />
-        </el-form-item>
-        <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用部门" />
-        </el-form-item>
-        <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="使用类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用结束日期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用部门" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="使用类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '检定证书'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="证书类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书出具日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书有效期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
     </el-form>
     <template #footer>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 5f7b347..9a9f798 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -352,7 +352,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -376,7 +376,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -391,7 +391,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -404,14 +404,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -434,7 +434,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -443,20 +443,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -480,23 +480,23 @@
               <com-tree-select
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -507,10 +507,10 @@
             <el-form-item label="检定部门" prop="mesureDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -520,7 +520,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -529,13 +529,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -544,21 +544,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -578,14 +578,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -594,14 +594,14 @@
         <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-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -669,7 +669,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>

diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index bb58885..2959118 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -53,3 +53,64 @@
   }
   return true
 }
+
+/**
+ * 验证小写字母
+ * @param str
+ * @returns
+ */
+export function validateLowerCase(str: string) {
+  const reg = /^[a-z]+$/
+  return reg.test(str)
+}
+
+/* 验证大写字母 */
+export function validateUpperCase(str: string) {
+  const reg = /^[A-Z]+$/
+  return reg.test(str)
+}
+
+/* 验证大小写字母 */
+export function validateAlphabets(str: string) {
+  const reg = /^[A-Za-z]+$/
+  return reg.test(str)
+}
+
+/**
+ * 验证邮箱
+ * @param email
+ * @returns {boolean}
+ */
+export function validateEmail(email: string) {
+  const re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
+  return re.test(email)
+}
+
+/**
+ * 验证手机号
+ * @param phone
+ * @returns {boolean}
+ */
+export function validateMobile(phone: string) {
+  const re = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/
+  return re.test(phone)
+}
+
+/**
+ * 校验身份证号
+ * @param value
+ * @returns
+ */
+export function validateIdCardNo(value: string) {
+  const re = /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/
+  return re.test(value)
+}
+/**
+ *
+ * @param value 验证电话号码
+ * @returns
+ */
+export function validatePhone(value: string) {
+  const re = /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/
+  return re.test(value)
+}
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 1c2405e..bca0958 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,13 +1,46 @@
-<script lang="ts" setup name="borrowHandle">
-// 逻辑代码
+<!-- 设备借用处理 -->
+<script lang="ts" setup name="borrowApply">
+import list from './components/handleList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '待借用', comp: list },
+  { name: '已借用', comp: list },
+  { name: '已归还', comp: list },
+])
+const current = ref('待借用')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用处理
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 03d414b..c5771f7 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,13 +1,50 @@
+<!-- 设备借用申请 -->
 <script lang="ts" setup name="borrowApply">
-// 逻辑代码
+import list from './components/applyList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '全部', comp: list },
+  { name: '草稿箱', comp: list },
+  { name: '待审批', comp: list },
+  { name: '审批中', comp: list },
+  { name: '已通过', comp: list },
+  { name: '未通过', comp: list },
+  { name: '已取消', comp: list },
+])
+const current = ref('全部')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用申请
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
new file mode 100644
index 0000000..052f3ce
--- /dev/null
+++ b/src/views/device/borrow/components/applyList.vue
@@ -0,0 +1,328 @@
+<script lang="ts" setup name="borrowApplyList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '文件号',
+    value: 'fileNo',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '类别',
+    value: 'catergory',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '李四',
+      time: '2020-12-14 00:00:00',
+      status: '未通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const approveRef = ref()
+// 同意
+const agree = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '1',
+  })
+}
+// 驳回
+const reject = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '3',
+  })
+}
+// 拒绝
+const refuse = (row: any) => {
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
+}
+// 取消
+const cancel = (rowrow: any) => {
+  ElMessageBox.confirm(
+    '确认取消吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" @click="addBtn" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="agree(row)">
+                  同意
+                </el-button>
+                <el-button size="small" type="primary" link @click="reject(row)">
+                  驳回
+                </el-button>
+                <el-button size="small" type="primary" link @click="refuse(row)">
+                  拒绝
+                </el-button>
+                <el-button size="small" type="primary" link @click="cancel(row)">
+                  取消
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/components/approvalActionDialog.vue b/src/views/device/borrow/components/approvalActionDialog.vue
new file mode 100644
index 0000000..214876c
--- /dev/null
+++ b/src/views/device/borrow/components/approvalActionDialog.vue
@@ -0,0 +1,104 @@
+<!-- 审批操作弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
+const dialogVisibleApprove = ref(false)
+const form = reactive({
+  radio: '1',
+})
+const ruleFormRef = ref<FormInstance>()
+const rules = reactive<FormRules>({
+})
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const approvetime = ref('') // 审批时间
+const initDialog = (row: any) => {
+  dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
+}
+defineExpose({ initDialog })
+
+// 点击保存
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      dialogVisibleApprove.value = false
+      emits('resetData')
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  formEl.resetFields()
+  dialogVisibleApprove.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
+    <el-form
+      ref="ruleFormRef" :model="form"
+      :rules="rules" label-width="110px"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人">
+            <el-input disabled :value="userInfo.$state.name" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间">
+            <el-input disabled :value="approvetime" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
+        <el-button @click="resetForm(ruleFormRef)">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
new file mode 100644
index 0000000..cfda00a
--- /dev/null
+++ b/src/views/device/borrow/components/handleList.vue
@@ -0,0 +1,281 @@
+<script lang="ts" setup name="borrowHandleList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '申请编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'dept',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      dept: '顶级',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      dept: '徐州分中心',
+      user: '里斯',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+const borrow = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="borrow(row)">
+                  借用
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/addRow.vue b/src/views/device/standingBook/components/addRow.vue
index 1678cdb..07b03d1 100644
--- a/src/views/device/standingBook/components/addRow.vue
+++ b/src/views/device/standingBook/components/addRow.vue
@@ -5,7 +5,7 @@
 import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
+const formLabelWidth = '110px'
 const form = ref({})
 const formTable = ref([
   {
@@ -91,108 +91,188 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`">
+  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
     >
       <div v-if="name === '周检记录'">
-        <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录表编号" />
-        </el-form-item>
-        <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录人" />
-        </el-form-item>
-        <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="检定日期"
-          />
-        </el-form-item>
-        <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="有效日期"
-          />
-        </el-form-item>
-        <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="送检人" />
-        </el-form-item>
-        <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录表编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="检定日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="有效日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="送检人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '状态变更记录'">
-        <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="状态类型" clearable>
-            <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="结束日期"
-          />
-        </el-form-item>
-        <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="申请人" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="状态类型" clearable style="width: 100%;">
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="申请人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '使用记录'">
-        <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用人" />
-        </el-form-item>
-        <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用部门" />
-        </el-form-item>
-        <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="使用类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用结束日期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用部门" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="使用类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '检定证书'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="证书类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书出具日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书有效期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
     </el-form>
     <template #footer>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 5f7b347..9a9f798 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -352,7 +352,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -376,7 +376,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -391,7 +391,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -404,14 +404,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -434,7 +434,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -443,20 +443,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -480,23 +480,23 @@
               <com-tree-select
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -507,10 +507,10 @@
             <el-form-item label="检定部门" prop="mesureDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -520,7 +520,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -529,13 +529,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -544,21 +544,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -578,14 +578,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -594,14 +594,14 @@
         <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-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -669,7 +669,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index fc3fd54..d9d4514 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -199,6 +199,8 @@
     useDeptList.value = toTreeList(res.data, '0', true)
   })
 }
+const selectTreeRef1 = ref()
+const selectTreeRef2 = ref()
 // 重置
 const resetDATA = () => {
   ruleForm.value = {
@@ -254,6 +256,10 @@
     isStandardSupportEquipment: '', //		是否标准配套设备
     id: '',
   }
+  if (title.value !== '详情') {
+    selectTreeRef1.value.clearSelected()
+    selectTreeRef2.value.clearSelected()
+  }
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
@@ -378,7 +384,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -402,7 +408,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -416,8 +422,7 @@
             <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"
+                :placeholder="title === '详情' ? '' : '出厂年月'" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -430,14 +435,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -460,7 +465,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -469,20 +474,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -505,24 +510,26 @@
             <el-form-item label="使用部门" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
+                ref="selectTreeRef2"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -536,10 +543,12 @@
               </el-select> -->
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                ref="selectTreeRef1"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -549,7 +558,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -558,13 +567,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -573,21 +582,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -607,14 +616,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -624,14 +633,14 @@
           <el-col :span="6">
             <el-form-item label="资本来源" prop="capitalSource">
               <!-- <el-input v-model.trim="ruleForm.capitalSource" placeholder="资本来源" :disabled="title === '详情'" /> -->
-              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -699,7 +708,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>

diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index bb58885..2959118 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -53,3 +53,64 @@
   }
   return true
 }
+
+/**
+ * 验证小写字母
+ * @param str
+ * @returns
+ */
+export function validateLowerCase(str: string) {
+  const reg = /^[a-z]+$/
+  return reg.test(str)
+}
+
+/* 验证大写字母 */
+export function validateUpperCase(str: string) {
+  const reg = /^[A-Z]+$/
+  return reg.test(str)
+}
+
+/* 验证大小写字母 */
+export function validateAlphabets(str: string) {
+  const reg = /^[A-Za-z]+$/
+  return reg.test(str)
+}
+
+/**
+ * 验证邮箱
+ * @param email
+ * @returns {boolean}
+ */
+export function validateEmail(email: string) {
+  const re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
+  return re.test(email)
+}
+
+/**
+ * 验证手机号
+ * @param phone
+ * @returns {boolean}
+ */
+export function validateMobile(phone: string) {
+  const re = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/
+  return re.test(phone)
+}
+
+/**
+ * 校验身份证号
+ * @param value
+ * @returns
+ */
+export function validateIdCardNo(value: string) {
+  const re = /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/
+  return re.test(value)
+}
+/**
+ *
+ * @param value 验证电话号码
+ * @returns
+ */
+export function validatePhone(value: string) {
+  const re = /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/
+  return re.test(value)
+}
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 1c2405e..bca0958 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,13 +1,46 @@
-<script lang="ts" setup name="borrowHandle">
-// 逻辑代码
+<!-- 设备借用处理 -->
+<script lang="ts" setup name="borrowApply">
+import list from './components/handleList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '待借用', comp: list },
+  { name: '已借用', comp: list },
+  { name: '已归还', comp: list },
+])
+const current = ref('待借用')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用处理
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 03d414b..c5771f7 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,13 +1,50 @@
+<!-- 设备借用申请 -->
 <script lang="ts" setup name="borrowApply">
-// 逻辑代码
+import list from './components/applyList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '全部', comp: list },
+  { name: '草稿箱', comp: list },
+  { name: '待审批', comp: list },
+  { name: '审批中', comp: list },
+  { name: '已通过', comp: list },
+  { name: '未通过', comp: list },
+  { name: '已取消', comp: list },
+])
+const current = ref('全部')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用申请
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
new file mode 100644
index 0000000..052f3ce
--- /dev/null
+++ b/src/views/device/borrow/components/applyList.vue
@@ -0,0 +1,328 @@
+<script lang="ts" setup name="borrowApplyList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '文件号',
+    value: 'fileNo',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '类别',
+    value: 'catergory',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '李四',
+      time: '2020-12-14 00:00:00',
+      status: '未通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const approveRef = ref()
+// 同意
+const agree = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '1',
+  })
+}
+// 驳回
+const reject = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '3',
+  })
+}
+// 拒绝
+const refuse = (row: any) => {
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
+}
+// 取消
+const cancel = (rowrow: any) => {
+  ElMessageBox.confirm(
+    '确认取消吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" @click="addBtn" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="agree(row)">
+                  同意
+                </el-button>
+                <el-button size="small" type="primary" link @click="reject(row)">
+                  驳回
+                </el-button>
+                <el-button size="small" type="primary" link @click="refuse(row)">
+                  拒绝
+                </el-button>
+                <el-button size="small" type="primary" link @click="cancel(row)">
+                  取消
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/components/approvalActionDialog.vue b/src/views/device/borrow/components/approvalActionDialog.vue
new file mode 100644
index 0000000..214876c
--- /dev/null
+++ b/src/views/device/borrow/components/approvalActionDialog.vue
@@ -0,0 +1,104 @@
+<!-- 审批操作弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
+const dialogVisibleApprove = ref(false)
+const form = reactive({
+  radio: '1',
+})
+const ruleFormRef = ref<FormInstance>()
+const rules = reactive<FormRules>({
+})
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const approvetime = ref('') // 审批时间
+const initDialog = (row: any) => {
+  dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
+}
+defineExpose({ initDialog })
+
+// 点击保存
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      dialogVisibleApprove.value = false
+      emits('resetData')
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  formEl.resetFields()
+  dialogVisibleApprove.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
+    <el-form
+      ref="ruleFormRef" :model="form"
+      :rules="rules" label-width="110px"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人">
+            <el-input disabled :value="userInfo.$state.name" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间">
+            <el-input disabled :value="approvetime" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
+        <el-button @click="resetForm(ruleFormRef)">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
new file mode 100644
index 0000000..cfda00a
--- /dev/null
+++ b/src/views/device/borrow/components/handleList.vue
@@ -0,0 +1,281 @@
+<script lang="ts" setup name="borrowHandleList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '申请编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'dept',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      dept: '顶级',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      dept: '徐州分中心',
+      user: '里斯',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+const borrow = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="borrow(row)">
+                  借用
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/addRow.vue b/src/views/device/standingBook/components/addRow.vue
index 1678cdb..07b03d1 100644
--- a/src/views/device/standingBook/components/addRow.vue
+++ b/src/views/device/standingBook/components/addRow.vue
@@ -5,7 +5,7 @@
 import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
+const formLabelWidth = '110px'
 const form = ref({})
 const formTable = ref([
   {
@@ -91,108 +91,188 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`">
+  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
     >
       <div v-if="name === '周检记录'">
-        <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录表编号" />
-        </el-form-item>
-        <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录人" />
-        </el-form-item>
-        <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="检定日期"
-          />
-        </el-form-item>
-        <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="有效日期"
-          />
-        </el-form-item>
-        <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="送检人" />
-        </el-form-item>
-        <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录表编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="检定日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="有效日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="送检人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '状态变更记录'">
-        <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="状态类型" clearable>
-            <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="结束日期"
-          />
-        </el-form-item>
-        <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="申请人" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="状态类型" clearable style="width: 100%;">
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="申请人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '使用记录'">
-        <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用人" />
-        </el-form-item>
-        <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用部门" />
-        </el-form-item>
-        <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="使用类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用结束日期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用部门" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="使用类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '检定证书'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="证书类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书出具日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书有效期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
     </el-form>
     <template #footer>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 5f7b347..9a9f798 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -352,7 +352,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -376,7 +376,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -391,7 +391,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -404,14 +404,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -434,7 +434,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -443,20 +443,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -480,23 +480,23 @@
               <com-tree-select
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -507,10 +507,10 @@
             <el-form-item label="检定部门" prop="mesureDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -520,7 +520,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -529,13 +529,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -544,21 +544,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -578,14 +578,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -594,14 +594,14 @@
         <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-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -669,7 +669,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index fc3fd54..d9d4514 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -199,6 +199,8 @@
     useDeptList.value = toTreeList(res.data, '0', true)
   })
 }
+const selectTreeRef1 = ref()
+const selectTreeRef2 = ref()
 // 重置
 const resetDATA = () => {
   ruleForm.value = {
@@ -254,6 +256,10 @@
     isStandardSupportEquipment: '', //		是否标准配套设备
     id: '',
   }
+  if (title.value !== '详情') {
+    selectTreeRef1.value.clearSelected()
+    selectTreeRef2.value.clearSelected()
+  }
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
@@ -378,7 +384,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -402,7 +408,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -416,8 +422,7 @@
             <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"
+                :placeholder="title === '详情' ? '' : '出厂年月'" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -430,14 +435,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -460,7 +465,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -469,20 +474,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -505,24 +510,26 @@
             <el-form-item label="使用部门" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
+                ref="selectTreeRef2"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -536,10 +543,12 @@
               </el-select> -->
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                ref="selectTreeRef1"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -549,7 +558,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -558,13 +567,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -573,21 +582,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -607,14 +616,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -624,14 +633,14 @@
           <el-col :span="6">
             <el-form-item label="资本来源" prop="capitalSource">
               <!-- <el-input v-model.trim="ruleForm.capitalSource" placeholder="资本来源" :disabled="title === '详情'" /> -->
-              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -699,7 +708,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f653095..f4229a6 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -147,19 +147,17 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
-  setTimeout(() => {
-    list.value = [
-      {
-        equipmentNo: 123,
-        equipmentName: 'test',
-        modelNo: '001',
-        usePersonName: '张三',
-        validDate: '2022-12-12 00:00:00',
-        useDeptName: '顶级',
-      },
-    ]
-    total.value = 1
-  }, 1000)
+  list.value = [
+    {
+      equipmentNo: 123,
+      equipmentName: 'test',
+      modelNo: '001',
+      usePersonName: '张三',
+      validDate: '2022-12-12 00:00:00',
+      useDeptName: '顶级',
+    },
+  ] as any
+  total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -220,9 +218,11 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -300,13 +300,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.mesureType" class="m-2 normal-select" placeholder="检定方式" clearable>
+          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable>
             <el-option
               v-for="item in mesureTypeList"
               :key="item.id"
@@ -316,7 +316,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.managerState" class="m-2 normal-select" placeholder="管理状态" clearable>
+          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable>
             <el-option
               v-for="item in managerStateList"
               :key="item.id"
@@ -327,8 +327,9 @@
         </search-item>
         <search-item>
           <com-tree-select
+            ref="selectTreeRef"
             v-model="searchQuery.useDept" :options="useDeptList" placeholder="使用部门"
-            :tree-props="deptProps" style="width: 150px;"
+            :tree-props="deptProps"
           />
         </search-item>
         <search-item>
@@ -336,11 +337,10 @@
             v-model="searchQuery.validDate" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="有效日期"
             class="normal-date"
-            style="width: 150px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.abc" class="m-2 normal-select" placeholder="ABC" clearable>
+          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable>
             <el-option
               v-for="item in abcList"
               :key="item.id"

diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index bb58885..2959118 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -53,3 +53,64 @@
   }
   return true
 }
+
+/**
+ * 验证小写字母
+ * @param str
+ * @returns
+ */
+export function validateLowerCase(str: string) {
+  const reg = /^[a-z]+$/
+  return reg.test(str)
+}
+
+/* 验证大写字母 */
+export function validateUpperCase(str: string) {
+  const reg = /^[A-Z]+$/
+  return reg.test(str)
+}
+
+/* 验证大小写字母 */
+export function validateAlphabets(str: string) {
+  const reg = /^[A-Za-z]+$/
+  return reg.test(str)
+}
+
+/**
+ * 验证邮箱
+ * @param email
+ * @returns {boolean}
+ */
+export function validateEmail(email: string) {
+  const re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
+  return re.test(email)
+}
+
+/**
+ * 验证手机号
+ * @param phone
+ * @returns {boolean}
+ */
+export function validateMobile(phone: string) {
+  const re = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/
+  return re.test(phone)
+}
+
+/**
+ * 校验身份证号
+ * @param value
+ * @returns
+ */
+export function validateIdCardNo(value: string) {
+  const re = /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/
+  return re.test(value)
+}
+/**
+ *
+ * @param value 验证电话号码
+ * @returns
+ */
+export function validatePhone(value: string) {
+  const re = /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/
+  return re.test(value)
+}
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 1c2405e..bca0958 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,13 +1,46 @@
-<script lang="ts" setup name="borrowHandle">
-// 逻辑代码
+<!-- 设备借用处理 -->
+<script lang="ts" setup name="borrowApply">
+import list from './components/handleList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '待借用', comp: list },
+  { name: '已借用', comp: list },
+  { name: '已归还', comp: list },
+])
+const current = ref('待借用')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用处理
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 03d414b..c5771f7 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,13 +1,50 @@
+<!-- 设备借用申请 -->
 <script lang="ts" setup name="borrowApply">
-// 逻辑代码
+import list from './components/applyList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '全部', comp: list },
+  { name: '草稿箱', comp: list },
+  { name: '待审批', comp: list },
+  { name: '审批中', comp: list },
+  { name: '已通过', comp: list },
+  { name: '未通过', comp: list },
+  { name: '已取消', comp: list },
+])
+const current = ref('全部')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用申请
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
new file mode 100644
index 0000000..052f3ce
--- /dev/null
+++ b/src/views/device/borrow/components/applyList.vue
@@ -0,0 +1,328 @@
+<script lang="ts" setup name="borrowApplyList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '文件号',
+    value: 'fileNo',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '类别',
+    value: 'catergory',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '李四',
+      time: '2020-12-14 00:00:00',
+      status: '未通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const approveRef = ref()
+// 同意
+const agree = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '1',
+  })
+}
+// 驳回
+const reject = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '3',
+  })
+}
+// 拒绝
+const refuse = (row: any) => {
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
+}
+// 取消
+const cancel = (rowrow: any) => {
+  ElMessageBox.confirm(
+    '确认取消吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" @click="addBtn" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="agree(row)">
+                  同意
+                </el-button>
+                <el-button size="small" type="primary" link @click="reject(row)">
+                  驳回
+                </el-button>
+                <el-button size="small" type="primary" link @click="refuse(row)">
+                  拒绝
+                </el-button>
+                <el-button size="small" type="primary" link @click="cancel(row)">
+                  取消
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/components/approvalActionDialog.vue b/src/views/device/borrow/components/approvalActionDialog.vue
new file mode 100644
index 0000000..214876c
--- /dev/null
+++ b/src/views/device/borrow/components/approvalActionDialog.vue
@@ -0,0 +1,104 @@
+<!-- 审批操作弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
+const dialogVisibleApprove = ref(false)
+const form = reactive({
+  radio: '1',
+})
+const ruleFormRef = ref<FormInstance>()
+const rules = reactive<FormRules>({
+})
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const approvetime = ref('') // 审批时间
+const initDialog = (row: any) => {
+  dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
+}
+defineExpose({ initDialog })
+
+// 点击保存
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      dialogVisibleApprove.value = false
+      emits('resetData')
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  formEl.resetFields()
+  dialogVisibleApprove.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
+    <el-form
+      ref="ruleFormRef" :model="form"
+      :rules="rules" label-width="110px"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人">
+            <el-input disabled :value="userInfo.$state.name" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间">
+            <el-input disabled :value="approvetime" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
+        <el-button @click="resetForm(ruleFormRef)">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
new file mode 100644
index 0000000..cfda00a
--- /dev/null
+++ b/src/views/device/borrow/components/handleList.vue
@@ -0,0 +1,281 @@
+<script lang="ts" setup name="borrowHandleList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '申请编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'dept',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      dept: '顶级',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      dept: '徐州分中心',
+      user: '里斯',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+const borrow = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="borrow(row)">
+                  借用
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/addRow.vue b/src/views/device/standingBook/components/addRow.vue
index 1678cdb..07b03d1 100644
--- a/src/views/device/standingBook/components/addRow.vue
+++ b/src/views/device/standingBook/components/addRow.vue
@@ -5,7 +5,7 @@
 import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
+const formLabelWidth = '110px'
 const form = ref({})
 const formTable = ref([
   {
@@ -91,108 +91,188 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`">
+  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
     >
       <div v-if="name === '周检记录'">
-        <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录表编号" />
-        </el-form-item>
-        <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录人" />
-        </el-form-item>
-        <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="检定日期"
-          />
-        </el-form-item>
-        <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="有效日期"
-          />
-        </el-form-item>
-        <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="送检人" />
-        </el-form-item>
-        <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录表编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="检定日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="有效日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="送检人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '状态变更记录'">
-        <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="状态类型" clearable>
-            <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="结束日期"
-          />
-        </el-form-item>
-        <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="申请人" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="状态类型" clearable style="width: 100%;">
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="申请人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '使用记录'">
-        <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用人" />
-        </el-form-item>
-        <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用部门" />
-        </el-form-item>
-        <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="使用类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用结束日期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用部门" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="使用类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '检定证书'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="证书类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书出具日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书有效期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
     </el-form>
     <template #footer>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 5f7b347..9a9f798 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -352,7 +352,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -376,7 +376,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -391,7 +391,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -404,14 +404,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -434,7 +434,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -443,20 +443,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -480,23 +480,23 @@
               <com-tree-select
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -507,10 +507,10 @@
             <el-form-item label="检定部门" prop="mesureDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -520,7 +520,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -529,13 +529,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -544,21 +544,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -578,14 +578,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -594,14 +594,14 @@
         <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-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -669,7 +669,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index fc3fd54..d9d4514 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -199,6 +199,8 @@
     useDeptList.value = toTreeList(res.data, '0', true)
   })
 }
+const selectTreeRef1 = ref()
+const selectTreeRef2 = ref()
 // 重置
 const resetDATA = () => {
   ruleForm.value = {
@@ -254,6 +256,10 @@
     isStandardSupportEquipment: '', //		是否标准配套设备
     id: '',
   }
+  if (title.value !== '详情') {
+    selectTreeRef1.value.clearSelected()
+    selectTreeRef2.value.clearSelected()
+  }
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
@@ -378,7 +384,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -402,7 +408,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -416,8 +422,7 @@
             <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"
+                :placeholder="title === '详情' ? '' : '出厂年月'" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -430,14 +435,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -460,7 +465,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -469,20 +474,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -505,24 +510,26 @@
             <el-form-item label="使用部门" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
+                ref="selectTreeRef2"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -536,10 +543,12 @@
               </el-select> -->
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                ref="selectTreeRef1"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -549,7 +558,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -558,13 +567,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -573,21 +582,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -607,14 +616,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -624,14 +633,14 @@
           <el-col :span="6">
             <el-form-item label="资本来源" prop="capitalSource">
               <!-- <el-input v-model.trim="ruleForm.capitalSource" placeholder="资本来源" :disabled="title === '详情'" /> -->
-              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -699,7 +708,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f653095..f4229a6 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -147,19 +147,17 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
-  setTimeout(() => {
-    list.value = [
-      {
-        equipmentNo: 123,
-        equipmentName: 'test',
-        modelNo: '001',
-        usePersonName: '张三',
-        validDate: '2022-12-12 00:00:00',
-        useDeptName: '顶级',
-      },
-    ]
-    total.value = 1
-  }, 1000)
+  list.value = [
+    {
+      equipmentNo: 123,
+      equipmentName: 'test',
+      modelNo: '001',
+      usePersonName: '张三',
+      validDate: '2022-12-12 00:00:00',
+      useDeptName: '顶级',
+    },
+  ] as any
+  total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -220,9 +218,11 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -300,13 +300,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.mesureType" class="m-2 normal-select" placeholder="检定方式" clearable>
+          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable>
             <el-option
               v-for="item in mesureTypeList"
               :key="item.id"
@@ -316,7 +316,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.managerState" class="m-2 normal-select" placeholder="管理状态" clearable>
+          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable>
             <el-option
               v-for="item in managerStateList"
               :key="item.id"
@@ -327,8 +327,9 @@
         </search-item>
         <search-item>
           <com-tree-select
+            ref="selectTreeRef"
             v-model="searchQuery.useDept" :options="useDeptList" placeholder="使用部门"
-            :tree-props="deptProps" style="width: 150px;"
+            :tree-props="deptProps"
           />
         </search-item>
         <search-item>
@@ -336,11 +337,10 @@
             v-model="searchQuery.validDate" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="有效日期"
             class="normal-date"
-            style="width: 150px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.abc" class="m-2 normal-select" placeholder="ABC" clearable>
+          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable>
             <el-option
               v-for="item in abcList"
               :key="item.id"
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 78a3800..4c31a94 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -2,9 +2,10 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/fixedAssetsAdd.vue'
-import type { fixedAssetsType } from './standingBook-interface'
+import type { fixedAssetsType, selectType } from './standingBook-interface'
 import { exportFile } from '@/utils/exportUtils'
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
+import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   assetNo: '', // 固定编号
@@ -50,7 +51,7 @@
   },
   {
     text: '设备类型',
-    value: 'assetTypeName',
+    value: 'equipmentTypeName',
     width: '150',
     align: 'center',
   },
@@ -102,6 +103,7 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+const equipmentCategoryList = ref<selectType[]>([]) // 设备类别
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
@@ -242,6 +244,10 @@
 }
 onMounted(() => {
   getList()
+  // 获取设备类别
+  getDictByCode('equipmentCategory').then((response) => {
+    equipmentCategoryList.value = response.data
+  })
 })
 </script>
 
@@ -265,7 +271,10 @@
           <el-input v-model="searchQuery.equipmentSpecifications" placeholder="设备规格" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-select v-model="searchQuery.equipmentCategory" placeholder="设备类别" clearable>
+            <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+          </el-select>
         </search-item>
       </search-area>
       <table-container>

diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index bb58885..2959118 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -53,3 +53,64 @@
   }
   return true
 }
+
+/**
+ * 验证小写字母
+ * @param str
+ * @returns
+ */
+export function validateLowerCase(str: string) {
+  const reg = /^[a-z]+$/
+  return reg.test(str)
+}
+
+/* 验证大写字母 */
+export function validateUpperCase(str: string) {
+  const reg = /^[A-Z]+$/
+  return reg.test(str)
+}
+
+/* 验证大小写字母 */
+export function validateAlphabets(str: string) {
+  const reg = /^[A-Za-z]+$/
+  return reg.test(str)
+}
+
+/**
+ * 验证邮箱
+ * @param email
+ * @returns {boolean}
+ */
+export function validateEmail(email: string) {
+  const re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
+  return re.test(email)
+}
+
+/**
+ * 验证手机号
+ * @param phone
+ * @returns {boolean}
+ */
+export function validateMobile(phone: string) {
+  const re = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/
+  return re.test(phone)
+}
+
+/**
+ * 校验身份证号
+ * @param value
+ * @returns
+ */
+export function validateIdCardNo(value: string) {
+  const re = /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/
+  return re.test(value)
+}
+/**
+ *
+ * @param value 验证电话号码
+ * @returns
+ */
+export function validatePhone(value: string) {
+  const re = /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/
+  return re.test(value)
+}
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 1c2405e..bca0958 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,13 +1,46 @@
-<script lang="ts" setup name="borrowHandle">
-// 逻辑代码
+<!-- 设备借用处理 -->
+<script lang="ts" setup name="borrowApply">
+import list from './components/handleList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '待借用', comp: list },
+  { name: '已借用', comp: list },
+  { name: '已归还', comp: list },
+])
+const current = ref('待借用')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用处理
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 03d414b..c5771f7 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,13 +1,50 @@
+<!-- 设备借用申请 -->
 <script lang="ts" setup name="borrowApply">
-// 逻辑代码
+import list from './components/applyList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '全部', comp: list },
+  { name: '草稿箱', comp: list },
+  { name: '待审批', comp: list },
+  { name: '审批中', comp: list },
+  { name: '已通过', comp: list },
+  { name: '未通过', comp: list },
+  { name: '已取消', comp: list },
+])
+const current = ref('全部')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用申请
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
new file mode 100644
index 0000000..052f3ce
--- /dev/null
+++ b/src/views/device/borrow/components/applyList.vue
@@ -0,0 +1,328 @@
+<script lang="ts" setup name="borrowApplyList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '文件号',
+    value: 'fileNo',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '类别',
+    value: 'catergory',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '李四',
+      time: '2020-12-14 00:00:00',
+      status: '未通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const approveRef = ref()
+// 同意
+const agree = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '1',
+  })
+}
+// 驳回
+const reject = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '3',
+  })
+}
+// 拒绝
+const refuse = (row: any) => {
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
+}
+// 取消
+const cancel = (rowrow: any) => {
+  ElMessageBox.confirm(
+    '确认取消吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" @click="addBtn" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="agree(row)">
+                  同意
+                </el-button>
+                <el-button size="small" type="primary" link @click="reject(row)">
+                  驳回
+                </el-button>
+                <el-button size="small" type="primary" link @click="refuse(row)">
+                  拒绝
+                </el-button>
+                <el-button size="small" type="primary" link @click="cancel(row)">
+                  取消
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/components/approvalActionDialog.vue b/src/views/device/borrow/components/approvalActionDialog.vue
new file mode 100644
index 0000000..214876c
--- /dev/null
+++ b/src/views/device/borrow/components/approvalActionDialog.vue
@@ -0,0 +1,104 @@
+<!-- 审批操作弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
+const dialogVisibleApprove = ref(false)
+const form = reactive({
+  radio: '1',
+})
+const ruleFormRef = ref<FormInstance>()
+const rules = reactive<FormRules>({
+})
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const approvetime = ref('') // 审批时间
+const initDialog = (row: any) => {
+  dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
+}
+defineExpose({ initDialog })
+
+// 点击保存
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      dialogVisibleApprove.value = false
+      emits('resetData')
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  formEl.resetFields()
+  dialogVisibleApprove.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
+    <el-form
+      ref="ruleFormRef" :model="form"
+      :rules="rules" label-width="110px"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人">
+            <el-input disabled :value="userInfo.$state.name" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间">
+            <el-input disabled :value="approvetime" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
+        <el-button @click="resetForm(ruleFormRef)">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
new file mode 100644
index 0000000..cfda00a
--- /dev/null
+++ b/src/views/device/borrow/components/handleList.vue
@@ -0,0 +1,281 @@
+<script lang="ts" setup name="borrowHandleList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '申请编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'dept',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      dept: '顶级',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      dept: '徐州分中心',
+      user: '里斯',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+const borrow = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="borrow(row)">
+                  借用
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/addRow.vue b/src/views/device/standingBook/components/addRow.vue
index 1678cdb..07b03d1 100644
--- a/src/views/device/standingBook/components/addRow.vue
+++ b/src/views/device/standingBook/components/addRow.vue
@@ -5,7 +5,7 @@
 import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
+const formLabelWidth = '110px'
 const form = ref({})
 const formTable = ref([
   {
@@ -91,108 +91,188 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`">
+  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
     >
       <div v-if="name === '周检记录'">
-        <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录表编号" />
-        </el-form-item>
-        <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录人" />
-        </el-form-item>
-        <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="检定日期"
-          />
-        </el-form-item>
-        <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="有效日期"
-          />
-        </el-form-item>
-        <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="送检人" />
-        </el-form-item>
-        <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录表编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="检定日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="有效日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="送检人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '状态变更记录'">
-        <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="状态类型" clearable>
-            <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="结束日期"
-          />
-        </el-form-item>
-        <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="申请人" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="状态类型" clearable style="width: 100%;">
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="申请人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '使用记录'">
-        <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用人" />
-        </el-form-item>
-        <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用部门" />
-        </el-form-item>
-        <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="使用类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用结束日期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用部门" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="使用类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '检定证书'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="证书类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书出具日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书有效期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
     </el-form>
     <template #footer>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 5f7b347..9a9f798 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -352,7 +352,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -376,7 +376,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -391,7 +391,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -404,14 +404,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -434,7 +434,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -443,20 +443,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -480,23 +480,23 @@
               <com-tree-select
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -507,10 +507,10 @@
             <el-form-item label="检定部门" prop="mesureDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -520,7 +520,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -529,13 +529,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -544,21 +544,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -578,14 +578,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -594,14 +594,14 @@
         <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-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -669,7 +669,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index fc3fd54..d9d4514 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -199,6 +199,8 @@
     useDeptList.value = toTreeList(res.data, '0', true)
   })
 }
+const selectTreeRef1 = ref()
+const selectTreeRef2 = ref()
 // 重置
 const resetDATA = () => {
   ruleForm.value = {
@@ -254,6 +256,10 @@
     isStandardSupportEquipment: '', //		是否标准配套设备
     id: '',
   }
+  if (title.value !== '详情') {
+    selectTreeRef1.value.clearSelected()
+    selectTreeRef2.value.clearSelected()
+  }
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
@@ -378,7 +384,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -402,7 +408,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -416,8 +422,7 @@
             <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"
+                :placeholder="title === '详情' ? '' : '出厂年月'" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -430,14 +435,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -460,7 +465,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -469,20 +474,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -505,24 +510,26 @@
             <el-form-item label="使用部门" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
+                ref="selectTreeRef2"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -536,10 +543,12 @@
               </el-select> -->
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                ref="selectTreeRef1"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -549,7 +558,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -558,13 +567,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -573,21 +582,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -607,14 +616,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -624,14 +633,14 @@
           <el-col :span="6">
             <el-form-item label="资本来源" prop="capitalSource">
               <!-- <el-input v-model.trim="ruleForm.capitalSource" placeholder="资本来源" :disabled="title === '详情'" /> -->
-              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -699,7 +708,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f653095..f4229a6 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -147,19 +147,17 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
-  setTimeout(() => {
-    list.value = [
-      {
-        equipmentNo: 123,
-        equipmentName: 'test',
-        modelNo: '001',
-        usePersonName: '张三',
-        validDate: '2022-12-12 00:00:00',
-        useDeptName: '顶级',
-      },
-    ]
-    total.value = 1
-  }, 1000)
+  list.value = [
+    {
+      equipmentNo: 123,
+      equipmentName: 'test',
+      modelNo: '001',
+      usePersonName: '张三',
+      validDate: '2022-12-12 00:00:00',
+      useDeptName: '顶级',
+    },
+  ] as any
+  total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -220,9 +218,11 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -300,13 +300,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.mesureType" class="m-2 normal-select" placeholder="检定方式" clearable>
+          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable>
             <el-option
               v-for="item in mesureTypeList"
               :key="item.id"
@@ -316,7 +316,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.managerState" class="m-2 normal-select" placeholder="管理状态" clearable>
+          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable>
             <el-option
               v-for="item in managerStateList"
               :key="item.id"
@@ -327,8 +327,9 @@
         </search-item>
         <search-item>
           <com-tree-select
+            ref="selectTreeRef"
             v-model="searchQuery.useDept" :options="useDeptList" placeholder="使用部门"
-            :tree-props="deptProps" style="width: 150px;"
+            :tree-props="deptProps"
           />
         </search-item>
         <search-item>
@@ -336,11 +337,10 @@
             v-model="searchQuery.validDate" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="有效日期"
             class="normal-date"
-            style="width: 150px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.abc" class="m-2 normal-select" placeholder="ABC" clearable>
+          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable>
             <el-option
               v-for="item in abcList"
               :key="item.id"
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 78a3800..4c31a94 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -2,9 +2,10 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/fixedAssetsAdd.vue'
-import type { fixedAssetsType } from './standingBook-interface'
+import type { fixedAssetsType, selectType } from './standingBook-interface'
 import { exportFile } from '@/utils/exportUtils'
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
+import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   assetNo: '', // 固定编号
@@ -50,7 +51,7 @@
   },
   {
     text: '设备类型',
-    value: 'assetTypeName',
+    value: 'equipmentTypeName',
     width: '150',
     align: 'center',
   },
@@ -102,6 +103,7 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+const equipmentCategoryList = ref<selectType[]>([]) // 设备类别
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
@@ -242,6 +244,10 @@
 }
 onMounted(() => {
   getList()
+  // 获取设备类别
+  getDictByCode('equipmentCategory').then((response) => {
+    equipmentCategoryList.value = response.data
+  })
 })
 </script>
 
@@ -265,7 +271,10 @@
           <el-input v-model="searchQuery.equipmentSpecifications" placeholder="设备规格" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-select v-model="searchQuery.equipmentCategory" placeholder="设备类别" clearable>
+            <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+          </el-select>
         </search-item>
       </search-area>
       <table-container>
diff --git a/src/views/device/stateManage/components/addRow.vue b/src/views/device/stateManage/components/addRow.vue
new file mode 100644
index 0000000..3ba82d6
--- /dev/null
+++ b/src/views/device/stateManage/components/addRow.vue
@@ -0,0 +1,160 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { listPageApi } from '@/api/device/standingBook'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  limit: 10,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '出厂编号',
+    value: 'manufacturingNo',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+  },
+])
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listPageApi(listQuery.value as any).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map(item => ({ ...item, checked: '' }))
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    equipmentName: '', // 姓名
+    equipmentNo: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const checkedArr = list.value.filter(item => item.checked !== '')
+  if (checkedArr.length) {
+    console.log(checkedArr, '选中的设备')
+    emits('add', checkedArr)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择设备')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns as any" :query="listQuery"
+        :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-checkbox v-model="scope.row.checked" :label="scope.$index" size="large" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-checkbox__label) {
+  display: none;
+}
+</style>

diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index bb58885..2959118 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -53,3 +53,64 @@
   }
   return true
 }
+
+/**
+ * 验证小写字母
+ * @param str
+ * @returns
+ */
+export function validateLowerCase(str: string) {
+  const reg = /^[a-z]+$/
+  return reg.test(str)
+}
+
+/* 验证大写字母 */
+export function validateUpperCase(str: string) {
+  const reg = /^[A-Z]+$/
+  return reg.test(str)
+}
+
+/* 验证大小写字母 */
+export function validateAlphabets(str: string) {
+  const reg = /^[A-Za-z]+$/
+  return reg.test(str)
+}
+
+/**
+ * 验证邮箱
+ * @param email
+ * @returns {boolean}
+ */
+export function validateEmail(email: string) {
+  const re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
+  return re.test(email)
+}
+
+/**
+ * 验证手机号
+ * @param phone
+ * @returns {boolean}
+ */
+export function validateMobile(phone: string) {
+  const re = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/
+  return re.test(phone)
+}
+
+/**
+ * 校验身份证号
+ * @param value
+ * @returns
+ */
+export function validateIdCardNo(value: string) {
+  const re = /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/
+  return re.test(value)
+}
+/**
+ *
+ * @param value 验证电话号码
+ * @returns
+ */
+export function validatePhone(value: string) {
+  const re = /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/
+  return re.test(value)
+}
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 1c2405e..bca0958 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,13 +1,46 @@
-<script lang="ts" setup name="borrowHandle">
-// 逻辑代码
+<!-- 设备借用处理 -->
+<script lang="ts" setup name="borrowApply">
+import list from './components/handleList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '待借用', comp: list },
+  { name: '已借用', comp: list },
+  { name: '已归还', comp: list },
+])
+const current = ref('待借用')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用处理
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 03d414b..c5771f7 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,13 +1,50 @@
+<!-- 设备借用申请 -->
 <script lang="ts" setup name="borrowApply">
-// 逻辑代码
+import list from './components/applyList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '全部', comp: list },
+  { name: '草稿箱', comp: list },
+  { name: '待审批', comp: list },
+  { name: '审批中', comp: list },
+  { name: '已通过', comp: list },
+  { name: '未通过', comp: list },
+  { name: '已取消', comp: list },
+])
+const current = ref('全部')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用申请
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
new file mode 100644
index 0000000..052f3ce
--- /dev/null
+++ b/src/views/device/borrow/components/applyList.vue
@@ -0,0 +1,328 @@
+<script lang="ts" setup name="borrowApplyList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '文件号',
+    value: 'fileNo',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '类别',
+    value: 'catergory',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '李四',
+      time: '2020-12-14 00:00:00',
+      status: '未通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const approveRef = ref()
+// 同意
+const agree = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '1',
+  })
+}
+// 驳回
+const reject = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '3',
+  })
+}
+// 拒绝
+const refuse = (row: any) => {
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
+}
+// 取消
+const cancel = (rowrow: any) => {
+  ElMessageBox.confirm(
+    '确认取消吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" @click="addBtn" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="agree(row)">
+                  同意
+                </el-button>
+                <el-button size="small" type="primary" link @click="reject(row)">
+                  驳回
+                </el-button>
+                <el-button size="small" type="primary" link @click="refuse(row)">
+                  拒绝
+                </el-button>
+                <el-button size="small" type="primary" link @click="cancel(row)">
+                  取消
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/components/approvalActionDialog.vue b/src/views/device/borrow/components/approvalActionDialog.vue
new file mode 100644
index 0000000..214876c
--- /dev/null
+++ b/src/views/device/borrow/components/approvalActionDialog.vue
@@ -0,0 +1,104 @@
+<!-- 审批操作弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
+const dialogVisibleApprove = ref(false)
+const form = reactive({
+  radio: '1',
+})
+const ruleFormRef = ref<FormInstance>()
+const rules = reactive<FormRules>({
+})
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const approvetime = ref('') // 审批时间
+const initDialog = (row: any) => {
+  dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
+}
+defineExpose({ initDialog })
+
+// 点击保存
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      dialogVisibleApprove.value = false
+      emits('resetData')
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  formEl.resetFields()
+  dialogVisibleApprove.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
+    <el-form
+      ref="ruleFormRef" :model="form"
+      :rules="rules" label-width="110px"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人">
+            <el-input disabled :value="userInfo.$state.name" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间">
+            <el-input disabled :value="approvetime" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
+        <el-button @click="resetForm(ruleFormRef)">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
new file mode 100644
index 0000000..cfda00a
--- /dev/null
+++ b/src/views/device/borrow/components/handleList.vue
@@ -0,0 +1,281 @@
+<script lang="ts" setup name="borrowHandleList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '申请编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'dept',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      dept: '顶级',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      dept: '徐州分中心',
+      user: '里斯',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+const borrow = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="borrow(row)">
+                  借用
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/addRow.vue b/src/views/device/standingBook/components/addRow.vue
index 1678cdb..07b03d1 100644
--- a/src/views/device/standingBook/components/addRow.vue
+++ b/src/views/device/standingBook/components/addRow.vue
@@ -5,7 +5,7 @@
 import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
+const formLabelWidth = '110px'
 const form = ref({})
 const formTable = ref([
   {
@@ -91,108 +91,188 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`">
+  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
     >
       <div v-if="name === '周检记录'">
-        <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录表编号" />
-        </el-form-item>
-        <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录人" />
-        </el-form-item>
-        <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="检定日期"
-          />
-        </el-form-item>
-        <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="有效日期"
-          />
-        </el-form-item>
-        <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="送检人" />
-        </el-form-item>
-        <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录表编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="检定日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="有效日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="送检人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '状态变更记录'">
-        <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="状态类型" clearable>
-            <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="结束日期"
-          />
-        </el-form-item>
-        <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="申请人" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="状态类型" clearable style="width: 100%;">
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="申请人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '使用记录'">
-        <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用人" />
-        </el-form-item>
-        <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用部门" />
-        </el-form-item>
-        <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="使用类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用结束日期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用部门" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="使用类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '检定证书'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="证书类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书出具日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书有效期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
     </el-form>
     <template #footer>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 5f7b347..9a9f798 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -352,7 +352,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -376,7 +376,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -391,7 +391,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -404,14 +404,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -434,7 +434,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -443,20 +443,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -480,23 +480,23 @@
               <com-tree-select
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -507,10 +507,10 @@
             <el-form-item label="检定部门" prop="mesureDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -520,7 +520,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -529,13 +529,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -544,21 +544,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -578,14 +578,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -594,14 +594,14 @@
         <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-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -669,7 +669,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index fc3fd54..d9d4514 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -199,6 +199,8 @@
     useDeptList.value = toTreeList(res.data, '0', true)
   })
 }
+const selectTreeRef1 = ref()
+const selectTreeRef2 = ref()
 // 重置
 const resetDATA = () => {
   ruleForm.value = {
@@ -254,6 +256,10 @@
     isStandardSupportEquipment: '', //		是否标准配套设备
     id: '',
   }
+  if (title.value !== '详情') {
+    selectTreeRef1.value.clearSelected()
+    selectTreeRef2.value.clearSelected()
+  }
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
@@ -378,7 +384,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -402,7 +408,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -416,8 +422,7 @@
             <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"
+                :placeholder="title === '详情' ? '' : '出厂年月'" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -430,14 +435,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -460,7 +465,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -469,20 +474,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -505,24 +510,26 @@
             <el-form-item label="使用部门" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
+                ref="selectTreeRef2"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -536,10 +543,12 @@
               </el-select> -->
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                ref="selectTreeRef1"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -549,7 +558,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -558,13 +567,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -573,21 +582,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -607,14 +616,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -624,14 +633,14 @@
           <el-col :span="6">
             <el-form-item label="资本来源" prop="capitalSource">
               <!-- <el-input v-model.trim="ruleForm.capitalSource" placeholder="资本来源" :disabled="title === '详情'" /> -->
-              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -699,7 +708,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f653095..f4229a6 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -147,19 +147,17 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
-  setTimeout(() => {
-    list.value = [
-      {
-        equipmentNo: 123,
-        equipmentName: 'test',
-        modelNo: '001',
-        usePersonName: '张三',
-        validDate: '2022-12-12 00:00:00',
-        useDeptName: '顶级',
-      },
-    ]
-    total.value = 1
-  }, 1000)
+  list.value = [
+    {
+      equipmentNo: 123,
+      equipmentName: 'test',
+      modelNo: '001',
+      usePersonName: '张三',
+      validDate: '2022-12-12 00:00:00',
+      useDeptName: '顶级',
+    },
+  ] as any
+  total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -220,9 +218,11 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -300,13 +300,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.mesureType" class="m-2 normal-select" placeholder="检定方式" clearable>
+          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable>
             <el-option
               v-for="item in mesureTypeList"
               :key="item.id"
@@ -316,7 +316,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.managerState" class="m-2 normal-select" placeholder="管理状态" clearable>
+          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable>
             <el-option
               v-for="item in managerStateList"
               :key="item.id"
@@ -327,8 +327,9 @@
         </search-item>
         <search-item>
           <com-tree-select
+            ref="selectTreeRef"
             v-model="searchQuery.useDept" :options="useDeptList" placeholder="使用部门"
-            :tree-props="deptProps" style="width: 150px;"
+            :tree-props="deptProps"
           />
         </search-item>
         <search-item>
@@ -336,11 +337,10 @@
             v-model="searchQuery.validDate" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="有效日期"
             class="normal-date"
-            style="width: 150px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.abc" class="m-2 normal-select" placeholder="ABC" clearable>
+          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable>
             <el-option
               v-for="item in abcList"
               :key="item.id"
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 78a3800..4c31a94 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -2,9 +2,10 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/fixedAssetsAdd.vue'
-import type { fixedAssetsType } from './standingBook-interface'
+import type { fixedAssetsType, selectType } from './standingBook-interface'
 import { exportFile } from '@/utils/exportUtils'
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
+import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   assetNo: '', // 固定编号
@@ -50,7 +51,7 @@
   },
   {
     text: '设备类型',
-    value: 'assetTypeName',
+    value: 'equipmentTypeName',
     width: '150',
     align: 'center',
   },
@@ -102,6 +103,7 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+const equipmentCategoryList = ref<selectType[]>([]) // 设备类别
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
@@ -242,6 +244,10 @@
 }
 onMounted(() => {
   getList()
+  // 获取设备类别
+  getDictByCode('equipmentCategory').then((response) => {
+    equipmentCategoryList.value = response.data
+  })
 })
 </script>
 
@@ -265,7 +271,10 @@
           <el-input v-model="searchQuery.equipmentSpecifications" placeholder="设备规格" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-select v-model="searchQuery.equipmentCategory" placeholder="设备类别" clearable>
+            <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+          </el-select>
         </search-item>
       </search-area>
       <table-container>
diff --git a/src/views/device/stateManage/components/addRow.vue b/src/views/device/stateManage/components/addRow.vue
new file mode 100644
index 0000000..3ba82d6
--- /dev/null
+++ b/src/views/device/stateManage/components/addRow.vue
@@ -0,0 +1,160 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { listPageApi } from '@/api/device/standingBook'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  limit: 10,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '出厂编号',
+    value: 'manufacturingNo',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+  },
+])
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listPageApi(listQuery.value as any).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map(item => ({ ...item, checked: '' }))
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    equipmentName: '', // 姓名
+    equipmentNo: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const checkedArr = list.value.filter(item => item.checked !== '')
+  if (checkedArr.length) {
+    console.log(checkedArr, '选中的设备')
+    emits('add', checkedArr)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择设备')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns as any" :query="listQuery"
+        :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-checkbox v-model="scope.row.checked" :label="scope.$index" size="large" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-checkbox__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index 56417d6..214876c 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -47,38 +47,45 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="30%">
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
-      :rules="rules"
+      :rules="rules" label-width="110px"
     >
-      <el-form-item label="审批意见">
-        <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
-        <el-radio-group v-model="form.radio">
-          <el-radio label="1">
-            同意
-          </el-radio>
-          <el-radio label="2">
-            拒绝
-          </el-radio>
-          <el-radio label="3">
-            驳回
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="审批结论">
-        <el-input
-          :rows="4"
-          type="textarea"
-        />
-      </el-form-item>
       <el-row :gutter="24">
-        <el-col :span="10">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="审批人">
             <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
-        <el-col :span="14">
+        <el-col :span="12">
           <el-form-item label="审批时间">
             <el-input disabled :value="approvetime" />
           </el-form-item>

diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index bb58885..2959118 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -53,3 +53,64 @@
   }
   return true
 }
+
+/**
+ * 验证小写字母
+ * @param str
+ * @returns
+ */
+export function validateLowerCase(str: string) {
+  const reg = /^[a-z]+$/
+  return reg.test(str)
+}
+
+/* 验证大写字母 */
+export function validateUpperCase(str: string) {
+  const reg = /^[A-Z]+$/
+  return reg.test(str)
+}
+
+/* 验证大小写字母 */
+export function validateAlphabets(str: string) {
+  const reg = /^[A-Za-z]+$/
+  return reg.test(str)
+}
+
+/**
+ * 验证邮箱
+ * @param email
+ * @returns {boolean}
+ */
+export function validateEmail(email: string) {
+  const re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
+  return re.test(email)
+}
+
+/**
+ * 验证手机号
+ * @param phone
+ * @returns {boolean}
+ */
+export function validateMobile(phone: string) {
+  const re = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/
+  return re.test(phone)
+}
+
+/**
+ * 校验身份证号
+ * @param value
+ * @returns
+ */
+export function validateIdCardNo(value: string) {
+  const re = /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/
+  return re.test(value)
+}
+/**
+ *
+ * @param value 验证电话号码
+ * @returns
+ */
+export function validatePhone(value: string) {
+  const re = /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/
+  return re.test(value)
+}
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 1c2405e..bca0958 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,13 +1,46 @@
-<script lang="ts" setup name="borrowHandle">
-// 逻辑代码
+<!-- 设备借用处理 -->
+<script lang="ts" setup name="borrowApply">
+import list from './components/handleList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '待借用', comp: list },
+  { name: '已借用', comp: list },
+  { name: '已归还', comp: list },
+])
+const current = ref('待借用')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用处理
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 03d414b..c5771f7 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,13 +1,50 @@
+<!-- 设备借用申请 -->
 <script lang="ts" setup name="borrowApply">
-// 逻辑代码
+import list from './components/applyList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '全部', comp: list },
+  { name: '草稿箱', comp: list },
+  { name: '待审批', comp: list },
+  { name: '审批中', comp: list },
+  { name: '已通过', comp: list },
+  { name: '未通过', comp: list },
+  { name: '已取消', comp: list },
+])
+const current = ref('全部')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用申请
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
new file mode 100644
index 0000000..052f3ce
--- /dev/null
+++ b/src/views/device/borrow/components/applyList.vue
@@ -0,0 +1,328 @@
+<script lang="ts" setup name="borrowApplyList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '文件号',
+    value: 'fileNo',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '类别',
+    value: 'catergory',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '李四',
+      time: '2020-12-14 00:00:00',
+      status: '未通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const approveRef = ref()
+// 同意
+const agree = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '1',
+  })
+}
+// 驳回
+const reject = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '3',
+  })
+}
+// 拒绝
+const refuse = (row: any) => {
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
+}
+// 取消
+const cancel = (rowrow: any) => {
+  ElMessageBox.confirm(
+    '确认取消吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" @click="addBtn" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="agree(row)">
+                  同意
+                </el-button>
+                <el-button size="small" type="primary" link @click="reject(row)">
+                  驳回
+                </el-button>
+                <el-button size="small" type="primary" link @click="refuse(row)">
+                  拒绝
+                </el-button>
+                <el-button size="small" type="primary" link @click="cancel(row)">
+                  取消
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/components/approvalActionDialog.vue b/src/views/device/borrow/components/approvalActionDialog.vue
new file mode 100644
index 0000000..214876c
--- /dev/null
+++ b/src/views/device/borrow/components/approvalActionDialog.vue
@@ -0,0 +1,104 @@
+<!-- 审批操作弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
+const dialogVisibleApprove = ref(false)
+const form = reactive({
+  radio: '1',
+})
+const ruleFormRef = ref<FormInstance>()
+const rules = reactive<FormRules>({
+})
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const approvetime = ref('') // 审批时间
+const initDialog = (row: any) => {
+  dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
+}
+defineExpose({ initDialog })
+
+// 点击保存
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      dialogVisibleApprove.value = false
+      emits('resetData')
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  formEl.resetFields()
+  dialogVisibleApprove.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
+    <el-form
+      ref="ruleFormRef" :model="form"
+      :rules="rules" label-width="110px"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人">
+            <el-input disabled :value="userInfo.$state.name" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间">
+            <el-input disabled :value="approvetime" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
+        <el-button @click="resetForm(ruleFormRef)">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
new file mode 100644
index 0000000..cfda00a
--- /dev/null
+++ b/src/views/device/borrow/components/handleList.vue
@@ -0,0 +1,281 @@
+<script lang="ts" setup name="borrowHandleList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '申请编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'dept',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      dept: '顶级',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      dept: '徐州分中心',
+      user: '里斯',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+const borrow = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="borrow(row)">
+                  借用
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/addRow.vue b/src/views/device/standingBook/components/addRow.vue
index 1678cdb..07b03d1 100644
--- a/src/views/device/standingBook/components/addRow.vue
+++ b/src/views/device/standingBook/components/addRow.vue
@@ -5,7 +5,7 @@
 import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
+const formLabelWidth = '110px'
 const form = ref({})
 const formTable = ref([
   {
@@ -91,108 +91,188 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`">
+  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
     >
       <div v-if="name === '周检记录'">
-        <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录表编号" />
-        </el-form-item>
-        <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录人" />
-        </el-form-item>
-        <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="检定日期"
-          />
-        </el-form-item>
-        <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="有效日期"
-          />
-        </el-form-item>
-        <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="送检人" />
-        </el-form-item>
-        <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录表编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="检定日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="有效日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="送检人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '状态变更记录'">
-        <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="状态类型" clearable>
-            <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="结束日期"
-          />
-        </el-form-item>
-        <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="申请人" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="状态类型" clearable style="width: 100%;">
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="申请人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '使用记录'">
-        <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用人" />
-        </el-form-item>
-        <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用部门" />
-        </el-form-item>
-        <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="使用类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用结束日期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用部门" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="使用类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '检定证书'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="证书类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书出具日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书有效期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
     </el-form>
     <template #footer>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 5f7b347..9a9f798 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -352,7 +352,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -376,7 +376,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -391,7 +391,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -404,14 +404,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -434,7 +434,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -443,20 +443,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -480,23 +480,23 @@
               <com-tree-select
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -507,10 +507,10 @@
             <el-form-item label="检定部门" prop="mesureDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -520,7 +520,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -529,13 +529,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -544,21 +544,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -578,14 +578,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -594,14 +594,14 @@
         <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-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -669,7 +669,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index fc3fd54..d9d4514 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -199,6 +199,8 @@
     useDeptList.value = toTreeList(res.data, '0', true)
   })
 }
+const selectTreeRef1 = ref()
+const selectTreeRef2 = ref()
 // 重置
 const resetDATA = () => {
   ruleForm.value = {
@@ -254,6 +256,10 @@
     isStandardSupportEquipment: '', //		是否标准配套设备
     id: '',
   }
+  if (title.value !== '详情') {
+    selectTreeRef1.value.clearSelected()
+    selectTreeRef2.value.clearSelected()
+  }
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
@@ -378,7 +384,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -402,7 +408,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -416,8 +422,7 @@
             <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"
+                :placeholder="title === '详情' ? '' : '出厂年月'" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -430,14 +435,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -460,7 +465,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -469,20 +474,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -505,24 +510,26 @@
             <el-form-item label="使用部门" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
+                ref="selectTreeRef2"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -536,10 +543,12 @@
               </el-select> -->
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                ref="selectTreeRef1"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -549,7 +558,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -558,13 +567,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -573,21 +582,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -607,14 +616,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -624,14 +633,14 @@
           <el-col :span="6">
             <el-form-item label="资本来源" prop="capitalSource">
               <!-- <el-input v-model.trim="ruleForm.capitalSource" placeholder="资本来源" :disabled="title === '详情'" /> -->
-              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -699,7 +708,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f653095..f4229a6 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -147,19 +147,17 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
-  setTimeout(() => {
-    list.value = [
-      {
-        equipmentNo: 123,
-        equipmentName: 'test',
-        modelNo: '001',
-        usePersonName: '张三',
-        validDate: '2022-12-12 00:00:00',
-        useDeptName: '顶级',
-      },
-    ]
-    total.value = 1
-  }, 1000)
+  list.value = [
+    {
+      equipmentNo: 123,
+      equipmentName: 'test',
+      modelNo: '001',
+      usePersonName: '张三',
+      validDate: '2022-12-12 00:00:00',
+      useDeptName: '顶级',
+    },
+  ] as any
+  total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -220,9 +218,11 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -300,13 +300,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.mesureType" class="m-2 normal-select" placeholder="检定方式" clearable>
+          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable>
             <el-option
               v-for="item in mesureTypeList"
               :key="item.id"
@@ -316,7 +316,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.managerState" class="m-2 normal-select" placeholder="管理状态" clearable>
+          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable>
             <el-option
               v-for="item in managerStateList"
               :key="item.id"
@@ -327,8 +327,9 @@
         </search-item>
         <search-item>
           <com-tree-select
+            ref="selectTreeRef"
             v-model="searchQuery.useDept" :options="useDeptList" placeholder="使用部门"
-            :tree-props="deptProps" style="width: 150px;"
+            :tree-props="deptProps"
           />
         </search-item>
         <search-item>
@@ -336,11 +337,10 @@
             v-model="searchQuery.validDate" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="有效日期"
             class="normal-date"
-            style="width: 150px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.abc" class="m-2 normal-select" placeholder="ABC" clearable>
+          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable>
             <el-option
               v-for="item in abcList"
               :key="item.id"
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 78a3800..4c31a94 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -2,9 +2,10 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/fixedAssetsAdd.vue'
-import type { fixedAssetsType } from './standingBook-interface'
+import type { fixedAssetsType, selectType } from './standingBook-interface'
 import { exportFile } from '@/utils/exportUtils'
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
+import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   assetNo: '', // 固定编号
@@ -50,7 +51,7 @@
   },
   {
     text: '设备类型',
-    value: 'assetTypeName',
+    value: 'equipmentTypeName',
     width: '150',
     align: 'center',
   },
@@ -102,6 +103,7 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+const equipmentCategoryList = ref<selectType[]>([]) // 设备类别
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
@@ -242,6 +244,10 @@
 }
 onMounted(() => {
   getList()
+  // 获取设备类别
+  getDictByCode('equipmentCategory').then((response) => {
+    equipmentCategoryList.value = response.data
+  })
 })
 </script>
 
@@ -265,7 +271,10 @@
           <el-input v-model="searchQuery.equipmentSpecifications" placeholder="设备规格" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-select v-model="searchQuery.equipmentCategory" placeholder="设备类别" clearable>
+            <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+          </el-select>
         </search-item>
       </search-area>
       <table-container>
diff --git a/src/views/device/stateManage/components/addRow.vue b/src/views/device/stateManage/components/addRow.vue
new file mode 100644
index 0000000..3ba82d6
--- /dev/null
+++ b/src/views/device/stateManage/components/addRow.vue
@@ -0,0 +1,160 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { listPageApi } from '@/api/device/standingBook'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  limit: 10,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '出厂编号',
+    value: 'manufacturingNo',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+  },
+])
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listPageApi(listQuery.value as any).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map(item => ({ ...item, checked: '' }))
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    equipmentName: '', // 姓名
+    equipmentNo: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const checkedArr = list.value.filter(item => item.checked !== '')
+  if (checkedArr.length) {
+    console.log(checkedArr, '选中的设备')
+    emits('add', checkedArr)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择设备')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns as any" :query="listQuery"
+        :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-checkbox v-model="scope.row.checked" :label="scope.$index" size="large" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-checkbox__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index 56417d6..214876c 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -47,38 +47,45 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="30%">
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
-      :rules="rules"
+      :rules="rules" label-width="110px"
     >
-      <el-form-item label="审批意见">
-        <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
-        <el-radio-group v-model="form.radio">
-          <el-radio label="1">
-            同意
-          </el-radio>
-          <el-radio label="2">
-            拒绝
-          </el-radio>
-          <el-radio label="3">
-            驳回
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="审批结论">
-        <el-input
-          :rows="4"
-          type="textarea"
-        />
-      </el-form-item>
       <el-row :gutter="24">
-        <el-col :span="10">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="审批人">
             <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
-        <el-col :span="14">
+        <el-col :span="12">
           <el-form-item label="审批时间">
             <el-input disabled :value="approvetime" />
           </el-form-item>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index e74d70e..2003e31 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -1,7 +1,8 @@
 <!-- 新增或详情弹窗 -->
-<script lang="ts" setup name="addNotice">
+<script lang="ts" setup name="add">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
+import addRow from './addRow.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
@@ -16,6 +17,7 @@
 const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const name = ref('')
+const borrowList = ref([])
 const ruleForm = ref({
   assetNo: '', // 资产编号
   assetType: '', // 资产类型
@@ -357,10 +359,86 @@
     isShowCalibration.value = true
   }
 })
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerLevelName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+  },
+])
+const addRowRef = ref()
+// 添加行
+const addRowBtn = () => {
+  addRowRef.value.initDialog({ title: '添加' })
+}
+// 删除行
+const removeRowBtn = () => {
+  const removeArr = borrowList.value.filter(item => item.remove !== '')
+  if (removeArr.length) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      borrowList.value = borrowList.value.filter(item => item.remove === '')
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 借用设备列表添加
+const addRowMethods = (row) => {
+  row.forEach((element) => {
+    borrowList.value.push({ ...element, remove: '' })
+  })
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
     <detail-page :title="`${name}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
@@ -378,15 +456,16 @@
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder="">
+              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -430,7 +509,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -454,28 +533,56 @@
         </el-row>
       </el-form>
     </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>
+    <div>
+      <detail-block title="借用设备列表">
+        <template #btns>
+          <el-button type="primary" @click="addRowBtn">
+            添加行
+          </el-button>
+          <el-button type="info" @click="removeRowBtn">
+            删除行
+          </el-button>
+        </template>
+        <normal-table
+          :data="borrowList" :total="1" :columns="columns as any"
+        >
+          <template #preColumns>
+            <el-table-column label="选择" width="55" align="center">
+              <template #default="scope">
+                <el-checkbox v-model="scope.row.remove" :label="scope.$index" size="large" />
+              </template>
+            </el-table-column>
+            <el-table-column label="序号" width="60" align="center">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </detail-block>
+      <detail-block 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>
+    </div>
   </app-container>
 </template>
 
@@ -484,6 +591,10 @@
   background-color: #fff;
 }
 
+:deep(.el-checkbox__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,

diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index bb58885..2959118 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -53,3 +53,64 @@
   }
   return true
 }
+
+/**
+ * 验证小写字母
+ * @param str
+ * @returns
+ */
+export function validateLowerCase(str: string) {
+  const reg = /^[a-z]+$/
+  return reg.test(str)
+}
+
+/* 验证大写字母 */
+export function validateUpperCase(str: string) {
+  const reg = /^[A-Z]+$/
+  return reg.test(str)
+}
+
+/* 验证大小写字母 */
+export function validateAlphabets(str: string) {
+  const reg = /^[A-Za-z]+$/
+  return reg.test(str)
+}
+
+/**
+ * 验证邮箱
+ * @param email
+ * @returns {boolean}
+ */
+export function validateEmail(email: string) {
+  const re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
+  return re.test(email)
+}
+
+/**
+ * 验证手机号
+ * @param phone
+ * @returns {boolean}
+ */
+export function validateMobile(phone: string) {
+  const re = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/
+  return re.test(phone)
+}
+
+/**
+ * 校验身份证号
+ * @param value
+ * @returns
+ */
+export function validateIdCardNo(value: string) {
+  const re = /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/
+  return re.test(value)
+}
+/**
+ *
+ * @param value 验证电话号码
+ * @returns
+ */
+export function validatePhone(value: string) {
+  const re = /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/
+  return re.test(value)
+}
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 1c2405e..bca0958 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,13 +1,46 @@
-<script lang="ts" setup name="borrowHandle">
-// 逻辑代码
+<!-- 设备借用处理 -->
+<script lang="ts" setup name="borrowApply">
+import list from './components/handleList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '待借用', comp: list },
+  { name: '已借用', comp: list },
+  { name: '已归还', comp: list },
+])
+const current = ref('待借用')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用处理
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 03d414b..c5771f7 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,13 +1,50 @@
+<!-- 设备借用申请 -->
 <script lang="ts" setup name="borrowApply">
-// 逻辑代码
+import list from './components/applyList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '全部', comp: list },
+  { name: '草稿箱', comp: list },
+  { name: '待审批', comp: list },
+  { name: '审批中', comp: list },
+  { name: '已通过', comp: list },
+  { name: '未通过', comp: list },
+  { name: '已取消', comp: list },
+])
+const current = ref('全部')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用申请
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
new file mode 100644
index 0000000..052f3ce
--- /dev/null
+++ b/src/views/device/borrow/components/applyList.vue
@@ -0,0 +1,328 @@
+<script lang="ts" setup name="borrowApplyList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '文件号',
+    value: 'fileNo',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '类别',
+    value: 'catergory',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '李四',
+      time: '2020-12-14 00:00:00',
+      status: '未通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const approveRef = ref()
+// 同意
+const agree = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '1',
+  })
+}
+// 驳回
+const reject = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '3',
+  })
+}
+// 拒绝
+const refuse = (row: any) => {
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
+}
+// 取消
+const cancel = (rowrow: any) => {
+  ElMessageBox.confirm(
+    '确认取消吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" @click="addBtn" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="agree(row)">
+                  同意
+                </el-button>
+                <el-button size="small" type="primary" link @click="reject(row)">
+                  驳回
+                </el-button>
+                <el-button size="small" type="primary" link @click="refuse(row)">
+                  拒绝
+                </el-button>
+                <el-button size="small" type="primary" link @click="cancel(row)">
+                  取消
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/components/approvalActionDialog.vue b/src/views/device/borrow/components/approvalActionDialog.vue
new file mode 100644
index 0000000..214876c
--- /dev/null
+++ b/src/views/device/borrow/components/approvalActionDialog.vue
@@ -0,0 +1,104 @@
+<!-- 审批操作弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
+const dialogVisibleApprove = ref(false)
+const form = reactive({
+  radio: '1',
+})
+const ruleFormRef = ref<FormInstance>()
+const rules = reactive<FormRules>({
+})
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const approvetime = ref('') // 审批时间
+const initDialog = (row: any) => {
+  dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
+}
+defineExpose({ initDialog })
+
+// 点击保存
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      dialogVisibleApprove.value = false
+      emits('resetData')
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  formEl.resetFields()
+  dialogVisibleApprove.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
+    <el-form
+      ref="ruleFormRef" :model="form"
+      :rules="rules" label-width="110px"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人">
+            <el-input disabled :value="userInfo.$state.name" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间">
+            <el-input disabled :value="approvetime" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
+        <el-button @click="resetForm(ruleFormRef)">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
new file mode 100644
index 0000000..cfda00a
--- /dev/null
+++ b/src/views/device/borrow/components/handleList.vue
@@ -0,0 +1,281 @@
+<script lang="ts" setup name="borrowHandleList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '申请编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'dept',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      dept: '顶级',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      dept: '徐州分中心',
+      user: '里斯',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+const borrow = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="borrow(row)">
+                  借用
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/addRow.vue b/src/views/device/standingBook/components/addRow.vue
index 1678cdb..07b03d1 100644
--- a/src/views/device/standingBook/components/addRow.vue
+++ b/src/views/device/standingBook/components/addRow.vue
@@ -5,7 +5,7 @@
 import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
+const formLabelWidth = '110px'
 const form = ref({})
 const formTable = ref([
   {
@@ -91,108 +91,188 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`">
+  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
     >
       <div v-if="name === '周检记录'">
-        <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录表编号" />
-        </el-form-item>
-        <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录人" />
-        </el-form-item>
-        <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="检定日期"
-          />
-        </el-form-item>
-        <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="有效日期"
-          />
-        </el-form-item>
-        <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="送检人" />
-        </el-form-item>
-        <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录表编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="检定日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="有效日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="送检人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '状态变更记录'">
-        <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="状态类型" clearable>
-            <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="结束日期"
-          />
-        </el-form-item>
-        <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="申请人" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="状态类型" clearable style="width: 100%;">
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="申请人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '使用记录'">
-        <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用人" />
-        </el-form-item>
-        <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用部门" />
-        </el-form-item>
-        <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="使用类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用结束日期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用部门" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="使用类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '检定证书'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="证书类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书出具日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书有效期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
     </el-form>
     <template #footer>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 5f7b347..9a9f798 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -352,7 +352,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -376,7 +376,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -391,7 +391,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -404,14 +404,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -434,7 +434,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -443,20 +443,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -480,23 +480,23 @@
               <com-tree-select
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -507,10 +507,10 @@
             <el-form-item label="检定部门" prop="mesureDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -520,7 +520,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -529,13 +529,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -544,21 +544,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -578,14 +578,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -594,14 +594,14 @@
         <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-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -669,7 +669,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index fc3fd54..d9d4514 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -199,6 +199,8 @@
     useDeptList.value = toTreeList(res.data, '0', true)
   })
 }
+const selectTreeRef1 = ref()
+const selectTreeRef2 = ref()
 // 重置
 const resetDATA = () => {
   ruleForm.value = {
@@ -254,6 +256,10 @@
     isStandardSupportEquipment: '', //		是否标准配套设备
     id: '',
   }
+  if (title.value !== '详情') {
+    selectTreeRef1.value.clearSelected()
+    selectTreeRef2.value.clearSelected()
+  }
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
@@ -378,7 +384,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -402,7 +408,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -416,8 +422,7 @@
             <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"
+                :placeholder="title === '详情' ? '' : '出厂年月'" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -430,14 +435,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -460,7 +465,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -469,20 +474,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -505,24 +510,26 @@
             <el-form-item label="使用部门" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
+                ref="selectTreeRef2"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -536,10 +543,12 @@
               </el-select> -->
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                ref="selectTreeRef1"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -549,7 +558,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -558,13 +567,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -573,21 +582,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -607,14 +616,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -624,14 +633,14 @@
           <el-col :span="6">
             <el-form-item label="资本来源" prop="capitalSource">
               <!-- <el-input v-model.trim="ruleForm.capitalSource" placeholder="资本来源" :disabled="title === '详情'" /> -->
-              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -699,7 +708,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f653095..f4229a6 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -147,19 +147,17 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
-  setTimeout(() => {
-    list.value = [
-      {
-        equipmentNo: 123,
-        equipmentName: 'test',
-        modelNo: '001',
-        usePersonName: '张三',
-        validDate: '2022-12-12 00:00:00',
-        useDeptName: '顶级',
-      },
-    ]
-    total.value = 1
-  }, 1000)
+  list.value = [
+    {
+      equipmentNo: 123,
+      equipmentName: 'test',
+      modelNo: '001',
+      usePersonName: '张三',
+      validDate: '2022-12-12 00:00:00',
+      useDeptName: '顶级',
+    },
+  ] as any
+  total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -220,9 +218,11 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -300,13 +300,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.mesureType" class="m-2 normal-select" placeholder="检定方式" clearable>
+          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable>
             <el-option
               v-for="item in mesureTypeList"
               :key="item.id"
@@ -316,7 +316,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.managerState" class="m-2 normal-select" placeholder="管理状态" clearable>
+          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable>
             <el-option
               v-for="item in managerStateList"
               :key="item.id"
@@ -327,8 +327,9 @@
         </search-item>
         <search-item>
           <com-tree-select
+            ref="selectTreeRef"
             v-model="searchQuery.useDept" :options="useDeptList" placeholder="使用部门"
-            :tree-props="deptProps" style="width: 150px;"
+            :tree-props="deptProps"
           />
         </search-item>
         <search-item>
@@ -336,11 +337,10 @@
             v-model="searchQuery.validDate" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="有效日期"
             class="normal-date"
-            style="width: 150px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.abc" class="m-2 normal-select" placeholder="ABC" clearable>
+          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable>
             <el-option
               v-for="item in abcList"
               :key="item.id"
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 78a3800..4c31a94 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -2,9 +2,10 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/fixedAssetsAdd.vue'
-import type { fixedAssetsType } from './standingBook-interface'
+import type { fixedAssetsType, selectType } from './standingBook-interface'
 import { exportFile } from '@/utils/exportUtils'
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
+import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   assetNo: '', // 固定编号
@@ -50,7 +51,7 @@
   },
   {
     text: '设备类型',
-    value: 'assetTypeName',
+    value: 'equipmentTypeName',
     width: '150',
     align: 'center',
   },
@@ -102,6 +103,7 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+const equipmentCategoryList = ref<selectType[]>([]) // 设备类别
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
@@ -242,6 +244,10 @@
 }
 onMounted(() => {
   getList()
+  // 获取设备类别
+  getDictByCode('equipmentCategory').then((response) => {
+    equipmentCategoryList.value = response.data
+  })
 })
 </script>
 
@@ -265,7 +271,10 @@
           <el-input v-model="searchQuery.equipmentSpecifications" placeholder="设备规格" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-select v-model="searchQuery.equipmentCategory" placeholder="设备类别" clearable>
+            <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+          </el-select>
         </search-item>
       </search-area>
       <table-container>
diff --git a/src/views/device/stateManage/components/addRow.vue b/src/views/device/stateManage/components/addRow.vue
new file mode 100644
index 0000000..3ba82d6
--- /dev/null
+++ b/src/views/device/stateManage/components/addRow.vue
@@ -0,0 +1,160 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { listPageApi } from '@/api/device/standingBook'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  limit: 10,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '出厂编号',
+    value: 'manufacturingNo',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+  },
+])
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listPageApi(listQuery.value as any).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map(item => ({ ...item, checked: '' }))
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    equipmentName: '', // 姓名
+    equipmentNo: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const checkedArr = list.value.filter(item => item.checked !== '')
+  if (checkedArr.length) {
+    console.log(checkedArr, '选中的设备')
+    emits('add', checkedArr)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择设备')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns as any" :query="listQuery"
+        :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-checkbox v-model="scope.row.checked" :label="scope.$index" size="large" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-checkbox__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index 56417d6..214876c 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -47,38 +47,45 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="30%">
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
-      :rules="rules"
+      :rules="rules" label-width="110px"
     >
-      <el-form-item label="审批意见">
-        <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
-        <el-radio-group v-model="form.radio">
-          <el-radio label="1">
-            同意
-          </el-radio>
-          <el-radio label="2">
-            拒绝
-          </el-radio>
-          <el-radio label="3">
-            驳回
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="审批结论">
-        <el-input
-          :rows="4"
-          type="textarea"
-        />
-      </el-form-item>
       <el-row :gutter="24">
-        <el-col :span="10">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="审批人">
             <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
-        <el-col :span="14">
+        <el-col :span="12">
           <el-form-item label="审批时间">
             <el-input disabled :value="approvetime" />
           </el-form-item>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index e74d70e..2003e31 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -1,7 +1,8 @@
 <!-- 新增或详情弹窗 -->
-<script lang="ts" setup name="addNotice">
+<script lang="ts" setup name="add">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
+import addRow from './addRow.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
@@ -16,6 +17,7 @@
 const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const name = ref('')
+const borrowList = ref([])
 const ruleForm = ref({
   assetNo: '', // 资产编号
   assetType: '', // 资产类型
@@ -357,10 +359,86 @@
     isShowCalibration.value = true
   }
 })
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerLevelName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+  },
+])
+const addRowRef = ref()
+// 添加行
+const addRowBtn = () => {
+  addRowRef.value.initDialog({ title: '添加' })
+}
+// 删除行
+const removeRowBtn = () => {
+  const removeArr = borrowList.value.filter(item => item.remove !== '')
+  if (removeArr.length) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      borrowList.value = borrowList.value.filter(item => item.remove === '')
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 借用设备列表添加
+const addRowMethods = (row) => {
+  row.forEach((element) => {
+    borrowList.value.push({ ...element, remove: '' })
+  })
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
     <detail-page :title="`${name}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
@@ -378,15 +456,16 @@
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder="">
+              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -430,7 +509,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -454,28 +533,56 @@
         </el-row>
       </el-form>
     </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>
+    <div>
+      <detail-block title="借用设备列表">
+        <template #btns>
+          <el-button type="primary" @click="addRowBtn">
+            添加行
+          </el-button>
+          <el-button type="info" @click="removeRowBtn">
+            删除行
+          </el-button>
+        </template>
+        <normal-table
+          :data="borrowList" :total="1" :columns="columns as any"
+        >
+          <template #preColumns>
+            <el-table-column label="选择" width="55" align="center">
+              <template #default="scope">
+                <el-checkbox v-model="scope.row.remove" :label="scope.$index" size="large" />
+              </template>
+            </el-table-column>
+            <el-table-column label="序号" width="60" align="center">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </detail-block>
+      <detail-block 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>
+    </div>
   </app-container>
 </template>
 
@@ -484,6 +591,10 @@
   background-color: #fff;
 }
 
+:deep(.el-checkbox__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,
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index aaaaf61..d588b8d 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,6 +1,7 @@
 <script lang="ts" setup name="bench">
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
+import type { trainLogStatistic } from './bench-interface'
 import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
 import { getPlanList } from '@/api/system/plan'
 import { listPageApi } from '@/api/measure/file'
@@ -132,15 +133,19 @@
     account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
+    const result: trainLogStatistic = res.data
+    const notQualified: number = Number(result.trainCount) - result.qualifiedCount
+    const qualifiedRate = ((result.qualifiedCount / result.trainCount) * 100).toFixed(2) // 合格率
+    const notQualifiedRate = ((notQualified / result.trainCount) * 100).toFixed(2) // 不合格率
     TrainLogSList.value = [
-      { name: `合格     ${res.data.qualified}-${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
-      { name: `不合格   ${res.data.notQualified}- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+      { name: `合   格   ${result.qualifiedCount}-${qualifiedRate}%`, value: result.qualifiedCount },
+      { name: `不合格   ${notQualified}- ${notQualifiedRate}%`, value: notQualified },
     ]
     TrainLogTitle.value = res.data.trainCount
   }).catch((_) => {
     // 处理异常
     TrainLogSList.value = [
-      { name: '合格     0 - 50%', value: 0 },
+      { name: '合   格   0 - 50%', value: 0 },
       { name: '不合格   0 - 50%', value: 0 },
     ]
     TrainLogTitle.value = 0

diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index bb58885..2959118 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -53,3 +53,64 @@
   }
   return true
 }
+
+/**
+ * 验证小写字母
+ * @param str
+ * @returns
+ */
+export function validateLowerCase(str: string) {
+  const reg = /^[a-z]+$/
+  return reg.test(str)
+}
+
+/* 验证大写字母 */
+export function validateUpperCase(str: string) {
+  const reg = /^[A-Z]+$/
+  return reg.test(str)
+}
+
+/* 验证大小写字母 */
+export function validateAlphabets(str: string) {
+  const reg = /^[A-Za-z]+$/
+  return reg.test(str)
+}
+
+/**
+ * 验证邮箱
+ * @param email
+ * @returns {boolean}
+ */
+export function validateEmail(email: string) {
+  const re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
+  return re.test(email)
+}
+
+/**
+ * 验证手机号
+ * @param phone
+ * @returns {boolean}
+ */
+export function validateMobile(phone: string) {
+  const re = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/
+  return re.test(phone)
+}
+
+/**
+ * 校验身份证号
+ * @param value
+ * @returns
+ */
+export function validateIdCardNo(value: string) {
+  const re = /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/
+  return re.test(value)
+}
+/**
+ *
+ * @param value 验证电话号码
+ * @returns
+ */
+export function validatePhone(value: string) {
+  const re = /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/
+  return re.test(value)
+}
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 1c2405e..bca0958 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,13 +1,46 @@
-<script lang="ts" setup name="borrowHandle">
-// 逻辑代码
+<!-- 设备借用处理 -->
+<script lang="ts" setup name="borrowApply">
+import list from './components/handleList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '待借用', comp: list },
+  { name: '已借用', comp: list },
+  { name: '已归还', comp: list },
+])
+const current = ref('待借用')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用处理
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 03d414b..c5771f7 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,13 +1,50 @@
+<!-- 设备借用申请 -->
 <script lang="ts" setup name="borrowApply">
-// 逻辑代码
+import list from './components/applyList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '全部', comp: list },
+  { name: '草稿箱', comp: list },
+  { name: '待审批', comp: list },
+  { name: '审批中', comp: list },
+  { name: '已通过', comp: list },
+  { name: '未通过', comp: list },
+  { name: '已取消', comp: list },
+])
+const current = ref('全部')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用申请
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
new file mode 100644
index 0000000..052f3ce
--- /dev/null
+++ b/src/views/device/borrow/components/applyList.vue
@@ -0,0 +1,328 @@
+<script lang="ts" setup name="borrowApplyList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '文件号',
+    value: 'fileNo',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '类别',
+    value: 'catergory',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '李四',
+      time: '2020-12-14 00:00:00',
+      status: '未通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const approveRef = ref()
+// 同意
+const agree = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '1',
+  })
+}
+// 驳回
+const reject = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '3',
+  })
+}
+// 拒绝
+const refuse = (row: any) => {
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
+}
+// 取消
+const cancel = (rowrow: any) => {
+  ElMessageBox.confirm(
+    '确认取消吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" @click="addBtn" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="agree(row)">
+                  同意
+                </el-button>
+                <el-button size="small" type="primary" link @click="reject(row)">
+                  驳回
+                </el-button>
+                <el-button size="small" type="primary" link @click="refuse(row)">
+                  拒绝
+                </el-button>
+                <el-button size="small" type="primary" link @click="cancel(row)">
+                  取消
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/components/approvalActionDialog.vue b/src/views/device/borrow/components/approvalActionDialog.vue
new file mode 100644
index 0000000..214876c
--- /dev/null
+++ b/src/views/device/borrow/components/approvalActionDialog.vue
@@ -0,0 +1,104 @@
+<!-- 审批操作弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
+const dialogVisibleApprove = ref(false)
+const form = reactive({
+  radio: '1',
+})
+const ruleFormRef = ref<FormInstance>()
+const rules = reactive<FormRules>({
+})
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const approvetime = ref('') // 审批时间
+const initDialog = (row: any) => {
+  dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
+}
+defineExpose({ initDialog })
+
+// 点击保存
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      dialogVisibleApprove.value = false
+      emits('resetData')
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  formEl.resetFields()
+  dialogVisibleApprove.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
+    <el-form
+      ref="ruleFormRef" :model="form"
+      :rules="rules" label-width="110px"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人">
+            <el-input disabled :value="userInfo.$state.name" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间">
+            <el-input disabled :value="approvetime" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
+        <el-button @click="resetForm(ruleFormRef)">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
new file mode 100644
index 0000000..cfda00a
--- /dev/null
+++ b/src/views/device/borrow/components/handleList.vue
@@ -0,0 +1,281 @@
+<script lang="ts" setup name="borrowHandleList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '申请编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'dept',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      dept: '顶级',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      dept: '徐州分中心',
+      user: '里斯',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+const borrow = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="borrow(row)">
+                  借用
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/addRow.vue b/src/views/device/standingBook/components/addRow.vue
index 1678cdb..07b03d1 100644
--- a/src/views/device/standingBook/components/addRow.vue
+++ b/src/views/device/standingBook/components/addRow.vue
@@ -5,7 +5,7 @@
 import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
+const formLabelWidth = '110px'
 const form = ref({})
 const formTable = ref([
   {
@@ -91,108 +91,188 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`">
+  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
     >
       <div v-if="name === '周检记录'">
-        <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录表编号" />
-        </el-form-item>
-        <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录人" />
-        </el-form-item>
-        <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="检定日期"
-          />
-        </el-form-item>
-        <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="有效日期"
-          />
-        </el-form-item>
-        <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="送检人" />
-        </el-form-item>
-        <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录表编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="检定日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="有效日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="送检人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '状态变更记录'">
-        <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="状态类型" clearable>
-            <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="结束日期"
-          />
-        </el-form-item>
-        <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="申请人" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="状态类型" clearable style="width: 100%;">
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="申请人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '使用记录'">
-        <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用人" />
-        </el-form-item>
-        <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用部门" />
-        </el-form-item>
-        <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="使用类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用结束日期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用部门" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="使用类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '检定证书'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="证书类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书出具日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书有效期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
     </el-form>
     <template #footer>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 5f7b347..9a9f798 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -352,7 +352,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -376,7 +376,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -391,7 +391,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -404,14 +404,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -434,7 +434,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -443,20 +443,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -480,23 +480,23 @@
               <com-tree-select
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -507,10 +507,10 @@
             <el-form-item label="检定部门" prop="mesureDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -520,7 +520,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -529,13 +529,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -544,21 +544,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -578,14 +578,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -594,14 +594,14 @@
         <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-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -669,7 +669,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index fc3fd54..d9d4514 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -199,6 +199,8 @@
     useDeptList.value = toTreeList(res.data, '0', true)
   })
 }
+const selectTreeRef1 = ref()
+const selectTreeRef2 = ref()
 // 重置
 const resetDATA = () => {
   ruleForm.value = {
@@ -254,6 +256,10 @@
     isStandardSupportEquipment: '', //		是否标准配套设备
     id: '',
   }
+  if (title.value !== '详情') {
+    selectTreeRef1.value.clearSelected()
+    selectTreeRef2.value.clearSelected()
+  }
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
@@ -378,7 +384,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -402,7 +408,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -416,8 +422,7 @@
             <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"
+                :placeholder="title === '详情' ? '' : '出厂年月'" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -430,14 +435,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -460,7 +465,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -469,20 +474,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -505,24 +510,26 @@
             <el-form-item label="使用部门" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
+                ref="selectTreeRef2"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -536,10 +543,12 @@
               </el-select> -->
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                ref="selectTreeRef1"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -549,7 +558,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -558,13 +567,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -573,21 +582,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -607,14 +616,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -624,14 +633,14 @@
           <el-col :span="6">
             <el-form-item label="资本来源" prop="capitalSource">
               <!-- <el-input v-model.trim="ruleForm.capitalSource" placeholder="资本来源" :disabled="title === '详情'" /> -->
-              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -699,7 +708,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f653095..f4229a6 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -147,19 +147,17 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
-  setTimeout(() => {
-    list.value = [
-      {
-        equipmentNo: 123,
-        equipmentName: 'test',
-        modelNo: '001',
-        usePersonName: '张三',
-        validDate: '2022-12-12 00:00:00',
-        useDeptName: '顶级',
-      },
-    ]
-    total.value = 1
-  }, 1000)
+  list.value = [
+    {
+      equipmentNo: 123,
+      equipmentName: 'test',
+      modelNo: '001',
+      usePersonName: '张三',
+      validDate: '2022-12-12 00:00:00',
+      useDeptName: '顶级',
+    },
+  ] as any
+  total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -220,9 +218,11 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -300,13 +300,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.mesureType" class="m-2 normal-select" placeholder="检定方式" clearable>
+          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable>
             <el-option
               v-for="item in mesureTypeList"
               :key="item.id"
@@ -316,7 +316,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.managerState" class="m-2 normal-select" placeholder="管理状态" clearable>
+          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable>
             <el-option
               v-for="item in managerStateList"
               :key="item.id"
@@ -327,8 +327,9 @@
         </search-item>
         <search-item>
           <com-tree-select
+            ref="selectTreeRef"
             v-model="searchQuery.useDept" :options="useDeptList" placeholder="使用部门"
-            :tree-props="deptProps" style="width: 150px;"
+            :tree-props="deptProps"
           />
         </search-item>
         <search-item>
@@ -336,11 +337,10 @@
             v-model="searchQuery.validDate" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="有效日期"
             class="normal-date"
-            style="width: 150px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.abc" class="m-2 normal-select" placeholder="ABC" clearable>
+          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable>
             <el-option
               v-for="item in abcList"
               :key="item.id"
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 78a3800..4c31a94 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -2,9 +2,10 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/fixedAssetsAdd.vue'
-import type { fixedAssetsType } from './standingBook-interface'
+import type { fixedAssetsType, selectType } from './standingBook-interface'
 import { exportFile } from '@/utils/exportUtils'
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
+import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   assetNo: '', // 固定编号
@@ -50,7 +51,7 @@
   },
   {
     text: '设备类型',
-    value: 'assetTypeName',
+    value: 'equipmentTypeName',
     width: '150',
     align: 'center',
   },
@@ -102,6 +103,7 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+const equipmentCategoryList = ref<selectType[]>([]) // 设备类别
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
@@ -242,6 +244,10 @@
 }
 onMounted(() => {
   getList()
+  // 获取设备类别
+  getDictByCode('equipmentCategory').then((response) => {
+    equipmentCategoryList.value = response.data
+  })
 })
 </script>
 
@@ -265,7 +271,10 @@
           <el-input v-model="searchQuery.equipmentSpecifications" placeholder="设备规格" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-select v-model="searchQuery.equipmentCategory" placeholder="设备类别" clearable>
+            <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+          </el-select>
         </search-item>
       </search-area>
       <table-container>
diff --git a/src/views/device/stateManage/components/addRow.vue b/src/views/device/stateManage/components/addRow.vue
new file mode 100644
index 0000000..3ba82d6
--- /dev/null
+++ b/src/views/device/stateManage/components/addRow.vue
@@ -0,0 +1,160 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { listPageApi } from '@/api/device/standingBook'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  limit: 10,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '出厂编号',
+    value: 'manufacturingNo',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+  },
+])
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listPageApi(listQuery.value as any).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map(item => ({ ...item, checked: '' }))
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    equipmentName: '', // 姓名
+    equipmentNo: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const checkedArr = list.value.filter(item => item.checked !== '')
+  if (checkedArr.length) {
+    console.log(checkedArr, '选中的设备')
+    emits('add', checkedArr)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择设备')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns as any" :query="listQuery"
+        :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-checkbox v-model="scope.row.checked" :label="scope.$index" size="large" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-checkbox__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index 56417d6..214876c 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -47,38 +47,45 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="30%">
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
-      :rules="rules"
+      :rules="rules" label-width="110px"
     >
-      <el-form-item label="审批意见">
-        <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
-        <el-radio-group v-model="form.radio">
-          <el-radio label="1">
-            同意
-          </el-radio>
-          <el-radio label="2">
-            拒绝
-          </el-radio>
-          <el-radio label="3">
-            驳回
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="审批结论">
-        <el-input
-          :rows="4"
-          type="textarea"
-        />
-      </el-form-item>
       <el-row :gutter="24">
-        <el-col :span="10">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="审批人">
             <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
-        <el-col :span="14">
+        <el-col :span="12">
           <el-form-item label="审批时间">
             <el-input disabled :value="approvetime" />
           </el-form-item>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index e74d70e..2003e31 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -1,7 +1,8 @@
 <!-- 新增或详情弹窗 -->
-<script lang="ts" setup name="addNotice">
+<script lang="ts" setup name="add">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
+import addRow from './addRow.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
@@ -16,6 +17,7 @@
 const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const name = ref('')
+const borrowList = ref([])
 const ruleForm = ref({
   assetNo: '', // 资产编号
   assetType: '', // 资产类型
@@ -357,10 +359,86 @@
     isShowCalibration.value = true
   }
 })
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerLevelName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+  },
+])
+const addRowRef = ref()
+// 添加行
+const addRowBtn = () => {
+  addRowRef.value.initDialog({ title: '添加' })
+}
+// 删除行
+const removeRowBtn = () => {
+  const removeArr = borrowList.value.filter(item => item.remove !== '')
+  if (removeArr.length) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      borrowList.value = borrowList.value.filter(item => item.remove === '')
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 借用设备列表添加
+const addRowMethods = (row) => {
+  row.forEach((element) => {
+    borrowList.value.push({ ...element, remove: '' })
+  })
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
     <detail-page :title="`${name}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
@@ -378,15 +456,16 @@
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder="">
+              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -430,7 +509,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -454,28 +533,56 @@
         </el-row>
       </el-form>
     </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>
+    <div>
+      <detail-block title="借用设备列表">
+        <template #btns>
+          <el-button type="primary" @click="addRowBtn">
+            添加行
+          </el-button>
+          <el-button type="info" @click="removeRowBtn">
+            删除行
+          </el-button>
+        </template>
+        <normal-table
+          :data="borrowList" :total="1" :columns="columns as any"
+        >
+          <template #preColumns>
+            <el-table-column label="选择" width="55" align="center">
+              <template #default="scope">
+                <el-checkbox v-model="scope.row.remove" :label="scope.$index" size="large" />
+              </template>
+            </el-table-column>
+            <el-table-column label="序号" width="60" align="center">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </detail-block>
+      <detail-block 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>
+    </div>
   </app-container>
 </template>
 
@@ -484,6 +591,10 @@
   background-color: #fff;
 }
 
+:deep(.el-checkbox__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,
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index aaaaf61..d588b8d 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,6 +1,7 @@
 <script lang="ts" setup name="bench">
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
+import type { trainLogStatistic } from './bench-interface'
 import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
 import { getPlanList } from '@/api/system/plan'
 import { listPageApi } from '@/api/measure/file'
@@ -132,15 +133,19 @@
     account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
+    const result: trainLogStatistic = res.data
+    const notQualified: number = Number(result.trainCount) - result.qualifiedCount
+    const qualifiedRate = ((result.qualifiedCount / result.trainCount) * 100).toFixed(2) // 合格率
+    const notQualifiedRate = ((notQualified / result.trainCount) * 100).toFixed(2) // 不合格率
     TrainLogSList.value = [
-      { name: `合格     ${res.data.qualified}-${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
-      { name: `不合格   ${res.data.notQualified}- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+      { name: `合   格   ${result.qualifiedCount}-${qualifiedRate}%`, value: result.qualifiedCount },
+      { name: `不合格   ${notQualified}- ${notQualifiedRate}%`, value: notQualified },
     ]
     TrainLogTitle.value = res.data.trainCount
   }).catch((_) => {
     // 处理异常
     TrainLogSList.value = [
-      { name: '合格     0 - 50%', value: 0 },
+      { name: '合   格   0 - 50%', value: 0 },
       { name: '不合格   0 - 50%', value: 0 },
     ]
     TrainLogTitle.value = 0
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 9ef0b93..1ad577b 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -270,7 +270,7 @@
               <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="6">
             <el-form-item label="名称" prop="fileName">
               <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
             </el-form-item>
@@ -279,13 +279,14 @@
         <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" class="fill-input" disabled>
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled style="width: 100%;">
                 <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="请选择发布单位"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -295,6 +296,7 @@
                 v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -311,12 +313,13 @@
                 v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人" prop="createUserId">
-              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>

diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index bb58885..2959118 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -53,3 +53,64 @@
   }
   return true
 }
+
+/**
+ * 验证小写字母
+ * @param str
+ * @returns
+ */
+export function validateLowerCase(str: string) {
+  const reg = /^[a-z]+$/
+  return reg.test(str)
+}
+
+/* 验证大写字母 */
+export function validateUpperCase(str: string) {
+  const reg = /^[A-Z]+$/
+  return reg.test(str)
+}
+
+/* 验证大小写字母 */
+export function validateAlphabets(str: string) {
+  const reg = /^[A-Za-z]+$/
+  return reg.test(str)
+}
+
+/**
+ * 验证邮箱
+ * @param email
+ * @returns {boolean}
+ */
+export function validateEmail(email: string) {
+  const re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
+  return re.test(email)
+}
+
+/**
+ * 验证手机号
+ * @param phone
+ * @returns {boolean}
+ */
+export function validateMobile(phone: string) {
+  const re = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/
+  return re.test(phone)
+}
+
+/**
+ * 校验身份证号
+ * @param value
+ * @returns
+ */
+export function validateIdCardNo(value: string) {
+  const re = /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/
+  return re.test(value)
+}
+/**
+ *
+ * @param value 验证电话号码
+ * @returns
+ */
+export function validatePhone(value: string) {
+  const re = /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/
+  return re.test(value)
+}
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 1c2405e..bca0958 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,13 +1,46 @@
-<script lang="ts" setup name="borrowHandle">
-// 逻辑代码
+<!-- 设备借用处理 -->
+<script lang="ts" setup name="borrowApply">
+import list from './components/handleList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '待借用', comp: list },
+  { name: '已借用', comp: list },
+  { name: '已归还', comp: list },
+])
+const current = ref('待借用')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用处理
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 03d414b..c5771f7 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,13 +1,50 @@
+<!-- 设备借用申请 -->
 <script lang="ts" setup name="borrowApply">
-// 逻辑代码
+import list from './components/applyList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '全部', comp: list },
+  { name: '草稿箱', comp: list },
+  { name: '待审批', comp: list },
+  { name: '审批中', comp: list },
+  { name: '已通过', comp: list },
+  { name: '未通过', comp: list },
+  { name: '已取消', comp: list },
+])
+const current = ref('全部')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用申请
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
new file mode 100644
index 0000000..052f3ce
--- /dev/null
+++ b/src/views/device/borrow/components/applyList.vue
@@ -0,0 +1,328 @@
+<script lang="ts" setup name="borrowApplyList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '文件号',
+    value: 'fileNo',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '类别',
+    value: 'catergory',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '李四',
+      time: '2020-12-14 00:00:00',
+      status: '未通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const approveRef = ref()
+// 同意
+const agree = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '1',
+  })
+}
+// 驳回
+const reject = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '3',
+  })
+}
+// 拒绝
+const refuse = (row: any) => {
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
+}
+// 取消
+const cancel = (rowrow: any) => {
+  ElMessageBox.confirm(
+    '确认取消吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" @click="addBtn" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="agree(row)">
+                  同意
+                </el-button>
+                <el-button size="small" type="primary" link @click="reject(row)">
+                  驳回
+                </el-button>
+                <el-button size="small" type="primary" link @click="refuse(row)">
+                  拒绝
+                </el-button>
+                <el-button size="small" type="primary" link @click="cancel(row)">
+                  取消
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/components/approvalActionDialog.vue b/src/views/device/borrow/components/approvalActionDialog.vue
new file mode 100644
index 0000000..214876c
--- /dev/null
+++ b/src/views/device/borrow/components/approvalActionDialog.vue
@@ -0,0 +1,104 @@
+<!-- 审批操作弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
+const dialogVisibleApprove = ref(false)
+const form = reactive({
+  radio: '1',
+})
+const ruleFormRef = ref<FormInstance>()
+const rules = reactive<FormRules>({
+})
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const approvetime = ref('') // 审批时间
+const initDialog = (row: any) => {
+  dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
+}
+defineExpose({ initDialog })
+
+// 点击保存
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      dialogVisibleApprove.value = false
+      emits('resetData')
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  formEl.resetFields()
+  dialogVisibleApprove.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
+    <el-form
+      ref="ruleFormRef" :model="form"
+      :rules="rules" label-width="110px"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人">
+            <el-input disabled :value="userInfo.$state.name" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间">
+            <el-input disabled :value="approvetime" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
+        <el-button @click="resetForm(ruleFormRef)">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
new file mode 100644
index 0000000..cfda00a
--- /dev/null
+++ b/src/views/device/borrow/components/handleList.vue
@@ -0,0 +1,281 @@
+<script lang="ts" setup name="borrowHandleList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '申请编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'dept',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      dept: '顶级',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      dept: '徐州分中心',
+      user: '里斯',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+const borrow = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="borrow(row)">
+                  借用
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/addRow.vue b/src/views/device/standingBook/components/addRow.vue
index 1678cdb..07b03d1 100644
--- a/src/views/device/standingBook/components/addRow.vue
+++ b/src/views/device/standingBook/components/addRow.vue
@@ -5,7 +5,7 @@
 import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
+const formLabelWidth = '110px'
 const form = ref({})
 const formTable = ref([
   {
@@ -91,108 +91,188 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`">
+  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
     >
       <div v-if="name === '周检记录'">
-        <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录表编号" />
-        </el-form-item>
-        <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录人" />
-        </el-form-item>
-        <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="检定日期"
-          />
-        </el-form-item>
-        <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="有效日期"
-          />
-        </el-form-item>
-        <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="送检人" />
-        </el-form-item>
-        <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录表编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="检定日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="有效日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="送检人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '状态变更记录'">
-        <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="状态类型" clearable>
-            <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="结束日期"
-          />
-        </el-form-item>
-        <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="申请人" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="状态类型" clearable style="width: 100%;">
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="申请人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '使用记录'">
-        <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用人" />
-        </el-form-item>
-        <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用部门" />
-        </el-form-item>
-        <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="使用类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用结束日期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用部门" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="使用类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '检定证书'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="证书类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书出具日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书有效期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
     </el-form>
     <template #footer>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 5f7b347..9a9f798 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -352,7 +352,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -376,7 +376,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -391,7 +391,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -404,14 +404,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -434,7 +434,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -443,20 +443,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -480,23 +480,23 @@
               <com-tree-select
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -507,10 +507,10 @@
             <el-form-item label="检定部门" prop="mesureDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -520,7 +520,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -529,13 +529,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -544,21 +544,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -578,14 +578,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -594,14 +594,14 @@
         <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-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -669,7 +669,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index fc3fd54..d9d4514 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -199,6 +199,8 @@
     useDeptList.value = toTreeList(res.data, '0', true)
   })
 }
+const selectTreeRef1 = ref()
+const selectTreeRef2 = ref()
 // 重置
 const resetDATA = () => {
   ruleForm.value = {
@@ -254,6 +256,10 @@
     isStandardSupportEquipment: '', //		是否标准配套设备
     id: '',
   }
+  if (title.value !== '详情') {
+    selectTreeRef1.value.clearSelected()
+    selectTreeRef2.value.clearSelected()
+  }
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
@@ -378,7 +384,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -402,7 +408,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -416,8 +422,7 @@
             <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"
+                :placeholder="title === '详情' ? '' : '出厂年月'" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -430,14 +435,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -460,7 +465,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -469,20 +474,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -505,24 +510,26 @@
             <el-form-item label="使用部门" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
+                ref="selectTreeRef2"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -536,10 +543,12 @@
               </el-select> -->
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                ref="selectTreeRef1"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -549,7 +558,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -558,13 +567,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -573,21 +582,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -607,14 +616,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -624,14 +633,14 @@
           <el-col :span="6">
             <el-form-item label="资本来源" prop="capitalSource">
               <!-- <el-input v-model.trim="ruleForm.capitalSource" placeholder="资本来源" :disabled="title === '详情'" /> -->
-              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -699,7 +708,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f653095..f4229a6 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -147,19 +147,17 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
-  setTimeout(() => {
-    list.value = [
-      {
-        equipmentNo: 123,
-        equipmentName: 'test',
-        modelNo: '001',
-        usePersonName: '张三',
-        validDate: '2022-12-12 00:00:00',
-        useDeptName: '顶级',
-      },
-    ]
-    total.value = 1
-  }, 1000)
+  list.value = [
+    {
+      equipmentNo: 123,
+      equipmentName: 'test',
+      modelNo: '001',
+      usePersonName: '张三',
+      validDate: '2022-12-12 00:00:00',
+      useDeptName: '顶级',
+    },
+  ] as any
+  total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -220,9 +218,11 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -300,13 +300,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.mesureType" class="m-2 normal-select" placeholder="检定方式" clearable>
+          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable>
             <el-option
               v-for="item in mesureTypeList"
               :key="item.id"
@@ -316,7 +316,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.managerState" class="m-2 normal-select" placeholder="管理状态" clearable>
+          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable>
             <el-option
               v-for="item in managerStateList"
               :key="item.id"
@@ -327,8 +327,9 @@
         </search-item>
         <search-item>
           <com-tree-select
+            ref="selectTreeRef"
             v-model="searchQuery.useDept" :options="useDeptList" placeholder="使用部门"
-            :tree-props="deptProps" style="width: 150px;"
+            :tree-props="deptProps"
           />
         </search-item>
         <search-item>
@@ -336,11 +337,10 @@
             v-model="searchQuery.validDate" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="有效日期"
             class="normal-date"
-            style="width: 150px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.abc" class="m-2 normal-select" placeholder="ABC" clearable>
+          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable>
             <el-option
               v-for="item in abcList"
               :key="item.id"
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 78a3800..4c31a94 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -2,9 +2,10 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/fixedAssetsAdd.vue'
-import type { fixedAssetsType } from './standingBook-interface'
+import type { fixedAssetsType, selectType } from './standingBook-interface'
 import { exportFile } from '@/utils/exportUtils'
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
+import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   assetNo: '', // 固定编号
@@ -50,7 +51,7 @@
   },
   {
     text: '设备类型',
-    value: 'assetTypeName',
+    value: 'equipmentTypeName',
     width: '150',
     align: 'center',
   },
@@ -102,6 +103,7 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+const equipmentCategoryList = ref<selectType[]>([]) // 设备类别
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
@@ -242,6 +244,10 @@
 }
 onMounted(() => {
   getList()
+  // 获取设备类别
+  getDictByCode('equipmentCategory').then((response) => {
+    equipmentCategoryList.value = response.data
+  })
 })
 </script>
 
@@ -265,7 +271,10 @@
           <el-input v-model="searchQuery.equipmentSpecifications" placeholder="设备规格" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-select v-model="searchQuery.equipmentCategory" placeholder="设备类别" clearable>
+            <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+          </el-select>
         </search-item>
       </search-area>
       <table-container>
diff --git a/src/views/device/stateManage/components/addRow.vue b/src/views/device/stateManage/components/addRow.vue
new file mode 100644
index 0000000..3ba82d6
--- /dev/null
+++ b/src/views/device/stateManage/components/addRow.vue
@@ -0,0 +1,160 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { listPageApi } from '@/api/device/standingBook'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  limit: 10,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '出厂编号',
+    value: 'manufacturingNo',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+  },
+])
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listPageApi(listQuery.value as any).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map(item => ({ ...item, checked: '' }))
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    equipmentName: '', // 姓名
+    equipmentNo: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const checkedArr = list.value.filter(item => item.checked !== '')
+  if (checkedArr.length) {
+    console.log(checkedArr, '选中的设备')
+    emits('add', checkedArr)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择设备')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns as any" :query="listQuery"
+        :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-checkbox v-model="scope.row.checked" :label="scope.$index" size="large" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-checkbox__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index 56417d6..214876c 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -47,38 +47,45 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="30%">
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
-      :rules="rules"
+      :rules="rules" label-width="110px"
     >
-      <el-form-item label="审批意见">
-        <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
-        <el-radio-group v-model="form.radio">
-          <el-radio label="1">
-            同意
-          </el-radio>
-          <el-radio label="2">
-            拒绝
-          </el-radio>
-          <el-radio label="3">
-            驳回
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="审批结论">
-        <el-input
-          :rows="4"
-          type="textarea"
-        />
-      </el-form-item>
       <el-row :gutter="24">
-        <el-col :span="10">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="审批人">
             <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
-        <el-col :span="14">
+        <el-col :span="12">
           <el-form-item label="审批时间">
             <el-input disabled :value="approvetime" />
           </el-form-item>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index e74d70e..2003e31 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -1,7 +1,8 @@
 <!-- 新增或详情弹窗 -->
-<script lang="ts" setup name="addNotice">
+<script lang="ts" setup name="add">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
+import addRow from './addRow.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
@@ -16,6 +17,7 @@
 const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const name = ref('')
+const borrowList = ref([])
 const ruleForm = ref({
   assetNo: '', // 资产编号
   assetType: '', // 资产类型
@@ -357,10 +359,86 @@
     isShowCalibration.value = true
   }
 })
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerLevelName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+  },
+])
+const addRowRef = ref()
+// 添加行
+const addRowBtn = () => {
+  addRowRef.value.initDialog({ title: '添加' })
+}
+// 删除行
+const removeRowBtn = () => {
+  const removeArr = borrowList.value.filter(item => item.remove !== '')
+  if (removeArr.length) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      borrowList.value = borrowList.value.filter(item => item.remove === '')
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 借用设备列表添加
+const addRowMethods = (row) => {
+  row.forEach((element) => {
+    borrowList.value.push({ ...element, remove: '' })
+  })
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
     <detail-page :title="`${name}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
@@ -378,15 +456,16 @@
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder="">
+              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -430,7 +509,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -454,28 +533,56 @@
         </el-row>
       </el-form>
     </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>
+    <div>
+      <detail-block title="借用设备列表">
+        <template #btns>
+          <el-button type="primary" @click="addRowBtn">
+            添加行
+          </el-button>
+          <el-button type="info" @click="removeRowBtn">
+            删除行
+          </el-button>
+        </template>
+        <normal-table
+          :data="borrowList" :total="1" :columns="columns as any"
+        >
+          <template #preColumns>
+            <el-table-column label="选择" width="55" align="center">
+              <template #default="scope">
+                <el-checkbox v-model="scope.row.remove" :label="scope.$index" size="large" />
+              </template>
+            </el-table-column>
+            <el-table-column label="序号" width="60" align="center">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </detail-block>
+      <detail-block 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>
+    </div>
   </app-container>
 </template>
 
@@ -484,6 +591,10 @@
   background-color: #fff;
 }
 
+:deep(.el-checkbox__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,
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index aaaaf61..d588b8d 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,6 +1,7 @@
 <script lang="ts" setup name="bench">
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
+import type { trainLogStatistic } from './bench-interface'
 import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
 import { getPlanList } from '@/api/system/plan'
 import { listPageApi } from '@/api/measure/file'
@@ -132,15 +133,19 @@
     account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
+    const result: trainLogStatistic = res.data
+    const notQualified: number = Number(result.trainCount) - result.qualifiedCount
+    const qualifiedRate = ((result.qualifiedCount / result.trainCount) * 100).toFixed(2) // 合格率
+    const notQualifiedRate = ((notQualified / result.trainCount) * 100).toFixed(2) // 不合格率
     TrainLogSList.value = [
-      { name: `合格     ${res.data.qualified}-${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
-      { name: `不合格   ${res.data.notQualified}- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+      { name: `合   格   ${result.qualifiedCount}-${qualifiedRate}%`, value: result.qualifiedCount },
+      { name: `不合格   ${notQualified}- ${notQualifiedRate}%`, value: notQualified },
     ]
     TrainLogTitle.value = res.data.trainCount
   }).catch((_) => {
     // 处理异常
     TrainLogSList.value = [
-      { name: '合格     0 - 50%', value: 0 },
+      { name: '合   格   0 - 50%', value: 0 },
       { name: '不合格   0 - 50%', value: 0 },
     ]
     TrainLogTitle.value = 0
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 9ef0b93..1ad577b 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -270,7 +270,7 @@
               <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="6">
             <el-form-item label="名称" prop="fileName">
               <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
             </el-form-item>
@@ -279,13 +279,14 @@
         <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" class="fill-input" disabled>
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled style="width: 100%;">
                 <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="请选择发布单位"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -295,6 +296,7 @@
                 v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -311,12 +313,13 @@
                 v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人" prop="createUserId">
-              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index b45fbc3..542b284 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -26,7 +26,7 @@
   createUser: '', // 创建人
   createTime: '', // 创建
   approvalStatus: props.value, // 审批状态
-  limit: 10,
+  limit: 20,
   offset: 1,
   fileType: '', // 类型
   formId: '',

diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index bb58885..2959118 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -53,3 +53,64 @@
   }
   return true
 }
+
+/**
+ * 验证小写字母
+ * @param str
+ * @returns
+ */
+export function validateLowerCase(str: string) {
+  const reg = /^[a-z]+$/
+  return reg.test(str)
+}
+
+/* 验证大写字母 */
+export function validateUpperCase(str: string) {
+  const reg = /^[A-Z]+$/
+  return reg.test(str)
+}
+
+/* 验证大小写字母 */
+export function validateAlphabets(str: string) {
+  const reg = /^[A-Za-z]+$/
+  return reg.test(str)
+}
+
+/**
+ * 验证邮箱
+ * @param email
+ * @returns {boolean}
+ */
+export function validateEmail(email: string) {
+  const re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
+  return re.test(email)
+}
+
+/**
+ * 验证手机号
+ * @param phone
+ * @returns {boolean}
+ */
+export function validateMobile(phone: string) {
+  const re = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/
+  return re.test(phone)
+}
+
+/**
+ * 校验身份证号
+ * @param value
+ * @returns
+ */
+export function validateIdCardNo(value: string) {
+  const re = /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/
+  return re.test(value)
+}
+/**
+ *
+ * @param value 验证电话号码
+ * @returns
+ */
+export function validatePhone(value: string) {
+  const re = /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/
+  return re.test(value)
+}
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 1c2405e..bca0958 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,13 +1,46 @@
-<script lang="ts" setup name="borrowHandle">
-// 逻辑代码
+<!-- 设备借用处理 -->
+<script lang="ts" setup name="borrowApply">
+import list from './components/handleList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '待借用', comp: list },
+  { name: '已借用', comp: list },
+  { name: '已归还', comp: list },
+])
+const current = ref('待借用')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用处理
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 03d414b..c5771f7 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,13 +1,50 @@
+<!-- 设备借用申请 -->
 <script lang="ts" setup name="borrowApply">
-// 逻辑代码
+import list from './components/applyList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '全部', comp: list },
+  { name: '草稿箱', comp: list },
+  { name: '待审批', comp: list },
+  { name: '审批中', comp: list },
+  { name: '已通过', comp: list },
+  { name: '未通过', comp: list },
+  { name: '已取消', comp: list },
+])
+const current = ref('全部')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用申请
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
new file mode 100644
index 0000000..052f3ce
--- /dev/null
+++ b/src/views/device/borrow/components/applyList.vue
@@ -0,0 +1,328 @@
+<script lang="ts" setup name="borrowApplyList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '文件号',
+    value: 'fileNo',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '类别',
+    value: 'catergory',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '李四',
+      time: '2020-12-14 00:00:00',
+      status: '未通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const approveRef = ref()
+// 同意
+const agree = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '1',
+  })
+}
+// 驳回
+const reject = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '3',
+  })
+}
+// 拒绝
+const refuse = (row: any) => {
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
+}
+// 取消
+const cancel = (rowrow: any) => {
+  ElMessageBox.confirm(
+    '确认取消吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" @click="addBtn" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="agree(row)">
+                  同意
+                </el-button>
+                <el-button size="small" type="primary" link @click="reject(row)">
+                  驳回
+                </el-button>
+                <el-button size="small" type="primary" link @click="refuse(row)">
+                  拒绝
+                </el-button>
+                <el-button size="small" type="primary" link @click="cancel(row)">
+                  取消
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/components/approvalActionDialog.vue b/src/views/device/borrow/components/approvalActionDialog.vue
new file mode 100644
index 0000000..214876c
--- /dev/null
+++ b/src/views/device/borrow/components/approvalActionDialog.vue
@@ -0,0 +1,104 @@
+<!-- 审批操作弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
+const dialogVisibleApprove = ref(false)
+const form = reactive({
+  radio: '1',
+})
+const ruleFormRef = ref<FormInstance>()
+const rules = reactive<FormRules>({
+})
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const approvetime = ref('') // 审批时间
+const initDialog = (row: any) => {
+  dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
+}
+defineExpose({ initDialog })
+
+// 点击保存
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      dialogVisibleApprove.value = false
+      emits('resetData')
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  formEl.resetFields()
+  dialogVisibleApprove.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
+    <el-form
+      ref="ruleFormRef" :model="form"
+      :rules="rules" label-width="110px"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人">
+            <el-input disabled :value="userInfo.$state.name" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间">
+            <el-input disabled :value="approvetime" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
+        <el-button @click="resetForm(ruleFormRef)">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
new file mode 100644
index 0000000..cfda00a
--- /dev/null
+++ b/src/views/device/borrow/components/handleList.vue
@@ -0,0 +1,281 @@
+<script lang="ts" setup name="borrowHandleList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '申请编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'dept',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      dept: '顶级',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      dept: '徐州分中心',
+      user: '里斯',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+const borrow = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="borrow(row)">
+                  借用
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/addRow.vue b/src/views/device/standingBook/components/addRow.vue
index 1678cdb..07b03d1 100644
--- a/src/views/device/standingBook/components/addRow.vue
+++ b/src/views/device/standingBook/components/addRow.vue
@@ -5,7 +5,7 @@
 import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
+const formLabelWidth = '110px'
 const form = ref({})
 const formTable = ref([
   {
@@ -91,108 +91,188 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`">
+  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
     >
       <div v-if="name === '周检记录'">
-        <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录表编号" />
-        </el-form-item>
-        <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录人" />
-        </el-form-item>
-        <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="检定日期"
-          />
-        </el-form-item>
-        <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="有效日期"
-          />
-        </el-form-item>
-        <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="送检人" />
-        </el-form-item>
-        <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录表编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="检定日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="有效日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="送检人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '状态变更记录'">
-        <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="状态类型" clearable>
-            <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="结束日期"
-          />
-        </el-form-item>
-        <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="申请人" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="状态类型" clearable style="width: 100%;">
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="申请人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '使用记录'">
-        <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用人" />
-        </el-form-item>
-        <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用部门" />
-        </el-form-item>
-        <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="使用类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用结束日期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用部门" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="使用类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '检定证书'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="证书类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书出具日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书有效期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
     </el-form>
     <template #footer>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 5f7b347..9a9f798 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -352,7 +352,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -376,7 +376,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -391,7 +391,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -404,14 +404,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -434,7 +434,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -443,20 +443,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -480,23 +480,23 @@
               <com-tree-select
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -507,10 +507,10 @@
             <el-form-item label="检定部门" prop="mesureDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -520,7 +520,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -529,13 +529,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -544,21 +544,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -578,14 +578,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -594,14 +594,14 @@
         <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-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -669,7 +669,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index fc3fd54..d9d4514 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -199,6 +199,8 @@
     useDeptList.value = toTreeList(res.data, '0', true)
   })
 }
+const selectTreeRef1 = ref()
+const selectTreeRef2 = ref()
 // 重置
 const resetDATA = () => {
   ruleForm.value = {
@@ -254,6 +256,10 @@
     isStandardSupportEquipment: '', //		是否标准配套设备
     id: '',
   }
+  if (title.value !== '详情') {
+    selectTreeRef1.value.clearSelected()
+    selectTreeRef2.value.clearSelected()
+  }
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
@@ -378,7 +384,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -402,7 +408,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -416,8 +422,7 @@
             <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"
+                :placeholder="title === '详情' ? '' : '出厂年月'" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -430,14 +435,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -460,7 +465,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -469,20 +474,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -505,24 +510,26 @@
             <el-form-item label="使用部门" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
+                ref="selectTreeRef2"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -536,10 +543,12 @@
               </el-select> -->
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                ref="selectTreeRef1"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -549,7 +558,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -558,13 +567,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -573,21 +582,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -607,14 +616,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -624,14 +633,14 @@
           <el-col :span="6">
             <el-form-item label="资本来源" prop="capitalSource">
               <!-- <el-input v-model.trim="ruleForm.capitalSource" placeholder="资本来源" :disabled="title === '详情'" /> -->
-              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -699,7 +708,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f653095..f4229a6 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -147,19 +147,17 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
-  setTimeout(() => {
-    list.value = [
-      {
-        equipmentNo: 123,
-        equipmentName: 'test',
-        modelNo: '001',
-        usePersonName: '张三',
-        validDate: '2022-12-12 00:00:00',
-        useDeptName: '顶级',
-      },
-    ]
-    total.value = 1
-  }, 1000)
+  list.value = [
+    {
+      equipmentNo: 123,
+      equipmentName: 'test',
+      modelNo: '001',
+      usePersonName: '张三',
+      validDate: '2022-12-12 00:00:00',
+      useDeptName: '顶级',
+    },
+  ] as any
+  total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -220,9 +218,11 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -300,13 +300,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.mesureType" class="m-2 normal-select" placeholder="检定方式" clearable>
+          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable>
             <el-option
               v-for="item in mesureTypeList"
               :key="item.id"
@@ -316,7 +316,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.managerState" class="m-2 normal-select" placeholder="管理状态" clearable>
+          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable>
             <el-option
               v-for="item in managerStateList"
               :key="item.id"
@@ -327,8 +327,9 @@
         </search-item>
         <search-item>
           <com-tree-select
+            ref="selectTreeRef"
             v-model="searchQuery.useDept" :options="useDeptList" placeholder="使用部门"
-            :tree-props="deptProps" style="width: 150px;"
+            :tree-props="deptProps"
           />
         </search-item>
         <search-item>
@@ -336,11 +337,10 @@
             v-model="searchQuery.validDate" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="有效日期"
             class="normal-date"
-            style="width: 150px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.abc" class="m-2 normal-select" placeholder="ABC" clearable>
+          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable>
             <el-option
               v-for="item in abcList"
               :key="item.id"
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 78a3800..4c31a94 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -2,9 +2,10 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/fixedAssetsAdd.vue'
-import type { fixedAssetsType } from './standingBook-interface'
+import type { fixedAssetsType, selectType } from './standingBook-interface'
 import { exportFile } from '@/utils/exportUtils'
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
+import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   assetNo: '', // 固定编号
@@ -50,7 +51,7 @@
   },
   {
     text: '设备类型',
-    value: 'assetTypeName',
+    value: 'equipmentTypeName',
     width: '150',
     align: 'center',
   },
@@ -102,6 +103,7 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+const equipmentCategoryList = ref<selectType[]>([]) // 设备类别
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
@@ -242,6 +244,10 @@
 }
 onMounted(() => {
   getList()
+  // 获取设备类别
+  getDictByCode('equipmentCategory').then((response) => {
+    equipmentCategoryList.value = response.data
+  })
 })
 </script>
 
@@ -265,7 +271,10 @@
           <el-input v-model="searchQuery.equipmentSpecifications" placeholder="设备规格" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-select v-model="searchQuery.equipmentCategory" placeholder="设备类别" clearable>
+            <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+          </el-select>
         </search-item>
       </search-area>
       <table-container>
diff --git a/src/views/device/stateManage/components/addRow.vue b/src/views/device/stateManage/components/addRow.vue
new file mode 100644
index 0000000..3ba82d6
--- /dev/null
+++ b/src/views/device/stateManage/components/addRow.vue
@@ -0,0 +1,160 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { listPageApi } from '@/api/device/standingBook'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  limit: 10,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '出厂编号',
+    value: 'manufacturingNo',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+  },
+])
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listPageApi(listQuery.value as any).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map(item => ({ ...item, checked: '' }))
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    equipmentName: '', // 姓名
+    equipmentNo: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const checkedArr = list.value.filter(item => item.checked !== '')
+  if (checkedArr.length) {
+    console.log(checkedArr, '选中的设备')
+    emits('add', checkedArr)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择设备')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns as any" :query="listQuery"
+        :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-checkbox v-model="scope.row.checked" :label="scope.$index" size="large" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-checkbox__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index 56417d6..214876c 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -47,38 +47,45 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="30%">
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
-      :rules="rules"
+      :rules="rules" label-width="110px"
     >
-      <el-form-item label="审批意见">
-        <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
-        <el-radio-group v-model="form.radio">
-          <el-radio label="1">
-            同意
-          </el-radio>
-          <el-radio label="2">
-            拒绝
-          </el-radio>
-          <el-radio label="3">
-            驳回
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="审批结论">
-        <el-input
-          :rows="4"
-          type="textarea"
-        />
-      </el-form-item>
       <el-row :gutter="24">
-        <el-col :span="10">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="审批人">
             <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
-        <el-col :span="14">
+        <el-col :span="12">
           <el-form-item label="审批时间">
             <el-input disabled :value="approvetime" />
           </el-form-item>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index e74d70e..2003e31 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -1,7 +1,8 @@
 <!-- 新增或详情弹窗 -->
-<script lang="ts" setup name="addNotice">
+<script lang="ts" setup name="add">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
+import addRow from './addRow.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
@@ -16,6 +17,7 @@
 const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const name = ref('')
+const borrowList = ref([])
 const ruleForm = ref({
   assetNo: '', // 资产编号
   assetType: '', // 资产类型
@@ -357,10 +359,86 @@
     isShowCalibration.value = true
   }
 })
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerLevelName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+  },
+])
+const addRowRef = ref()
+// 添加行
+const addRowBtn = () => {
+  addRowRef.value.initDialog({ title: '添加' })
+}
+// 删除行
+const removeRowBtn = () => {
+  const removeArr = borrowList.value.filter(item => item.remove !== '')
+  if (removeArr.length) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      borrowList.value = borrowList.value.filter(item => item.remove === '')
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 借用设备列表添加
+const addRowMethods = (row) => {
+  row.forEach((element) => {
+    borrowList.value.push({ ...element, remove: '' })
+  })
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
     <detail-page :title="`${name}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
@@ -378,15 +456,16 @@
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder="">
+              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -430,7 +509,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -454,28 +533,56 @@
         </el-row>
       </el-form>
     </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>
+    <div>
+      <detail-block title="借用设备列表">
+        <template #btns>
+          <el-button type="primary" @click="addRowBtn">
+            添加行
+          </el-button>
+          <el-button type="info" @click="removeRowBtn">
+            删除行
+          </el-button>
+        </template>
+        <normal-table
+          :data="borrowList" :total="1" :columns="columns as any"
+        >
+          <template #preColumns>
+            <el-table-column label="选择" width="55" align="center">
+              <template #default="scope">
+                <el-checkbox v-model="scope.row.remove" :label="scope.$index" size="large" />
+              </template>
+            </el-table-column>
+            <el-table-column label="序号" width="60" align="center">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </detail-block>
+      <detail-block 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>
+    </div>
   </app-container>
 </template>
 
@@ -484,6 +591,10 @@
   background-color: #fff;
 }
 
+:deep(.el-checkbox__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,
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index aaaaf61..d588b8d 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,6 +1,7 @@
 <script lang="ts" setup name="bench">
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
+import type { trainLogStatistic } from './bench-interface'
 import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
 import { getPlanList } from '@/api/system/plan'
 import { listPageApi } from '@/api/measure/file'
@@ -132,15 +133,19 @@
     account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
+    const result: trainLogStatistic = res.data
+    const notQualified: number = Number(result.trainCount) - result.qualifiedCount
+    const qualifiedRate = ((result.qualifiedCount / result.trainCount) * 100).toFixed(2) // 合格率
+    const notQualifiedRate = ((notQualified / result.trainCount) * 100).toFixed(2) // 不合格率
     TrainLogSList.value = [
-      { name: `合格     ${res.data.qualified}-${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
-      { name: `不合格   ${res.data.notQualified}- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+      { name: `合   格   ${result.qualifiedCount}-${qualifiedRate}%`, value: result.qualifiedCount },
+      { name: `不合格   ${notQualified}- ${notQualifiedRate}%`, value: notQualified },
     ]
     TrainLogTitle.value = res.data.trainCount
   }).catch((_) => {
     // 处理异常
     TrainLogSList.value = [
-      { name: '合格     0 - 50%', value: 0 },
+      { name: '合   格   0 - 50%', value: 0 },
       { name: '不合格   0 - 50%', value: 0 },
     ]
     TrainLogTitle.value = 0
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 9ef0b93..1ad577b 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -270,7 +270,7 @@
               <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="6">
             <el-form-item label="名称" prop="fileName">
               <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
             </el-form-item>
@@ -279,13 +279,14 @@
         <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" class="fill-input" disabled>
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled style="width: 100%;">
                 <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="请选择发布单位"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -295,6 +296,7 @@
                 v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -311,12 +313,13 @@
                 v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人" prop="createUserId">
-              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index b45fbc3..542b284 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -26,7 +26,7 @@
   createUser: '', // 创建人
   createTime: '', // 创建
   approvalStatus: props.value, // 审批状态
-  limit: 10,
+  limit: 20,
   offset: 1,
   fileType: '', // 类型
   formId: '',
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 7d4724b..e54ddf5 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -26,7 +26,7 @@
   fileCode: '', // 文件号
   effectiveTime: '', // 实施时间
   effectiveStatus: '', // 实施状态
-  limit: 10,
+  limit: 20,
   offset: 1,
   fileType: '', // 类型
 }) // 查询参数
@@ -75,13 +75,19 @@
 const getStatus = () => {
   getDictByCode('effectiveStatus').then((res) => {
     if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
+      effectiveStatusSelect.value = [...res.data, { name: '全部', value: '', id: 'quanbu' }]
     }
   })
 }
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.publishTime) {
+    searchQuery.publishTime = ''
+  }
+  if (!searchQuery.effectiveTime) {
+    searchQuery.effectiveTime = ''
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -252,13 +258,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" />
         </search-item>
         <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
@@ -274,20 +280,16 @@
           <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: 185px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
             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: 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" placeholder="实施状态" clearable>
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"

diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index bb58885..2959118 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -53,3 +53,64 @@
   }
   return true
 }
+
+/**
+ * 验证小写字母
+ * @param str
+ * @returns
+ */
+export function validateLowerCase(str: string) {
+  const reg = /^[a-z]+$/
+  return reg.test(str)
+}
+
+/* 验证大写字母 */
+export function validateUpperCase(str: string) {
+  const reg = /^[A-Z]+$/
+  return reg.test(str)
+}
+
+/* 验证大小写字母 */
+export function validateAlphabets(str: string) {
+  const reg = /^[A-Za-z]+$/
+  return reg.test(str)
+}
+
+/**
+ * 验证邮箱
+ * @param email
+ * @returns {boolean}
+ */
+export function validateEmail(email: string) {
+  const re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
+  return re.test(email)
+}
+
+/**
+ * 验证手机号
+ * @param phone
+ * @returns {boolean}
+ */
+export function validateMobile(phone: string) {
+  const re = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/
+  return re.test(phone)
+}
+
+/**
+ * 校验身份证号
+ * @param value
+ * @returns
+ */
+export function validateIdCardNo(value: string) {
+  const re = /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/
+  return re.test(value)
+}
+/**
+ *
+ * @param value 验证电话号码
+ * @returns
+ */
+export function validatePhone(value: string) {
+  const re = /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/
+  return re.test(value)
+}
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 1c2405e..bca0958 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,13 +1,46 @@
-<script lang="ts" setup name="borrowHandle">
-// 逻辑代码
+<!-- 设备借用处理 -->
+<script lang="ts" setup name="borrowApply">
+import list from './components/handleList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '待借用', comp: list },
+  { name: '已借用', comp: list },
+  { name: '已归还', comp: list },
+])
+const current = ref('待借用')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用处理
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 03d414b..c5771f7 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,13 +1,50 @@
+<!-- 设备借用申请 -->
 <script lang="ts" setup name="borrowApply">
-// 逻辑代码
+import list from './components/applyList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '全部', comp: list },
+  { name: '草稿箱', comp: list },
+  { name: '待审批', comp: list },
+  { name: '审批中', comp: list },
+  { name: '已通过', comp: list },
+  { name: '未通过', comp: list },
+  { name: '已取消', comp: list },
+])
+const current = ref('全部')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用申请
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
new file mode 100644
index 0000000..052f3ce
--- /dev/null
+++ b/src/views/device/borrow/components/applyList.vue
@@ -0,0 +1,328 @@
+<script lang="ts" setup name="borrowApplyList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '文件号',
+    value: 'fileNo',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '类别',
+    value: 'catergory',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '李四',
+      time: '2020-12-14 00:00:00',
+      status: '未通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const approveRef = ref()
+// 同意
+const agree = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '1',
+  })
+}
+// 驳回
+const reject = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '3',
+  })
+}
+// 拒绝
+const refuse = (row: any) => {
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
+}
+// 取消
+const cancel = (rowrow: any) => {
+  ElMessageBox.confirm(
+    '确认取消吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" @click="addBtn" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="agree(row)">
+                  同意
+                </el-button>
+                <el-button size="small" type="primary" link @click="reject(row)">
+                  驳回
+                </el-button>
+                <el-button size="small" type="primary" link @click="refuse(row)">
+                  拒绝
+                </el-button>
+                <el-button size="small" type="primary" link @click="cancel(row)">
+                  取消
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/components/approvalActionDialog.vue b/src/views/device/borrow/components/approvalActionDialog.vue
new file mode 100644
index 0000000..214876c
--- /dev/null
+++ b/src/views/device/borrow/components/approvalActionDialog.vue
@@ -0,0 +1,104 @@
+<!-- 审批操作弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
+const dialogVisibleApprove = ref(false)
+const form = reactive({
+  radio: '1',
+})
+const ruleFormRef = ref<FormInstance>()
+const rules = reactive<FormRules>({
+})
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const approvetime = ref('') // 审批时间
+const initDialog = (row: any) => {
+  dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
+}
+defineExpose({ initDialog })
+
+// 点击保存
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      dialogVisibleApprove.value = false
+      emits('resetData')
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  formEl.resetFields()
+  dialogVisibleApprove.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
+    <el-form
+      ref="ruleFormRef" :model="form"
+      :rules="rules" label-width="110px"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人">
+            <el-input disabled :value="userInfo.$state.name" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间">
+            <el-input disabled :value="approvetime" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
+        <el-button @click="resetForm(ruleFormRef)">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
new file mode 100644
index 0000000..cfda00a
--- /dev/null
+++ b/src/views/device/borrow/components/handleList.vue
@@ -0,0 +1,281 @@
+<script lang="ts" setup name="borrowHandleList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '申请编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'dept',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      dept: '顶级',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      dept: '徐州分中心',
+      user: '里斯',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+const borrow = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="borrow(row)">
+                  借用
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/addRow.vue b/src/views/device/standingBook/components/addRow.vue
index 1678cdb..07b03d1 100644
--- a/src/views/device/standingBook/components/addRow.vue
+++ b/src/views/device/standingBook/components/addRow.vue
@@ -5,7 +5,7 @@
 import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
+const formLabelWidth = '110px'
 const form = ref({})
 const formTable = ref([
   {
@@ -91,108 +91,188 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`">
+  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
     >
       <div v-if="name === '周检记录'">
-        <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录表编号" />
-        </el-form-item>
-        <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录人" />
-        </el-form-item>
-        <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="检定日期"
-          />
-        </el-form-item>
-        <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="有效日期"
-          />
-        </el-form-item>
-        <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="送检人" />
-        </el-form-item>
-        <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录表编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="检定日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="有效日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="送检人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '状态变更记录'">
-        <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="状态类型" clearable>
-            <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="结束日期"
-          />
-        </el-form-item>
-        <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="申请人" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="状态类型" clearable style="width: 100%;">
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="申请人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '使用记录'">
-        <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用人" />
-        </el-form-item>
-        <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用部门" />
-        </el-form-item>
-        <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="使用类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用结束日期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用部门" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="使用类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '检定证书'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="证书类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书出具日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书有效期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
     </el-form>
     <template #footer>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 5f7b347..9a9f798 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -352,7 +352,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -376,7 +376,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -391,7 +391,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -404,14 +404,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -434,7 +434,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -443,20 +443,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -480,23 +480,23 @@
               <com-tree-select
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -507,10 +507,10 @@
             <el-form-item label="检定部门" prop="mesureDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -520,7 +520,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -529,13 +529,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -544,21 +544,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -578,14 +578,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -594,14 +594,14 @@
         <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-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -669,7 +669,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index fc3fd54..d9d4514 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -199,6 +199,8 @@
     useDeptList.value = toTreeList(res.data, '0', true)
   })
 }
+const selectTreeRef1 = ref()
+const selectTreeRef2 = ref()
 // 重置
 const resetDATA = () => {
   ruleForm.value = {
@@ -254,6 +256,10 @@
     isStandardSupportEquipment: '', //		是否标准配套设备
     id: '',
   }
+  if (title.value !== '详情') {
+    selectTreeRef1.value.clearSelected()
+    selectTreeRef2.value.clearSelected()
+  }
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
@@ -378,7 +384,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -402,7 +408,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -416,8 +422,7 @@
             <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"
+                :placeholder="title === '详情' ? '' : '出厂年月'" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -430,14 +435,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -460,7 +465,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -469,20 +474,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -505,24 +510,26 @@
             <el-form-item label="使用部门" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
+                ref="selectTreeRef2"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -536,10 +543,12 @@
               </el-select> -->
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                ref="selectTreeRef1"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -549,7 +558,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -558,13 +567,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -573,21 +582,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -607,14 +616,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -624,14 +633,14 @@
           <el-col :span="6">
             <el-form-item label="资本来源" prop="capitalSource">
               <!-- <el-input v-model.trim="ruleForm.capitalSource" placeholder="资本来源" :disabled="title === '详情'" /> -->
-              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -699,7 +708,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f653095..f4229a6 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -147,19 +147,17 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
-  setTimeout(() => {
-    list.value = [
-      {
-        equipmentNo: 123,
-        equipmentName: 'test',
-        modelNo: '001',
-        usePersonName: '张三',
-        validDate: '2022-12-12 00:00:00',
-        useDeptName: '顶级',
-      },
-    ]
-    total.value = 1
-  }, 1000)
+  list.value = [
+    {
+      equipmentNo: 123,
+      equipmentName: 'test',
+      modelNo: '001',
+      usePersonName: '张三',
+      validDate: '2022-12-12 00:00:00',
+      useDeptName: '顶级',
+    },
+  ] as any
+  total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -220,9 +218,11 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -300,13 +300,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.mesureType" class="m-2 normal-select" placeholder="检定方式" clearable>
+          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable>
             <el-option
               v-for="item in mesureTypeList"
               :key="item.id"
@@ -316,7 +316,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.managerState" class="m-2 normal-select" placeholder="管理状态" clearable>
+          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable>
             <el-option
               v-for="item in managerStateList"
               :key="item.id"
@@ -327,8 +327,9 @@
         </search-item>
         <search-item>
           <com-tree-select
+            ref="selectTreeRef"
             v-model="searchQuery.useDept" :options="useDeptList" placeholder="使用部门"
-            :tree-props="deptProps" style="width: 150px;"
+            :tree-props="deptProps"
           />
         </search-item>
         <search-item>
@@ -336,11 +337,10 @@
             v-model="searchQuery.validDate" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="有效日期"
             class="normal-date"
-            style="width: 150px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.abc" class="m-2 normal-select" placeholder="ABC" clearable>
+          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable>
             <el-option
               v-for="item in abcList"
               :key="item.id"
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 78a3800..4c31a94 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -2,9 +2,10 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/fixedAssetsAdd.vue'
-import type { fixedAssetsType } from './standingBook-interface'
+import type { fixedAssetsType, selectType } from './standingBook-interface'
 import { exportFile } from '@/utils/exportUtils'
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
+import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   assetNo: '', // 固定编号
@@ -50,7 +51,7 @@
   },
   {
     text: '设备类型',
-    value: 'assetTypeName',
+    value: 'equipmentTypeName',
     width: '150',
     align: 'center',
   },
@@ -102,6 +103,7 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+const equipmentCategoryList = ref<selectType[]>([]) // 设备类别
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
@@ -242,6 +244,10 @@
 }
 onMounted(() => {
   getList()
+  // 获取设备类别
+  getDictByCode('equipmentCategory').then((response) => {
+    equipmentCategoryList.value = response.data
+  })
 })
 </script>
 
@@ -265,7 +271,10 @@
           <el-input v-model="searchQuery.equipmentSpecifications" placeholder="设备规格" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-select v-model="searchQuery.equipmentCategory" placeholder="设备类别" clearable>
+            <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+          </el-select>
         </search-item>
       </search-area>
       <table-container>
diff --git a/src/views/device/stateManage/components/addRow.vue b/src/views/device/stateManage/components/addRow.vue
new file mode 100644
index 0000000..3ba82d6
--- /dev/null
+++ b/src/views/device/stateManage/components/addRow.vue
@@ -0,0 +1,160 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { listPageApi } from '@/api/device/standingBook'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  limit: 10,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '出厂编号',
+    value: 'manufacturingNo',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+  },
+])
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listPageApi(listQuery.value as any).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map(item => ({ ...item, checked: '' }))
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    equipmentName: '', // 姓名
+    equipmentNo: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const checkedArr = list.value.filter(item => item.checked !== '')
+  if (checkedArr.length) {
+    console.log(checkedArr, '选中的设备')
+    emits('add', checkedArr)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择设备')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns as any" :query="listQuery"
+        :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-checkbox v-model="scope.row.checked" :label="scope.$index" size="large" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-checkbox__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index 56417d6..214876c 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -47,38 +47,45 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="30%">
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
-      :rules="rules"
+      :rules="rules" label-width="110px"
     >
-      <el-form-item label="审批意见">
-        <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
-        <el-radio-group v-model="form.radio">
-          <el-radio label="1">
-            同意
-          </el-radio>
-          <el-radio label="2">
-            拒绝
-          </el-radio>
-          <el-radio label="3">
-            驳回
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="审批结论">
-        <el-input
-          :rows="4"
-          type="textarea"
-        />
-      </el-form-item>
       <el-row :gutter="24">
-        <el-col :span="10">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="审批人">
             <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
-        <el-col :span="14">
+        <el-col :span="12">
           <el-form-item label="审批时间">
             <el-input disabled :value="approvetime" />
           </el-form-item>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index e74d70e..2003e31 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -1,7 +1,8 @@
 <!-- 新增或详情弹窗 -->
-<script lang="ts" setup name="addNotice">
+<script lang="ts" setup name="add">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
+import addRow from './addRow.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
@@ -16,6 +17,7 @@
 const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const name = ref('')
+const borrowList = ref([])
 const ruleForm = ref({
   assetNo: '', // 资产编号
   assetType: '', // 资产类型
@@ -357,10 +359,86 @@
     isShowCalibration.value = true
   }
 })
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerLevelName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+  },
+])
+const addRowRef = ref()
+// 添加行
+const addRowBtn = () => {
+  addRowRef.value.initDialog({ title: '添加' })
+}
+// 删除行
+const removeRowBtn = () => {
+  const removeArr = borrowList.value.filter(item => item.remove !== '')
+  if (removeArr.length) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      borrowList.value = borrowList.value.filter(item => item.remove === '')
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 借用设备列表添加
+const addRowMethods = (row) => {
+  row.forEach((element) => {
+    borrowList.value.push({ ...element, remove: '' })
+  })
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
     <detail-page :title="`${name}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
@@ -378,15 +456,16 @@
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder="">
+              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -430,7 +509,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -454,28 +533,56 @@
         </el-row>
       </el-form>
     </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>
+    <div>
+      <detail-block title="借用设备列表">
+        <template #btns>
+          <el-button type="primary" @click="addRowBtn">
+            添加行
+          </el-button>
+          <el-button type="info" @click="removeRowBtn">
+            删除行
+          </el-button>
+        </template>
+        <normal-table
+          :data="borrowList" :total="1" :columns="columns as any"
+        >
+          <template #preColumns>
+            <el-table-column label="选择" width="55" align="center">
+              <template #default="scope">
+                <el-checkbox v-model="scope.row.remove" :label="scope.$index" size="large" />
+              </template>
+            </el-table-column>
+            <el-table-column label="序号" width="60" align="center">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </detail-block>
+      <detail-block 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>
+    </div>
   </app-container>
 </template>
 
@@ -484,6 +591,10 @@
   background-color: #fff;
 }
 
+:deep(.el-checkbox__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,
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index aaaaf61..d588b8d 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,6 +1,7 @@
 <script lang="ts" setup name="bench">
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
+import type { trainLogStatistic } from './bench-interface'
 import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
 import { getPlanList } from '@/api/system/plan'
 import { listPageApi } from '@/api/measure/file'
@@ -132,15 +133,19 @@
     account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
+    const result: trainLogStatistic = res.data
+    const notQualified: number = Number(result.trainCount) - result.qualifiedCount
+    const qualifiedRate = ((result.qualifiedCount / result.trainCount) * 100).toFixed(2) // 合格率
+    const notQualifiedRate = ((notQualified / result.trainCount) * 100).toFixed(2) // 不合格率
     TrainLogSList.value = [
-      { name: `合格     ${res.data.qualified}-${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
-      { name: `不合格   ${res.data.notQualified}- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+      { name: `合   格   ${result.qualifiedCount}-${qualifiedRate}%`, value: result.qualifiedCount },
+      { name: `不合格   ${notQualified}- ${notQualifiedRate}%`, value: notQualified },
     ]
     TrainLogTitle.value = res.data.trainCount
   }).catch((_) => {
     // 处理异常
     TrainLogSList.value = [
-      { name: '合格     0 - 50%', value: 0 },
+      { name: '合   格   0 - 50%', value: 0 },
       { name: '不合格   0 - 50%', value: 0 },
     ]
     TrainLogTitle.value = 0
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 9ef0b93..1ad577b 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -270,7 +270,7 @@
               <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="6">
             <el-form-item label="名称" prop="fileName">
               <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
             </el-form-item>
@@ -279,13 +279,14 @@
         <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" class="fill-input" disabled>
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled style="width: 100%;">
                 <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="请选择发布单位"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -295,6 +296,7 @@
                 v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -311,12 +313,13 @@
                 v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人" prop="createUserId">
-              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index b45fbc3..542b284 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -26,7 +26,7 @@
   createUser: '', // 创建人
   createTime: '', // 创建
   approvalStatus: props.value, // 审批状态
-  limit: 10,
+  limit: 20,
   offset: 1,
   fileType: '', // 类型
   formId: '',
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 7d4724b..e54ddf5 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -26,7 +26,7 @@
   fileCode: '', // 文件号
   effectiveTime: '', // 实施时间
   effectiveStatus: '', // 实施状态
-  limit: 10,
+  limit: 20,
   offset: 1,
   fileType: '', // 类型
 }) // 查询参数
@@ -75,13 +75,19 @@
 const getStatus = () => {
   getDictByCode('effectiveStatus').then((res) => {
     if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
+      effectiveStatusSelect.value = [...res.data, { name: '全部', value: '', id: 'quanbu' }]
     }
   })
 }
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.publishTime) {
+    searchQuery.publishTime = ''
+  }
+  if (!searchQuery.effectiveTime) {
+    searchQuery.effectiveTime = ''
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -252,13 +258,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" />
         </search-item>
         <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
@@ -274,20 +280,16 @@
           <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: 185px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
             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: 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" placeholder="实施状态" clearable>
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index 5ca3275..a95c665 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -505,21 +505,21 @@
         <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] === '详情'" @change="directorChange">
+              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;" @change="directorChange">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.name" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
-              <el-select v-model="ruleForm.technologyJob" :placeholder="title.split('-')[2] === '详情' ? '' : '技术职务'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.technologyJob" :placeholder="title.split('-')[2] === '详情' ? '' : '技术职务'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;">
                 <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="administrationJob">
-              <el-select v-model="ruleForm.administrationJob" :placeholder="title.split('-')[2] === '详情' ? '' : '行政职务'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.administrationJob" :placeholder="title.split('-')[2] === '详情' ? '' : '行政职务'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>

diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index bb58885..2959118 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -53,3 +53,64 @@
   }
   return true
 }
+
+/**
+ * 验证小写字母
+ * @param str
+ * @returns
+ */
+export function validateLowerCase(str: string) {
+  const reg = /^[a-z]+$/
+  return reg.test(str)
+}
+
+/* 验证大写字母 */
+export function validateUpperCase(str: string) {
+  const reg = /^[A-Z]+$/
+  return reg.test(str)
+}
+
+/* 验证大小写字母 */
+export function validateAlphabets(str: string) {
+  const reg = /^[A-Za-z]+$/
+  return reg.test(str)
+}
+
+/**
+ * 验证邮箱
+ * @param email
+ * @returns {boolean}
+ */
+export function validateEmail(email: string) {
+  const re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
+  return re.test(email)
+}
+
+/**
+ * 验证手机号
+ * @param phone
+ * @returns {boolean}
+ */
+export function validateMobile(phone: string) {
+  const re = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/
+  return re.test(phone)
+}
+
+/**
+ * 校验身份证号
+ * @param value
+ * @returns
+ */
+export function validateIdCardNo(value: string) {
+  const re = /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/
+  return re.test(value)
+}
+/**
+ *
+ * @param value 验证电话号码
+ * @returns
+ */
+export function validatePhone(value: string) {
+  const re = /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/
+  return re.test(value)
+}
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 1c2405e..bca0958 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,13 +1,46 @@
-<script lang="ts" setup name="borrowHandle">
-// 逻辑代码
+<!-- 设备借用处理 -->
+<script lang="ts" setup name="borrowApply">
+import list from './components/handleList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '待借用', comp: list },
+  { name: '已借用', comp: list },
+  { name: '已归还', comp: list },
+])
+const current = ref('待借用')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用处理
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 03d414b..c5771f7 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,13 +1,50 @@
+<!-- 设备借用申请 -->
 <script lang="ts" setup name="borrowApply">
-// 逻辑代码
+import list from './components/applyList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '全部', comp: list },
+  { name: '草稿箱', comp: list },
+  { name: '待审批', comp: list },
+  { name: '审批中', comp: list },
+  { name: '已通过', comp: list },
+  { name: '未通过', comp: list },
+  { name: '已取消', comp: list },
+])
+const current = ref('全部')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用申请
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
new file mode 100644
index 0000000..052f3ce
--- /dev/null
+++ b/src/views/device/borrow/components/applyList.vue
@@ -0,0 +1,328 @@
+<script lang="ts" setup name="borrowApplyList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '文件号',
+    value: 'fileNo',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '类别',
+    value: 'catergory',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '李四',
+      time: '2020-12-14 00:00:00',
+      status: '未通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const approveRef = ref()
+// 同意
+const agree = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '1',
+  })
+}
+// 驳回
+const reject = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '3',
+  })
+}
+// 拒绝
+const refuse = (row: any) => {
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
+}
+// 取消
+const cancel = (rowrow: any) => {
+  ElMessageBox.confirm(
+    '确认取消吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" @click="addBtn" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="agree(row)">
+                  同意
+                </el-button>
+                <el-button size="small" type="primary" link @click="reject(row)">
+                  驳回
+                </el-button>
+                <el-button size="small" type="primary" link @click="refuse(row)">
+                  拒绝
+                </el-button>
+                <el-button size="small" type="primary" link @click="cancel(row)">
+                  取消
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/components/approvalActionDialog.vue b/src/views/device/borrow/components/approvalActionDialog.vue
new file mode 100644
index 0000000..214876c
--- /dev/null
+++ b/src/views/device/borrow/components/approvalActionDialog.vue
@@ -0,0 +1,104 @@
+<!-- 审批操作弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
+const dialogVisibleApprove = ref(false)
+const form = reactive({
+  radio: '1',
+})
+const ruleFormRef = ref<FormInstance>()
+const rules = reactive<FormRules>({
+})
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const approvetime = ref('') // 审批时间
+const initDialog = (row: any) => {
+  dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
+}
+defineExpose({ initDialog })
+
+// 点击保存
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      dialogVisibleApprove.value = false
+      emits('resetData')
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  formEl.resetFields()
+  dialogVisibleApprove.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
+    <el-form
+      ref="ruleFormRef" :model="form"
+      :rules="rules" label-width="110px"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人">
+            <el-input disabled :value="userInfo.$state.name" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间">
+            <el-input disabled :value="approvetime" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
+        <el-button @click="resetForm(ruleFormRef)">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
new file mode 100644
index 0000000..cfda00a
--- /dev/null
+++ b/src/views/device/borrow/components/handleList.vue
@@ -0,0 +1,281 @@
+<script lang="ts" setup name="borrowHandleList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '申请编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'dept',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      dept: '顶级',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      dept: '徐州分中心',
+      user: '里斯',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+const borrow = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="borrow(row)">
+                  借用
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/addRow.vue b/src/views/device/standingBook/components/addRow.vue
index 1678cdb..07b03d1 100644
--- a/src/views/device/standingBook/components/addRow.vue
+++ b/src/views/device/standingBook/components/addRow.vue
@@ -5,7 +5,7 @@
 import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
+const formLabelWidth = '110px'
 const form = ref({})
 const formTable = ref([
   {
@@ -91,108 +91,188 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`">
+  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
     >
       <div v-if="name === '周检记录'">
-        <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录表编号" />
-        </el-form-item>
-        <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录人" />
-        </el-form-item>
-        <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="检定日期"
-          />
-        </el-form-item>
-        <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="有效日期"
-          />
-        </el-form-item>
-        <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="送检人" />
-        </el-form-item>
-        <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录表编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="检定日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="有效日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="送检人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '状态变更记录'">
-        <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="状态类型" clearable>
-            <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="结束日期"
-          />
-        </el-form-item>
-        <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="申请人" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="状态类型" clearable style="width: 100%;">
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="申请人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '使用记录'">
-        <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用人" />
-        </el-form-item>
-        <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用部门" />
-        </el-form-item>
-        <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="使用类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用结束日期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用部门" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="使用类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '检定证书'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="证书类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书出具日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书有效期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
     </el-form>
     <template #footer>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 5f7b347..9a9f798 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -352,7 +352,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -376,7 +376,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -391,7 +391,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -404,14 +404,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -434,7 +434,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -443,20 +443,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -480,23 +480,23 @@
               <com-tree-select
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -507,10 +507,10 @@
             <el-form-item label="检定部门" prop="mesureDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -520,7 +520,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -529,13 +529,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -544,21 +544,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -578,14 +578,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -594,14 +594,14 @@
         <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-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -669,7 +669,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index fc3fd54..d9d4514 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -199,6 +199,8 @@
     useDeptList.value = toTreeList(res.data, '0', true)
   })
 }
+const selectTreeRef1 = ref()
+const selectTreeRef2 = ref()
 // 重置
 const resetDATA = () => {
   ruleForm.value = {
@@ -254,6 +256,10 @@
     isStandardSupportEquipment: '', //		是否标准配套设备
     id: '',
   }
+  if (title.value !== '详情') {
+    selectTreeRef1.value.clearSelected()
+    selectTreeRef2.value.clearSelected()
+  }
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
@@ -378,7 +384,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -402,7 +408,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -416,8 +422,7 @@
             <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"
+                :placeholder="title === '详情' ? '' : '出厂年月'" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -430,14 +435,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -460,7 +465,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -469,20 +474,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -505,24 +510,26 @@
             <el-form-item label="使用部门" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
+                ref="selectTreeRef2"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -536,10 +543,12 @@
               </el-select> -->
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                ref="selectTreeRef1"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -549,7 +558,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -558,13 +567,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -573,21 +582,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -607,14 +616,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -624,14 +633,14 @@
           <el-col :span="6">
             <el-form-item label="资本来源" prop="capitalSource">
               <!-- <el-input v-model.trim="ruleForm.capitalSource" placeholder="资本来源" :disabled="title === '详情'" /> -->
-              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -699,7 +708,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f653095..f4229a6 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -147,19 +147,17 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
-  setTimeout(() => {
-    list.value = [
-      {
-        equipmentNo: 123,
-        equipmentName: 'test',
-        modelNo: '001',
-        usePersonName: '张三',
-        validDate: '2022-12-12 00:00:00',
-        useDeptName: '顶级',
-      },
-    ]
-    total.value = 1
-  }, 1000)
+  list.value = [
+    {
+      equipmentNo: 123,
+      equipmentName: 'test',
+      modelNo: '001',
+      usePersonName: '张三',
+      validDate: '2022-12-12 00:00:00',
+      useDeptName: '顶级',
+    },
+  ] as any
+  total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -220,9 +218,11 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -300,13 +300,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.mesureType" class="m-2 normal-select" placeholder="检定方式" clearable>
+          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable>
             <el-option
               v-for="item in mesureTypeList"
               :key="item.id"
@@ -316,7 +316,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.managerState" class="m-2 normal-select" placeholder="管理状态" clearable>
+          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable>
             <el-option
               v-for="item in managerStateList"
               :key="item.id"
@@ -327,8 +327,9 @@
         </search-item>
         <search-item>
           <com-tree-select
+            ref="selectTreeRef"
             v-model="searchQuery.useDept" :options="useDeptList" placeholder="使用部门"
-            :tree-props="deptProps" style="width: 150px;"
+            :tree-props="deptProps"
           />
         </search-item>
         <search-item>
@@ -336,11 +337,10 @@
             v-model="searchQuery.validDate" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="有效日期"
             class="normal-date"
-            style="width: 150px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.abc" class="m-2 normal-select" placeholder="ABC" clearable>
+          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable>
             <el-option
               v-for="item in abcList"
               :key="item.id"
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 78a3800..4c31a94 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -2,9 +2,10 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/fixedAssetsAdd.vue'
-import type { fixedAssetsType } from './standingBook-interface'
+import type { fixedAssetsType, selectType } from './standingBook-interface'
 import { exportFile } from '@/utils/exportUtils'
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
+import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   assetNo: '', // 固定编号
@@ -50,7 +51,7 @@
   },
   {
     text: '设备类型',
-    value: 'assetTypeName',
+    value: 'equipmentTypeName',
     width: '150',
     align: 'center',
   },
@@ -102,6 +103,7 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+const equipmentCategoryList = ref<selectType[]>([]) // 设备类别
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
@@ -242,6 +244,10 @@
 }
 onMounted(() => {
   getList()
+  // 获取设备类别
+  getDictByCode('equipmentCategory').then((response) => {
+    equipmentCategoryList.value = response.data
+  })
 })
 </script>
 
@@ -265,7 +271,10 @@
           <el-input v-model="searchQuery.equipmentSpecifications" placeholder="设备规格" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-select v-model="searchQuery.equipmentCategory" placeholder="设备类别" clearable>
+            <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+          </el-select>
         </search-item>
       </search-area>
       <table-container>
diff --git a/src/views/device/stateManage/components/addRow.vue b/src/views/device/stateManage/components/addRow.vue
new file mode 100644
index 0000000..3ba82d6
--- /dev/null
+++ b/src/views/device/stateManage/components/addRow.vue
@@ -0,0 +1,160 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { listPageApi } from '@/api/device/standingBook'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  limit: 10,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '出厂编号',
+    value: 'manufacturingNo',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+  },
+])
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listPageApi(listQuery.value as any).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map(item => ({ ...item, checked: '' }))
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    equipmentName: '', // 姓名
+    equipmentNo: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const checkedArr = list.value.filter(item => item.checked !== '')
+  if (checkedArr.length) {
+    console.log(checkedArr, '选中的设备')
+    emits('add', checkedArr)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择设备')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns as any" :query="listQuery"
+        :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-checkbox v-model="scope.row.checked" :label="scope.$index" size="large" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-checkbox__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index 56417d6..214876c 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -47,38 +47,45 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="30%">
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
-      :rules="rules"
+      :rules="rules" label-width="110px"
     >
-      <el-form-item label="审批意见">
-        <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
-        <el-radio-group v-model="form.radio">
-          <el-radio label="1">
-            同意
-          </el-radio>
-          <el-radio label="2">
-            拒绝
-          </el-radio>
-          <el-radio label="3">
-            驳回
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="审批结论">
-        <el-input
-          :rows="4"
-          type="textarea"
-        />
-      </el-form-item>
       <el-row :gutter="24">
-        <el-col :span="10">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="审批人">
             <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
-        <el-col :span="14">
+        <el-col :span="12">
           <el-form-item label="审批时间">
             <el-input disabled :value="approvetime" />
           </el-form-item>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index e74d70e..2003e31 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -1,7 +1,8 @@
 <!-- 新增或详情弹窗 -->
-<script lang="ts" setup name="addNotice">
+<script lang="ts" setup name="add">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
+import addRow from './addRow.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
@@ -16,6 +17,7 @@
 const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const name = ref('')
+const borrowList = ref([])
 const ruleForm = ref({
   assetNo: '', // 资产编号
   assetType: '', // 资产类型
@@ -357,10 +359,86 @@
     isShowCalibration.value = true
   }
 })
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerLevelName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+  },
+])
+const addRowRef = ref()
+// 添加行
+const addRowBtn = () => {
+  addRowRef.value.initDialog({ title: '添加' })
+}
+// 删除行
+const removeRowBtn = () => {
+  const removeArr = borrowList.value.filter(item => item.remove !== '')
+  if (removeArr.length) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      borrowList.value = borrowList.value.filter(item => item.remove === '')
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 借用设备列表添加
+const addRowMethods = (row) => {
+  row.forEach((element) => {
+    borrowList.value.push({ ...element, remove: '' })
+  })
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
     <detail-page :title="`${name}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
@@ -378,15 +456,16 @@
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder="">
+              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -430,7 +509,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -454,28 +533,56 @@
         </el-row>
       </el-form>
     </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>
+    <div>
+      <detail-block title="借用设备列表">
+        <template #btns>
+          <el-button type="primary" @click="addRowBtn">
+            添加行
+          </el-button>
+          <el-button type="info" @click="removeRowBtn">
+            删除行
+          </el-button>
+        </template>
+        <normal-table
+          :data="borrowList" :total="1" :columns="columns as any"
+        >
+          <template #preColumns>
+            <el-table-column label="选择" width="55" align="center">
+              <template #default="scope">
+                <el-checkbox v-model="scope.row.remove" :label="scope.$index" size="large" />
+              </template>
+            </el-table-column>
+            <el-table-column label="序号" width="60" align="center">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </detail-block>
+      <detail-block 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>
+    </div>
   </app-container>
 </template>
 
@@ -484,6 +591,10 @@
   background-color: #fff;
 }
 
+:deep(.el-checkbox__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,
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index aaaaf61..d588b8d 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,6 +1,7 @@
 <script lang="ts" setup name="bench">
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
+import type { trainLogStatistic } from './bench-interface'
 import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
 import { getPlanList } from '@/api/system/plan'
 import { listPageApi } from '@/api/measure/file'
@@ -132,15 +133,19 @@
     account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
+    const result: trainLogStatistic = res.data
+    const notQualified: number = Number(result.trainCount) - result.qualifiedCount
+    const qualifiedRate = ((result.qualifiedCount / result.trainCount) * 100).toFixed(2) // 合格率
+    const notQualifiedRate = ((notQualified / result.trainCount) * 100).toFixed(2) // 不合格率
     TrainLogSList.value = [
-      { name: `合格     ${res.data.qualified}-${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
-      { name: `不合格   ${res.data.notQualified}- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+      { name: `合   格   ${result.qualifiedCount}-${qualifiedRate}%`, value: result.qualifiedCount },
+      { name: `不合格   ${notQualified}- ${notQualifiedRate}%`, value: notQualified },
     ]
     TrainLogTitle.value = res.data.trainCount
   }).catch((_) => {
     // 处理异常
     TrainLogSList.value = [
-      { name: '合格     0 - 50%', value: 0 },
+      { name: '合   格   0 - 50%', value: 0 },
       { name: '不合格   0 - 50%', value: 0 },
     ]
     TrainLogTitle.value = 0
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 9ef0b93..1ad577b 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -270,7 +270,7 @@
               <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="6">
             <el-form-item label="名称" prop="fileName">
               <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
             </el-form-item>
@@ -279,13 +279,14 @@
         <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" class="fill-input" disabled>
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled style="width: 100%;">
                 <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="请选择发布单位"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -295,6 +296,7 @@
                 v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -311,12 +313,13 @@
                 v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人" prop="createUserId">
-              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index b45fbc3..542b284 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -26,7 +26,7 @@
   createUser: '', // 创建人
   createTime: '', // 创建
   approvalStatus: props.value, // 审批状态
-  limit: 10,
+  limit: 20,
   offset: 1,
   fileType: '', // 类型
   formId: '',
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 7d4724b..e54ddf5 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -26,7 +26,7 @@
   fileCode: '', // 文件号
   effectiveTime: '', // 实施时间
   effectiveStatus: '', // 实施状态
-  limit: 10,
+  limit: 20,
   offset: 1,
   fileType: '', // 类型
 }) // 查询参数
@@ -75,13 +75,19 @@
 const getStatus = () => {
   getDictByCode('effectiveStatus').then((res) => {
     if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
+      effectiveStatusSelect.value = [...res.data, { name: '全部', value: '', id: 'quanbu' }]
     }
   })
 }
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.publishTime) {
+    searchQuery.publishTime = ''
+  }
+  if (!searchQuery.effectiveTime) {
+    searchQuery.effectiveTime = ''
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -252,13 +258,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" />
         </search-item>
         <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
@@ -274,20 +280,16 @@
           <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: 185px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
             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: 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" placeholder="实施状态" clearable>
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index 5ca3275..a95c665 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -505,21 +505,21 @@
         <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] === '详情'" @change="directorChange">
+              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;" @change="directorChange">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.name" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
-              <el-select v-model="ruleForm.technologyJob" :placeholder="title.split('-')[2] === '详情' ? '' : '技术职务'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.technologyJob" :placeholder="title.split('-')[2] === '详情' ? '' : '技术职务'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;">
                 <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="administrationJob">
-              <el-select v-model="ruleForm.administrationJob" :placeholder="title.split('-')[2] === '详情' ? '' : '行政职务'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.administrationJob" :placeholder="title.split('-')[2] === '详情' ? '' : '行政职务'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index aac1ef2..11d6d0a 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -22,7 +22,7 @@
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
-  limit: 10,
+  limit: 20,
   offset: 1,
   organizeType: '', // 类型
   createTime: '', // 创建时间
@@ -118,6 +118,9 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.createTime) {
+    searchQuery.createTime = ''
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows.map(item => ({ ...item, createTime: item.createTime.split(' ')[0] }))

diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index bb58885..2959118 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -53,3 +53,64 @@
   }
   return true
 }
+
+/**
+ * 验证小写字母
+ * @param str
+ * @returns
+ */
+export function validateLowerCase(str: string) {
+  const reg = /^[a-z]+$/
+  return reg.test(str)
+}
+
+/* 验证大写字母 */
+export function validateUpperCase(str: string) {
+  const reg = /^[A-Z]+$/
+  return reg.test(str)
+}
+
+/* 验证大小写字母 */
+export function validateAlphabets(str: string) {
+  const reg = /^[A-Za-z]+$/
+  return reg.test(str)
+}
+
+/**
+ * 验证邮箱
+ * @param email
+ * @returns {boolean}
+ */
+export function validateEmail(email: string) {
+  const re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
+  return re.test(email)
+}
+
+/**
+ * 验证手机号
+ * @param phone
+ * @returns {boolean}
+ */
+export function validateMobile(phone: string) {
+  const re = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/
+  return re.test(phone)
+}
+
+/**
+ * 校验身份证号
+ * @param value
+ * @returns
+ */
+export function validateIdCardNo(value: string) {
+  const re = /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/
+  return re.test(value)
+}
+/**
+ *
+ * @param value 验证电话号码
+ * @returns
+ */
+export function validatePhone(value: string) {
+  const re = /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/
+  return re.test(value)
+}
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 1c2405e..bca0958 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,13 +1,46 @@
-<script lang="ts" setup name="borrowHandle">
-// 逻辑代码
+<!-- 设备借用处理 -->
+<script lang="ts" setup name="borrowApply">
+import list from './components/handleList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '待借用', comp: list },
+  { name: '已借用', comp: list },
+  { name: '已归还', comp: list },
+])
+const current = ref('待借用')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用处理
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 03d414b..c5771f7 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,13 +1,50 @@
+<!-- 设备借用申请 -->
 <script lang="ts" setup name="borrowApply">
-// 逻辑代码
+import list from './components/applyList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '全部', comp: list },
+  { name: '草稿箱', comp: list },
+  { name: '待审批', comp: list },
+  { name: '审批中', comp: list },
+  { name: '已通过', comp: list },
+  { name: '未通过', comp: list },
+  { name: '已取消', comp: list },
+])
+const current = ref('全部')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用申请
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
new file mode 100644
index 0000000..052f3ce
--- /dev/null
+++ b/src/views/device/borrow/components/applyList.vue
@@ -0,0 +1,328 @@
+<script lang="ts" setup name="borrowApplyList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '文件号',
+    value: 'fileNo',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '类别',
+    value: 'catergory',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '李四',
+      time: '2020-12-14 00:00:00',
+      status: '未通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const approveRef = ref()
+// 同意
+const agree = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '1',
+  })
+}
+// 驳回
+const reject = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '3',
+  })
+}
+// 拒绝
+const refuse = (row: any) => {
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
+}
+// 取消
+const cancel = (rowrow: any) => {
+  ElMessageBox.confirm(
+    '确认取消吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" @click="addBtn" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="agree(row)">
+                  同意
+                </el-button>
+                <el-button size="small" type="primary" link @click="reject(row)">
+                  驳回
+                </el-button>
+                <el-button size="small" type="primary" link @click="refuse(row)">
+                  拒绝
+                </el-button>
+                <el-button size="small" type="primary" link @click="cancel(row)">
+                  取消
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/components/approvalActionDialog.vue b/src/views/device/borrow/components/approvalActionDialog.vue
new file mode 100644
index 0000000..214876c
--- /dev/null
+++ b/src/views/device/borrow/components/approvalActionDialog.vue
@@ -0,0 +1,104 @@
+<!-- 审批操作弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
+const dialogVisibleApprove = ref(false)
+const form = reactive({
+  radio: '1',
+})
+const ruleFormRef = ref<FormInstance>()
+const rules = reactive<FormRules>({
+})
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const approvetime = ref('') // 审批时间
+const initDialog = (row: any) => {
+  dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
+}
+defineExpose({ initDialog })
+
+// 点击保存
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      dialogVisibleApprove.value = false
+      emits('resetData')
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  formEl.resetFields()
+  dialogVisibleApprove.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
+    <el-form
+      ref="ruleFormRef" :model="form"
+      :rules="rules" label-width="110px"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人">
+            <el-input disabled :value="userInfo.$state.name" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间">
+            <el-input disabled :value="approvetime" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
+        <el-button @click="resetForm(ruleFormRef)">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
new file mode 100644
index 0000000..cfda00a
--- /dev/null
+++ b/src/views/device/borrow/components/handleList.vue
@@ -0,0 +1,281 @@
+<script lang="ts" setup name="borrowHandleList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '申请编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'dept',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      dept: '顶级',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      dept: '徐州分中心',
+      user: '里斯',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+const borrow = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="borrow(row)">
+                  借用
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/addRow.vue b/src/views/device/standingBook/components/addRow.vue
index 1678cdb..07b03d1 100644
--- a/src/views/device/standingBook/components/addRow.vue
+++ b/src/views/device/standingBook/components/addRow.vue
@@ -5,7 +5,7 @@
 import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
+const formLabelWidth = '110px'
 const form = ref({})
 const formTable = ref([
   {
@@ -91,108 +91,188 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`">
+  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
     >
       <div v-if="name === '周检记录'">
-        <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录表编号" />
-        </el-form-item>
-        <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录人" />
-        </el-form-item>
-        <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="检定日期"
-          />
-        </el-form-item>
-        <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="有效日期"
-          />
-        </el-form-item>
-        <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="送检人" />
-        </el-form-item>
-        <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录表编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="检定日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="有效日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="送检人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '状态变更记录'">
-        <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="状态类型" clearable>
-            <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="结束日期"
-          />
-        </el-form-item>
-        <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="申请人" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="状态类型" clearable style="width: 100%;">
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="申请人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '使用记录'">
-        <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用人" />
-        </el-form-item>
-        <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用部门" />
-        </el-form-item>
-        <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="使用类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用结束日期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用部门" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="使用类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '检定证书'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="证书类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书出具日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书有效期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
     </el-form>
     <template #footer>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 5f7b347..9a9f798 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -352,7 +352,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -376,7 +376,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -391,7 +391,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -404,14 +404,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -434,7 +434,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -443,20 +443,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -480,23 +480,23 @@
               <com-tree-select
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -507,10 +507,10 @@
             <el-form-item label="检定部门" prop="mesureDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -520,7 +520,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -529,13 +529,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -544,21 +544,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -578,14 +578,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -594,14 +594,14 @@
         <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-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -669,7 +669,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index fc3fd54..d9d4514 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -199,6 +199,8 @@
     useDeptList.value = toTreeList(res.data, '0', true)
   })
 }
+const selectTreeRef1 = ref()
+const selectTreeRef2 = ref()
 // 重置
 const resetDATA = () => {
   ruleForm.value = {
@@ -254,6 +256,10 @@
     isStandardSupportEquipment: '', //		是否标准配套设备
     id: '',
   }
+  if (title.value !== '详情') {
+    selectTreeRef1.value.clearSelected()
+    selectTreeRef2.value.clearSelected()
+  }
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
@@ -378,7 +384,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -402,7 +408,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -416,8 +422,7 @@
             <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"
+                :placeholder="title === '详情' ? '' : '出厂年月'" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -430,14 +435,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -460,7 +465,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -469,20 +474,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -505,24 +510,26 @@
             <el-form-item label="使用部门" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
+                ref="selectTreeRef2"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -536,10 +543,12 @@
               </el-select> -->
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                ref="selectTreeRef1"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -549,7 +558,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -558,13 +567,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -573,21 +582,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -607,14 +616,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -624,14 +633,14 @@
           <el-col :span="6">
             <el-form-item label="资本来源" prop="capitalSource">
               <!-- <el-input v-model.trim="ruleForm.capitalSource" placeholder="资本来源" :disabled="title === '详情'" /> -->
-              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -699,7 +708,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f653095..f4229a6 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -147,19 +147,17 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
-  setTimeout(() => {
-    list.value = [
-      {
-        equipmentNo: 123,
-        equipmentName: 'test',
-        modelNo: '001',
-        usePersonName: '张三',
-        validDate: '2022-12-12 00:00:00',
-        useDeptName: '顶级',
-      },
-    ]
-    total.value = 1
-  }, 1000)
+  list.value = [
+    {
+      equipmentNo: 123,
+      equipmentName: 'test',
+      modelNo: '001',
+      usePersonName: '张三',
+      validDate: '2022-12-12 00:00:00',
+      useDeptName: '顶级',
+    },
+  ] as any
+  total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -220,9 +218,11 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -300,13 +300,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.mesureType" class="m-2 normal-select" placeholder="检定方式" clearable>
+          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable>
             <el-option
               v-for="item in mesureTypeList"
               :key="item.id"
@@ -316,7 +316,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.managerState" class="m-2 normal-select" placeholder="管理状态" clearable>
+          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable>
             <el-option
               v-for="item in managerStateList"
               :key="item.id"
@@ -327,8 +327,9 @@
         </search-item>
         <search-item>
           <com-tree-select
+            ref="selectTreeRef"
             v-model="searchQuery.useDept" :options="useDeptList" placeholder="使用部门"
-            :tree-props="deptProps" style="width: 150px;"
+            :tree-props="deptProps"
           />
         </search-item>
         <search-item>
@@ -336,11 +337,10 @@
             v-model="searchQuery.validDate" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="有效日期"
             class="normal-date"
-            style="width: 150px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.abc" class="m-2 normal-select" placeholder="ABC" clearable>
+          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable>
             <el-option
               v-for="item in abcList"
               :key="item.id"
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 78a3800..4c31a94 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -2,9 +2,10 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/fixedAssetsAdd.vue'
-import type { fixedAssetsType } from './standingBook-interface'
+import type { fixedAssetsType, selectType } from './standingBook-interface'
 import { exportFile } from '@/utils/exportUtils'
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
+import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   assetNo: '', // 固定编号
@@ -50,7 +51,7 @@
   },
   {
     text: '设备类型',
-    value: 'assetTypeName',
+    value: 'equipmentTypeName',
     width: '150',
     align: 'center',
   },
@@ -102,6 +103,7 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+const equipmentCategoryList = ref<selectType[]>([]) // 设备类别
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
@@ -242,6 +244,10 @@
 }
 onMounted(() => {
   getList()
+  // 获取设备类别
+  getDictByCode('equipmentCategory').then((response) => {
+    equipmentCategoryList.value = response.data
+  })
 })
 </script>
 
@@ -265,7 +271,10 @@
           <el-input v-model="searchQuery.equipmentSpecifications" placeholder="设备规格" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-select v-model="searchQuery.equipmentCategory" placeholder="设备类别" clearable>
+            <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+          </el-select>
         </search-item>
       </search-area>
       <table-container>
diff --git a/src/views/device/stateManage/components/addRow.vue b/src/views/device/stateManage/components/addRow.vue
new file mode 100644
index 0000000..3ba82d6
--- /dev/null
+++ b/src/views/device/stateManage/components/addRow.vue
@@ -0,0 +1,160 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { listPageApi } from '@/api/device/standingBook'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  limit: 10,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '出厂编号',
+    value: 'manufacturingNo',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+  },
+])
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listPageApi(listQuery.value as any).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map(item => ({ ...item, checked: '' }))
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    equipmentName: '', // 姓名
+    equipmentNo: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const checkedArr = list.value.filter(item => item.checked !== '')
+  if (checkedArr.length) {
+    console.log(checkedArr, '选中的设备')
+    emits('add', checkedArr)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择设备')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns as any" :query="listQuery"
+        :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-checkbox v-model="scope.row.checked" :label="scope.$index" size="large" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-checkbox__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index 56417d6..214876c 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -47,38 +47,45 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="30%">
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
-      :rules="rules"
+      :rules="rules" label-width="110px"
     >
-      <el-form-item label="审批意见">
-        <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
-        <el-radio-group v-model="form.radio">
-          <el-radio label="1">
-            同意
-          </el-radio>
-          <el-radio label="2">
-            拒绝
-          </el-radio>
-          <el-radio label="3">
-            驳回
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="审批结论">
-        <el-input
-          :rows="4"
-          type="textarea"
-        />
-      </el-form-item>
       <el-row :gutter="24">
-        <el-col :span="10">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="审批人">
             <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
-        <el-col :span="14">
+        <el-col :span="12">
           <el-form-item label="审批时间">
             <el-input disabled :value="approvetime" />
           </el-form-item>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index e74d70e..2003e31 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -1,7 +1,8 @@
 <!-- 新增或详情弹窗 -->
-<script lang="ts" setup name="addNotice">
+<script lang="ts" setup name="add">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
+import addRow from './addRow.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
@@ -16,6 +17,7 @@
 const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const name = ref('')
+const borrowList = ref([])
 const ruleForm = ref({
   assetNo: '', // 资产编号
   assetType: '', // 资产类型
@@ -357,10 +359,86 @@
     isShowCalibration.value = true
   }
 })
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerLevelName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+  },
+])
+const addRowRef = ref()
+// 添加行
+const addRowBtn = () => {
+  addRowRef.value.initDialog({ title: '添加' })
+}
+// 删除行
+const removeRowBtn = () => {
+  const removeArr = borrowList.value.filter(item => item.remove !== '')
+  if (removeArr.length) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      borrowList.value = borrowList.value.filter(item => item.remove === '')
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 借用设备列表添加
+const addRowMethods = (row) => {
+  row.forEach((element) => {
+    borrowList.value.push({ ...element, remove: '' })
+  })
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
     <detail-page :title="`${name}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
@@ -378,15 +456,16 @@
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder="">
+              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -430,7 +509,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -454,28 +533,56 @@
         </el-row>
       </el-form>
     </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>
+    <div>
+      <detail-block title="借用设备列表">
+        <template #btns>
+          <el-button type="primary" @click="addRowBtn">
+            添加行
+          </el-button>
+          <el-button type="info" @click="removeRowBtn">
+            删除行
+          </el-button>
+        </template>
+        <normal-table
+          :data="borrowList" :total="1" :columns="columns as any"
+        >
+          <template #preColumns>
+            <el-table-column label="选择" width="55" align="center">
+              <template #default="scope">
+                <el-checkbox v-model="scope.row.remove" :label="scope.$index" size="large" />
+              </template>
+            </el-table-column>
+            <el-table-column label="序号" width="60" align="center">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </detail-block>
+      <detail-block 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>
+    </div>
   </app-container>
 </template>
 
@@ -484,6 +591,10 @@
   background-color: #fff;
 }
 
+:deep(.el-checkbox__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,
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index aaaaf61..d588b8d 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,6 +1,7 @@
 <script lang="ts" setup name="bench">
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
+import type { trainLogStatistic } from './bench-interface'
 import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
 import { getPlanList } from '@/api/system/plan'
 import { listPageApi } from '@/api/measure/file'
@@ -132,15 +133,19 @@
     account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
+    const result: trainLogStatistic = res.data
+    const notQualified: number = Number(result.trainCount) - result.qualifiedCount
+    const qualifiedRate = ((result.qualifiedCount / result.trainCount) * 100).toFixed(2) // 合格率
+    const notQualifiedRate = ((notQualified / result.trainCount) * 100).toFixed(2) // 不合格率
     TrainLogSList.value = [
-      { name: `合格     ${res.data.qualified}-${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
-      { name: `不合格   ${res.data.notQualified}- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+      { name: `合   格   ${result.qualifiedCount}-${qualifiedRate}%`, value: result.qualifiedCount },
+      { name: `不合格   ${notQualified}- ${notQualifiedRate}%`, value: notQualified },
     ]
     TrainLogTitle.value = res.data.trainCount
   }).catch((_) => {
     // 处理异常
     TrainLogSList.value = [
-      { name: '合格     0 - 50%', value: 0 },
+      { name: '合   格   0 - 50%', value: 0 },
       { name: '不合格   0 - 50%', value: 0 },
     ]
     TrainLogTitle.value = 0
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 9ef0b93..1ad577b 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -270,7 +270,7 @@
               <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="6">
             <el-form-item label="名称" prop="fileName">
               <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
             </el-form-item>
@@ -279,13 +279,14 @@
         <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" class="fill-input" disabled>
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled style="width: 100%;">
                 <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="请选择发布单位"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -295,6 +296,7 @@
                 v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -311,12 +313,13 @@
                 v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人" prop="createUserId">
-              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index b45fbc3..542b284 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -26,7 +26,7 @@
   createUser: '', // 创建人
   createTime: '', // 创建
   approvalStatus: props.value, // 审批状态
-  limit: 10,
+  limit: 20,
   offset: 1,
   fileType: '', // 类型
   formId: '',
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 7d4724b..e54ddf5 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -26,7 +26,7 @@
   fileCode: '', // 文件号
   effectiveTime: '', // 实施时间
   effectiveStatus: '', // 实施状态
-  limit: 10,
+  limit: 20,
   offset: 1,
   fileType: '', // 类型
 }) // 查询参数
@@ -75,13 +75,19 @@
 const getStatus = () => {
   getDictByCode('effectiveStatus').then((res) => {
     if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
+      effectiveStatusSelect.value = [...res.data, { name: '全部', value: '', id: 'quanbu' }]
     }
   })
 }
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.publishTime) {
+    searchQuery.publishTime = ''
+  }
+  if (!searchQuery.effectiveTime) {
+    searchQuery.effectiveTime = ''
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -252,13 +258,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" />
         </search-item>
         <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
@@ -274,20 +280,16 @@
           <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: 185px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
             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: 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" placeholder="实施状态" clearable>
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index 5ca3275..a95c665 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -505,21 +505,21 @@
         <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] === '详情'" @change="directorChange">
+              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;" @change="directorChange">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.name" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
-              <el-select v-model="ruleForm.technologyJob" :placeholder="title.split('-')[2] === '详情' ? '' : '技术职务'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.technologyJob" :placeholder="title.split('-')[2] === '详情' ? '' : '技术职务'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;">
                 <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="administrationJob">
-              <el-select v-model="ruleForm.administrationJob" :placeholder="title.split('-')[2] === '详情' ? '' : '行政职务'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.administrationJob" :placeholder="title.split('-')[2] === '详情' ? '' : '行政职务'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index aac1ef2..11d6d0a 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -22,7 +22,7 @@
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
-  limit: 10,
+  limit: 20,
   offset: 1,
   organizeType: '', // 类型
   createTime: '', // 创建时间
@@ -118,6 +118,9 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.createTime) {
+    searchQuery.createTime = ''
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows.map(item => ({ ...item, createTime: item.createTime.split(' ')[0] }))
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 3f472eb..bc5d9d4 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -7,7 +7,9 @@
 // import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
-import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+// import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const props = defineProps({
   isRemind: {
     type: Boolean,
@@ -78,11 +80,14 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 // 获取所有部门
-const deptList = ref<DeptTreeNode[]>([])
+const deptList = ref([])
 const getDeptList = async () => {
   getDeptTreeList().then((res) => {
-    deptList.value = res.data
+    deptList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
@@ -177,6 +182,7 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   searchQuery.staffNo = ''
@@ -184,6 +190,7 @@
   searchQuery.deptId = ''
   searchQuery.certificateStatus = ''
   searchQuery.verifierCertificateNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -212,10 +219,6 @@
     loading.close()
   })
 }
-// 打印
-const print = () => {
-
-}
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传图片
@@ -268,20 +271,24 @@
           <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+          <!-- <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
             <el-option
               v-for="item in deptList"
               :key="item.id"
               :label="item.name"
               :value="item.id"
             />
-          </el-select>
+          </el-select> -->
+          <com-tree-select
+            ref="selectTreeRef" v-model="searchQuery.deptId" :options="deptList"
+            placeholder="工作部门" :tree-props="deptProps"
+          />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况">
+          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况" clearable>
             <el-option
               v-for="item in certificateStatusList"
               :key="item.id"

diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index bb58885..2959118 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -53,3 +53,64 @@
   }
   return true
 }
+
+/**
+ * 验证小写字母
+ * @param str
+ * @returns
+ */
+export function validateLowerCase(str: string) {
+  const reg = /^[a-z]+$/
+  return reg.test(str)
+}
+
+/* 验证大写字母 */
+export function validateUpperCase(str: string) {
+  const reg = /^[A-Z]+$/
+  return reg.test(str)
+}
+
+/* 验证大小写字母 */
+export function validateAlphabets(str: string) {
+  const reg = /^[A-Za-z]+$/
+  return reg.test(str)
+}
+
+/**
+ * 验证邮箱
+ * @param email
+ * @returns {boolean}
+ */
+export function validateEmail(email: string) {
+  const re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
+  return re.test(email)
+}
+
+/**
+ * 验证手机号
+ * @param phone
+ * @returns {boolean}
+ */
+export function validateMobile(phone: string) {
+  const re = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/
+  return re.test(phone)
+}
+
+/**
+ * 校验身份证号
+ * @param value
+ * @returns
+ */
+export function validateIdCardNo(value: string) {
+  const re = /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/
+  return re.test(value)
+}
+/**
+ *
+ * @param value 验证电话号码
+ * @returns
+ */
+export function validatePhone(value: string) {
+  const re = /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/
+  return re.test(value)
+}
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 1c2405e..bca0958 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,13 +1,46 @@
-<script lang="ts" setup name="borrowHandle">
-// 逻辑代码
+<!-- 设备借用处理 -->
+<script lang="ts" setup name="borrowApply">
+import list from './components/handleList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '待借用', comp: list },
+  { name: '已借用', comp: list },
+  { name: '已归还', comp: list },
+])
+const current = ref('待借用')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用处理
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 03d414b..c5771f7 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,13 +1,50 @@
+<!-- 设备借用申请 -->
 <script lang="ts" setup name="borrowApply">
-// 逻辑代码
+import list from './components/applyList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '全部', comp: list },
+  { name: '草稿箱', comp: list },
+  { name: '待审批', comp: list },
+  { name: '审批中', comp: list },
+  { name: '已通过', comp: list },
+  { name: '未通过', comp: list },
+  { name: '已取消', comp: list },
+])
+const current = ref('全部')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用申请
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
new file mode 100644
index 0000000..052f3ce
--- /dev/null
+++ b/src/views/device/borrow/components/applyList.vue
@@ -0,0 +1,328 @@
+<script lang="ts" setup name="borrowApplyList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '文件号',
+    value: 'fileNo',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '类别',
+    value: 'catergory',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '李四',
+      time: '2020-12-14 00:00:00',
+      status: '未通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const approveRef = ref()
+// 同意
+const agree = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '1',
+  })
+}
+// 驳回
+const reject = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '3',
+  })
+}
+// 拒绝
+const refuse = (row: any) => {
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
+}
+// 取消
+const cancel = (rowrow: any) => {
+  ElMessageBox.confirm(
+    '确认取消吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" @click="addBtn" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="agree(row)">
+                  同意
+                </el-button>
+                <el-button size="small" type="primary" link @click="reject(row)">
+                  驳回
+                </el-button>
+                <el-button size="small" type="primary" link @click="refuse(row)">
+                  拒绝
+                </el-button>
+                <el-button size="small" type="primary" link @click="cancel(row)">
+                  取消
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/components/approvalActionDialog.vue b/src/views/device/borrow/components/approvalActionDialog.vue
new file mode 100644
index 0000000..214876c
--- /dev/null
+++ b/src/views/device/borrow/components/approvalActionDialog.vue
@@ -0,0 +1,104 @@
+<!-- 审批操作弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
+const dialogVisibleApprove = ref(false)
+const form = reactive({
+  radio: '1',
+})
+const ruleFormRef = ref<FormInstance>()
+const rules = reactive<FormRules>({
+})
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const approvetime = ref('') // 审批时间
+const initDialog = (row: any) => {
+  dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
+}
+defineExpose({ initDialog })
+
+// 点击保存
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      dialogVisibleApprove.value = false
+      emits('resetData')
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  formEl.resetFields()
+  dialogVisibleApprove.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
+    <el-form
+      ref="ruleFormRef" :model="form"
+      :rules="rules" label-width="110px"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人">
+            <el-input disabled :value="userInfo.$state.name" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间">
+            <el-input disabled :value="approvetime" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
+        <el-button @click="resetForm(ruleFormRef)">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
new file mode 100644
index 0000000..cfda00a
--- /dev/null
+++ b/src/views/device/borrow/components/handleList.vue
@@ -0,0 +1,281 @@
+<script lang="ts" setup name="borrowHandleList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '申请编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'dept',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      dept: '顶级',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      dept: '徐州分中心',
+      user: '里斯',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+const borrow = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="borrow(row)">
+                  借用
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/addRow.vue b/src/views/device/standingBook/components/addRow.vue
index 1678cdb..07b03d1 100644
--- a/src/views/device/standingBook/components/addRow.vue
+++ b/src/views/device/standingBook/components/addRow.vue
@@ -5,7 +5,7 @@
 import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
+const formLabelWidth = '110px'
 const form = ref({})
 const formTable = ref([
   {
@@ -91,108 +91,188 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`">
+  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
     >
       <div v-if="name === '周检记录'">
-        <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录表编号" />
-        </el-form-item>
-        <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录人" />
-        </el-form-item>
-        <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="检定日期"
-          />
-        </el-form-item>
-        <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="有效日期"
-          />
-        </el-form-item>
-        <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="送检人" />
-        </el-form-item>
-        <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录表编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="检定日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="有效日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="送检人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '状态变更记录'">
-        <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="状态类型" clearable>
-            <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="结束日期"
-          />
-        </el-form-item>
-        <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="申请人" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="状态类型" clearable style="width: 100%;">
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="申请人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '使用记录'">
-        <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用人" />
-        </el-form-item>
-        <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用部门" />
-        </el-form-item>
-        <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="使用类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用结束日期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用部门" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="使用类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '检定证书'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="证书类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书出具日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书有效期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
     </el-form>
     <template #footer>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 5f7b347..9a9f798 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -352,7 +352,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -376,7 +376,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -391,7 +391,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -404,14 +404,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -434,7 +434,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -443,20 +443,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -480,23 +480,23 @@
               <com-tree-select
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -507,10 +507,10 @@
             <el-form-item label="检定部门" prop="mesureDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -520,7 +520,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -529,13 +529,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -544,21 +544,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -578,14 +578,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -594,14 +594,14 @@
         <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-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -669,7 +669,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index fc3fd54..d9d4514 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -199,6 +199,8 @@
     useDeptList.value = toTreeList(res.data, '0', true)
   })
 }
+const selectTreeRef1 = ref()
+const selectTreeRef2 = ref()
 // 重置
 const resetDATA = () => {
   ruleForm.value = {
@@ -254,6 +256,10 @@
     isStandardSupportEquipment: '', //		是否标准配套设备
     id: '',
   }
+  if (title.value !== '详情') {
+    selectTreeRef1.value.clearSelected()
+    selectTreeRef2.value.clearSelected()
+  }
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
@@ -378,7 +384,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -402,7 +408,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -416,8 +422,7 @@
             <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"
+                :placeholder="title === '详情' ? '' : '出厂年月'" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -430,14 +435,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -460,7 +465,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -469,20 +474,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -505,24 +510,26 @@
             <el-form-item label="使用部门" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
+                ref="selectTreeRef2"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -536,10 +543,12 @@
               </el-select> -->
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                ref="selectTreeRef1"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -549,7 +558,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -558,13 +567,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -573,21 +582,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -607,14 +616,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -624,14 +633,14 @@
           <el-col :span="6">
             <el-form-item label="资本来源" prop="capitalSource">
               <!-- <el-input v-model.trim="ruleForm.capitalSource" placeholder="资本来源" :disabled="title === '详情'" /> -->
-              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -699,7 +708,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f653095..f4229a6 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -147,19 +147,17 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
-  setTimeout(() => {
-    list.value = [
-      {
-        equipmentNo: 123,
-        equipmentName: 'test',
-        modelNo: '001',
-        usePersonName: '张三',
-        validDate: '2022-12-12 00:00:00',
-        useDeptName: '顶级',
-      },
-    ]
-    total.value = 1
-  }, 1000)
+  list.value = [
+    {
+      equipmentNo: 123,
+      equipmentName: 'test',
+      modelNo: '001',
+      usePersonName: '张三',
+      validDate: '2022-12-12 00:00:00',
+      useDeptName: '顶级',
+    },
+  ] as any
+  total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -220,9 +218,11 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -300,13 +300,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.mesureType" class="m-2 normal-select" placeholder="检定方式" clearable>
+          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable>
             <el-option
               v-for="item in mesureTypeList"
               :key="item.id"
@@ -316,7 +316,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.managerState" class="m-2 normal-select" placeholder="管理状态" clearable>
+          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable>
             <el-option
               v-for="item in managerStateList"
               :key="item.id"
@@ -327,8 +327,9 @@
         </search-item>
         <search-item>
           <com-tree-select
+            ref="selectTreeRef"
             v-model="searchQuery.useDept" :options="useDeptList" placeholder="使用部门"
-            :tree-props="deptProps" style="width: 150px;"
+            :tree-props="deptProps"
           />
         </search-item>
         <search-item>
@@ -336,11 +337,10 @@
             v-model="searchQuery.validDate" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="有效日期"
             class="normal-date"
-            style="width: 150px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.abc" class="m-2 normal-select" placeholder="ABC" clearable>
+          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable>
             <el-option
               v-for="item in abcList"
               :key="item.id"
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 78a3800..4c31a94 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -2,9 +2,10 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/fixedAssetsAdd.vue'
-import type { fixedAssetsType } from './standingBook-interface'
+import type { fixedAssetsType, selectType } from './standingBook-interface'
 import { exportFile } from '@/utils/exportUtils'
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
+import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   assetNo: '', // 固定编号
@@ -50,7 +51,7 @@
   },
   {
     text: '设备类型',
-    value: 'assetTypeName',
+    value: 'equipmentTypeName',
     width: '150',
     align: 'center',
   },
@@ -102,6 +103,7 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+const equipmentCategoryList = ref<selectType[]>([]) // 设备类别
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
@@ -242,6 +244,10 @@
 }
 onMounted(() => {
   getList()
+  // 获取设备类别
+  getDictByCode('equipmentCategory').then((response) => {
+    equipmentCategoryList.value = response.data
+  })
 })
 </script>
 
@@ -265,7 +271,10 @@
           <el-input v-model="searchQuery.equipmentSpecifications" placeholder="设备规格" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-select v-model="searchQuery.equipmentCategory" placeholder="设备类别" clearable>
+            <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+          </el-select>
         </search-item>
       </search-area>
       <table-container>
diff --git a/src/views/device/stateManage/components/addRow.vue b/src/views/device/stateManage/components/addRow.vue
new file mode 100644
index 0000000..3ba82d6
--- /dev/null
+++ b/src/views/device/stateManage/components/addRow.vue
@@ -0,0 +1,160 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { listPageApi } from '@/api/device/standingBook'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  limit: 10,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '出厂编号',
+    value: 'manufacturingNo',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+  },
+])
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listPageApi(listQuery.value as any).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map(item => ({ ...item, checked: '' }))
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    equipmentName: '', // 姓名
+    equipmentNo: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const checkedArr = list.value.filter(item => item.checked !== '')
+  if (checkedArr.length) {
+    console.log(checkedArr, '选中的设备')
+    emits('add', checkedArr)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择设备')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns as any" :query="listQuery"
+        :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-checkbox v-model="scope.row.checked" :label="scope.$index" size="large" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-checkbox__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index 56417d6..214876c 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -47,38 +47,45 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="30%">
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
-      :rules="rules"
+      :rules="rules" label-width="110px"
     >
-      <el-form-item label="审批意见">
-        <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
-        <el-radio-group v-model="form.radio">
-          <el-radio label="1">
-            同意
-          </el-radio>
-          <el-radio label="2">
-            拒绝
-          </el-radio>
-          <el-radio label="3">
-            驳回
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="审批结论">
-        <el-input
-          :rows="4"
-          type="textarea"
-        />
-      </el-form-item>
       <el-row :gutter="24">
-        <el-col :span="10">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="审批人">
             <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
-        <el-col :span="14">
+        <el-col :span="12">
           <el-form-item label="审批时间">
             <el-input disabled :value="approvetime" />
           </el-form-item>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index e74d70e..2003e31 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -1,7 +1,8 @@
 <!-- 新增或详情弹窗 -->
-<script lang="ts" setup name="addNotice">
+<script lang="ts" setup name="add">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
+import addRow from './addRow.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
@@ -16,6 +17,7 @@
 const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const name = ref('')
+const borrowList = ref([])
 const ruleForm = ref({
   assetNo: '', // 资产编号
   assetType: '', // 资产类型
@@ -357,10 +359,86 @@
     isShowCalibration.value = true
   }
 })
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerLevelName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+  },
+])
+const addRowRef = ref()
+// 添加行
+const addRowBtn = () => {
+  addRowRef.value.initDialog({ title: '添加' })
+}
+// 删除行
+const removeRowBtn = () => {
+  const removeArr = borrowList.value.filter(item => item.remove !== '')
+  if (removeArr.length) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      borrowList.value = borrowList.value.filter(item => item.remove === '')
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 借用设备列表添加
+const addRowMethods = (row) => {
+  row.forEach((element) => {
+    borrowList.value.push({ ...element, remove: '' })
+  })
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
     <detail-page :title="`${name}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
@@ -378,15 +456,16 @@
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder="">
+              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -430,7 +509,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -454,28 +533,56 @@
         </el-row>
       </el-form>
     </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>
+    <div>
+      <detail-block title="借用设备列表">
+        <template #btns>
+          <el-button type="primary" @click="addRowBtn">
+            添加行
+          </el-button>
+          <el-button type="info" @click="removeRowBtn">
+            删除行
+          </el-button>
+        </template>
+        <normal-table
+          :data="borrowList" :total="1" :columns="columns as any"
+        >
+          <template #preColumns>
+            <el-table-column label="选择" width="55" align="center">
+              <template #default="scope">
+                <el-checkbox v-model="scope.row.remove" :label="scope.$index" size="large" />
+              </template>
+            </el-table-column>
+            <el-table-column label="序号" width="60" align="center">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </detail-block>
+      <detail-block 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>
+    </div>
   </app-container>
 </template>
 
@@ -484,6 +591,10 @@
   background-color: #fff;
 }
 
+:deep(.el-checkbox__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,
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index aaaaf61..d588b8d 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,6 +1,7 @@
 <script lang="ts" setup name="bench">
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
+import type { trainLogStatistic } from './bench-interface'
 import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
 import { getPlanList } from '@/api/system/plan'
 import { listPageApi } from '@/api/measure/file'
@@ -132,15 +133,19 @@
     account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
+    const result: trainLogStatistic = res.data
+    const notQualified: number = Number(result.trainCount) - result.qualifiedCount
+    const qualifiedRate = ((result.qualifiedCount / result.trainCount) * 100).toFixed(2) // 合格率
+    const notQualifiedRate = ((notQualified / result.trainCount) * 100).toFixed(2) // 不合格率
     TrainLogSList.value = [
-      { name: `合格     ${res.data.qualified}-${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
-      { name: `不合格   ${res.data.notQualified}- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+      { name: `合   格   ${result.qualifiedCount}-${qualifiedRate}%`, value: result.qualifiedCount },
+      { name: `不合格   ${notQualified}- ${notQualifiedRate}%`, value: notQualified },
     ]
     TrainLogTitle.value = res.data.trainCount
   }).catch((_) => {
     // 处理异常
     TrainLogSList.value = [
-      { name: '合格     0 - 50%', value: 0 },
+      { name: '合   格   0 - 50%', value: 0 },
       { name: '不合格   0 - 50%', value: 0 },
     ]
     TrainLogTitle.value = 0
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 9ef0b93..1ad577b 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -270,7 +270,7 @@
               <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="6">
             <el-form-item label="名称" prop="fileName">
               <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
             </el-form-item>
@@ -279,13 +279,14 @@
         <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" class="fill-input" disabled>
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled style="width: 100%;">
                 <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="请选择发布单位"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -295,6 +296,7 @@
                 v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -311,12 +313,13 @@
                 v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人" prop="createUserId">
-              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index b45fbc3..542b284 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -26,7 +26,7 @@
   createUser: '', // 创建人
   createTime: '', // 创建
   approvalStatus: props.value, // 审批状态
-  limit: 10,
+  limit: 20,
   offset: 1,
   fileType: '', // 类型
   formId: '',
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 7d4724b..e54ddf5 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -26,7 +26,7 @@
   fileCode: '', // 文件号
   effectiveTime: '', // 实施时间
   effectiveStatus: '', // 实施状态
-  limit: 10,
+  limit: 20,
   offset: 1,
   fileType: '', // 类型
 }) // 查询参数
@@ -75,13 +75,19 @@
 const getStatus = () => {
   getDictByCode('effectiveStatus').then((res) => {
     if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
+      effectiveStatusSelect.value = [...res.data, { name: '全部', value: '', id: 'quanbu' }]
     }
   })
 }
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.publishTime) {
+    searchQuery.publishTime = ''
+  }
+  if (!searchQuery.effectiveTime) {
+    searchQuery.effectiveTime = ''
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -252,13 +258,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" />
         </search-item>
         <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
@@ -274,20 +280,16 @@
           <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: 185px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
             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: 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" placeholder="实施状态" clearable>
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index 5ca3275..a95c665 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -505,21 +505,21 @@
         <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] === '详情'" @change="directorChange">
+              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;" @change="directorChange">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.name" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
-              <el-select v-model="ruleForm.technologyJob" :placeholder="title.split('-')[2] === '详情' ? '' : '技术职务'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.technologyJob" :placeholder="title.split('-')[2] === '详情' ? '' : '技术职务'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;">
                 <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="administrationJob">
-              <el-select v-model="ruleForm.administrationJob" :placeholder="title.split('-')[2] === '详情' ? '' : '行政职务'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.administrationJob" :placeholder="title.split('-')[2] === '详情' ? '' : '行政职务'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index aac1ef2..11d6d0a 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -22,7 +22,7 @@
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
-  limit: 10,
+  limit: 20,
   offset: 1,
   organizeType: '', // 类型
   createTime: '', // 创建时间
@@ -118,6 +118,9 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.createTime) {
+    searchQuery.createTime = ''
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows.map(item => ({ ...item, createTime: item.createTime.split(' ')[0] }))
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 3f472eb..bc5d9d4 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -7,7 +7,9 @@
 // import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
-import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+// import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const props = defineProps({
   isRemind: {
     type: Boolean,
@@ -78,11 +80,14 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 // 获取所有部门
-const deptList = ref<DeptTreeNode[]>([])
+const deptList = ref([])
 const getDeptList = async () => {
   getDeptTreeList().then((res) => {
-    deptList.value = res.data
+    deptList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
@@ -177,6 +182,7 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   searchQuery.staffNo = ''
@@ -184,6 +190,7 @@
   searchQuery.deptId = ''
   searchQuery.certificateStatus = ''
   searchQuery.verifierCertificateNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -212,10 +219,6 @@
     loading.close()
   })
 }
-// 打印
-const print = () => {
-
-}
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传图片
@@ -268,20 +271,24 @@
           <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+          <!-- <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
             <el-option
               v-for="item in deptList"
               :key="item.id"
               :label="item.name"
               :value="item.id"
             />
-          </el-select>
+          </el-select> -->
+          <com-tree-select
+            ref="selectTreeRef" v-model="searchQuery.deptId" :options="deptList"
+            placeholder="工作部门" :tree-props="deptProps"
+          />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况">
+          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况" clearable>
             <el-option
               v-for="item in certificateStatusList"
               :key="item.id"
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 4352604..5a5f036 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -389,10 +389,10 @@
           关闭
         </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">
-            <el-form-item prop="minioFileName" label-width="70px">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item prop="minioFileName">
               <el-upload
                 class="avatar-uploader"
                 :show-file-list="false"
@@ -423,23 +423,24 @@
               <el-date-picker
                 v-model="ruleForm.birthday" type="date" format="YYYY-MM" value-format="YYYY-MM"
                 placeholder="出生年月" :disabled="title === '详情'"
+                style="width: 100%;"
               />
             </el-form-item>
             <el-form-item label="工作部门" prop="deptId" class="marg-item">
-              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled>
+              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled style="width: 100%;">
                 <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="ruleForm.deptId" :options="PubListTree"
-                placeholder="选择组织机构" :tree-props="deptProps"
+                placeholder="选择组织机构" :tree-props="deptProps" style="width: 100%;"
               />
             </el-form-item>
             <el-form-item label="计量专业" prop="major" class="marg-item">
               <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
             </el-form-item>
             <el-form-item label="是否特操人" prop="specialOperator" class="marg-item">
-              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -449,23 +450,23 @@
               <el-input v-model.trim="ruleForm.staffNo" placeholder="系统自动生成" disabled />
             </el-form-item>
             <el-form-item label="性别" prop="sex" class="marg-item">
-              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="技术职务" prop="technologyJob" class="marg-item">
-              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="从事日期" prop="workDate" class="marg-item">
               <el-date-picker
                 v-model="ruleForm.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-                placeholder="请选择从事日期"
+                placeholder="请选择从事日期" style="width: 100%;"
               />
             </el-form-item>
-            <el-form-item label="是否技术考核" prop="technologyExam" class="marg-item">
-              <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'">
+            <el-form-item label="是否技术考核" prop="technologyExam" class="marg-item" style="width: 100%;">
+              <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -475,17 +476,17 @@
               <el-input ref="cardRef" v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" @blur="getBirthday" />
             </el-form-item>
             <el-form-item label="文化程度" prop="education" class="marg-item">
-              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="行政职务" prop="administrationJob" class="marg-item">
-              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="是否主考人" prop="mainExaminer" class="marg-item">
-              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>

diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index bb58885..2959118 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -53,3 +53,64 @@
   }
   return true
 }
+
+/**
+ * 验证小写字母
+ * @param str
+ * @returns
+ */
+export function validateLowerCase(str: string) {
+  const reg = /^[a-z]+$/
+  return reg.test(str)
+}
+
+/* 验证大写字母 */
+export function validateUpperCase(str: string) {
+  const reg = /^[A-Z]+$/
+  return reg.test(str)
+}
+
+/* 验证大小写字母 */
+export function validateAlphabets(str: string) {
+  const reg = /^[A-Za-z]+$/
+  return reg.test(str)
+}
+
+/**
+ * 验证邮箱
+ * @param email
+ * @returns {boolean}
+ */
+export function validateEmail(email: string) {
+  const re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
+  return re.test(email)
+}
+
+/**
+ * 验证手机号
+ * @param phone
+ * @returns {boolean}
+ */
+export function validateMobile(phone: string) {
+  const re = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/
+  return re.test(phone)
+}
+
+/**
+ * 校验身份证号
+ * @param value
+ * @returns
+ */
+export function validateIdCardNo(value: string) {
+  const re = /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/
+  return re.test(value)
+}
+/**
+ *
+ * @param value 验证电话号码
+ * @returns
+ */
+export function validatePhone(value: string) {
+  const re = /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/
+  return re.test(value)
+}
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 1c2405e..bca0958 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,13 +1,46 @@
-<script lang="ts" setup name="borrowHandle">
-// 逻辑代码
+<!-- 设备借用处理 -->
+<script lang="ts" setup name="borrowApply">
+import list from './components/handleList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '待借用', comp: list },
+  { name: '已借用', comp: list },
+  { name: '已归还', comp: list },
+])
+const current = ref('待借用')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用处理
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 03d414b..c5771f7 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,13 +1,50 @@
+<!-- 设备借用申请 -->
 <script lang="ts" setup name="borrowApply">
-// 逻辑代码
+import list from './components/applyList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '全部', comp: list },
+  { name: '草稿箱', comp: list },
+  { name: '待审批', comp: list },
+  { name: '审批中', comp: list },
+  { name: '已通过', comp: list },
+  { name: '未通过', comp: list },
+  { name: '已取消', comp: list },
+])
+const current = ref('全部')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用申请
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
new file mode 100644
index 0000000..052f3ce
--- /dev/null
+++ b/src/views/device/borrow/components/applyList.vue
@@ -0,0 +1,328 @@
+<script lang="ts" setup name="borrowApplyList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '文件号',
+    value: 'fileNo',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '类别',
+    value: 'catergory',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '李四',
+      time: '2020-12-14 00:00:00',
+      status: '未通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const approveRef = ref()
+// 同意
+const agree = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '1',
+  })
+}
+// 驳回
+const reject = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '3',
+  })
+}
+// 拒绝
+const refuse = (row: any) => {
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
+}
+// 取消
+const cancel = (rowrow: any) => {
+  ElMessageBox.confirm(
+    '确认取消吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" @click="addBtn" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="agree(row)">
+                  同意
+                </el-button>
+                <el-button size="small" type="primary" link @click="reject(row)">
+                  驳回
+                </el-button>
+                <el-button size="small" type="primary" link @click="refuse(row)">
+                  拒绝
+                </el-button>
+                <el-button size="small" type="primary" link @click="cancel(row)">
+                  取消
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/components/approvalActionDialog.vue b/src/views/device/borrow/components/approvalActionDialog.vue
new file mode 100644
index 0000000..214876c
--- /dev/null
+++ b/src/views/device/borrow/components/approvalActionDialog.vue
@@ -0,0 +1,104 @@
+<!-- 审批操作弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
+const dialogVisibleApprove = ref(false)
+const form = reactive({
+  radio: '1',
+})
+const ruleFormRef = ref<FormInstance>()
+const rules = reactive<FormRules>({
+})
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const approvetime = ref('') // 审批时间
+const initDialog = (row: any) => {
+  dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
+}
+defineExpose({ initDialog })
+
+// 点击保存
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      dialogVisibleApprove.value = false
+      emits('resetData')
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  formEl.resetFields()
+  dialogVisibleApprove.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
+    <el-form
+      ref="ruleFormRef" :model="form"
+      :rules="rules" label-width="110px"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人">
+            <el-input disabled :value="userInfo.$state.name" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间">
+            <el-input disabled :value="approvetime" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
+        <el-button @click="resetForm(ruleFormRef)">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
new file mode 100644
index 0000000..cfda00a
--- /dev/null
+++ b/src/views/device/borrow/components/handleList.vue
@@ -0,0 +1,281 @@
+<script lang="ts" setup name="borrowHandleList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '申请编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'dept',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      dept: '顶级',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      dept: '徐州分中心',
+      user: '里斯',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+const borrow = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="borrow(row)">
+                  借用
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/addRow.vue b/src/views/device/standingBook/components/addRow.vue
index 1678cdb..07b03d1 100644
--- a/src/views/device/standingBook/components/addRow.vue
+++ b/src/views/device/standingBook/components/addRow.vue
@@ -5,7 +5,7 @@
 import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
+const formLabelWidth = '110px'
 const form = ref({})
 const formTable = ref([
   {
@@ -91,108 +91,188 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`">
+  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
     >
       <div v-if="name === '周检记录'">
-        <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录表编号" />
-        </el-form-item>
-        <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录人" />
-        </el-form-item>
-        <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="检定日期"
-          />
-        </el-form-item>
-        <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="有效日期"
-          />
-        </el-form-item>
-        <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="送检人" />
-        </el-form-item>
-        <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录表编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="检定日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="有效日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="送检人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '状态变更记录'">
-        <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="状态类型" clearable>
-            <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="结束日期"
-          />
-        </el-form-item>
-        <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="申请人" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="状态类型" clearable style="width: 100%;">
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="申请人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '使用记录'">
-        <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用人" />
-        </el-form-item>
-        <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用部门" />
-        </el-form-item>
-        <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="使用类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用结束日期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用部门" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="使用类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '检定证书'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="证书类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书出具日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书有效期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
     </el-form>
     <template #footer>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 5f7b347..9a9f798 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -352,7 +352,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -376,7 +376,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -391,7 +391,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -404,14 +404,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -434,7 +434,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -443,20 +443,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -480,23 +480,23 @@
               <com-tree-select
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -507,10 +507,10 @@
             <el-form-item label="检定部门" prop="mesureDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -520,7 +520,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -529,13 +529,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -544,21 +544,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -578,14 +578,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -594,14 +594,14 @@
         <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-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -669,7 +669,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index fc3fd54..d9d4514 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -199,6 +199,8 @@
     useDeptList.value = toTreeList(res.data, '0', true)
   })
 }
+const selectTreeRef1 = ref()
+const selectTreeRef2 = ref()
 // 重置
 const resetDATA = () => {
   ruleForm.value = {
@@ -254,6 +256,10 @@
     isStandardSupportEquipment: '', //		是否标准配套设备
     id: '',
   }
+  if (title.value !== '详情') {
+    selectTreeRef1.value.clearSelected()
+    selectTreeRef2.value.clearSelected()
+  }
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
@@ -378,7 +384,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -402,7 +408,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -416,8 +422,7 @@
             <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"
+                :placeholder="title === '详情' ? '' : '出厂年月'" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -430,14 +435,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -460,7 +465,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -469,20 +474,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -505,24 +510,26 @@
             <el-form-item label="使用部门" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
+                ref="selectTreeRef2"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -536,10 +543,12 @@
               </el-select> -->
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                ref="selectTreeRef1"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -549,7 +558,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -558,13 +567,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -573,21 +582,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -607,14 +616,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -624,14 +633,14 @@
           <el-col :span="6">
             <el-form-item label="资本来源" prop="capitalSource">
               <!-- <el-input v-model.trim="ruleForm.capitalSource" placeholder="资本来源" :disabled="title === '详情'" /> -->
-              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -699,7 +708,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f653095..f4229a6 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -147,19 +147,17 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
-  setTimeout(() => {
-    list.value = [
-      {
-        equipmentNo: 123,
-        equipmentName: 'test',
-        modelNo: '001',
-        usePersonName: '张三',
-        validDate: '2022-12-12 00:00:00',
-        useDeptName: '顶级',
-      },
-    ]
-    total.value = 1
-  }, 1000)
+  list.value = [
+    {
+      equipmentNo: 123,
+      equipmentName: 'test',
+      modelNo: '001',
+      usePersonName: '张三',
+      validDate: '2022-12-12 00:00:00',
+      useDeptName: '顶级',
+    },
+  ] as any
+  total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -220,9 +218,11 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -300,13 +300,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.mesureType" class="m-2 normal-select" placeholder="检定方式" clearable>
+          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable>
             <el-option
               v-for="item in mesureTypeList"
               :key="item.id"
@@ -316,7 +316,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.managerState" class="m-2 normal-select" placeholder="管理状态" clearable>
+          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable>
             <el-option
               v-for="item in managerStateList"
               :key="item.id"
@@ -327,8 +327,9 @@
         </search-item>
         <search-item>
           <com-tree-select
+            ref="selectTreeRef"
             v-model="searchQuery.useDept" :options="useDeptList" placeholder="使用部门"
-            :tree-props="deptProps" style="width: 150px;"
+            :tree-props="deptProps"
           />
         </search-item>
         <search-item>
@@ -336,11 +337,10 @@
             v-model="searchQuery.validDate" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="有效日期"
             class="normal-date"
-            style="width: 150px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.abc" class="m-2 normal-select" placeholder="ABC" clearable>
+          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable>
             <el-option
               v-for="item in abcList"
               :key="item.id"
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 78a3800..4c31a94 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -2,9 +2,10 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/fixedAssetsAdd.vue'
-import type { fixedAssetsType } from './standingBook-interface'
+import type { fixedAssetsType, selectType } from './standingBook-interface'
 import { exportFile } from '@/utils/exportUtils'
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
+import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   assetNo: '', // 固定编号
@@ -50,7 +51,7 @@
   },
   {
     text: '设备类型',
-    value: 'assetTypeName',
+    value: 'equipmentTypeName',
     width: '150',
     align: 'center',
   },
@@ -102,6 +103,7 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+const equipmentCategoryList = ref<selectType[]>([]) // 设备类别
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
@@ -242,6 +244,10 @@
 }
 onMounted(() => {
   getList()
+  // 获取设备类别
+  getDictByCode('equipmentCategory').then((response) => {
+    equipmentCategoryList.value = response.data
+  })
 })
 </script>
 
@@ -265,7 +271,10 @@
           <el-input v-model="searchQuery.equipmentSpecifications" placeholder="设备规格" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-select v-model="searchQuery.equipmentCategory" placeholder="设备类别" clearable>
+            <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+          </el-select>
         </search-item>
       </search-area>
       <table-container>
diff --git a/src/views/device/stateManage/components/addRow.vue b/src/views/device/stateManage/components/addRow.vue
new file mode 100644
index 0000000..3ba82d6
--- /dev/null
+++ b/src/views/device/stateManage/components/addRow.vue
@@ -0,0 +1,160 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { listPageApi } from '@/api/device/standingBook'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  limit: 10,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '出厂编号',
+    value: 'manufacturingNo',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+  },
+])
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listPageApi(listQuery.value as any).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map(item => ({ ...item, checked: '' }))
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    equipmentName: '', // 姓名
+    equipmentNo: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const checkedArr = list.value.filter(item => item.checked !== '')
+  if (checkedArr.length) {
+    console.log(checkedArr, '选中的设备')
+    emits('add', checkedArr)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择设备')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns as any" :query="listQuery"
+        :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-checkbox v-model="scope.row.checked" :label="scope.$index" size="large" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-checkbox__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index 56417d6..214876c 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -47,38 +47,45 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="30%">
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
-      :rules="rules"
+      :rules="rules" label-width="110px"
     >
-      <el-form-item label="审批意见">
-        <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
-        <el-radio-group v-model="form.radio">
-          <el-radio label="1">
-            同意
-          </el-radio>
-          <el-radio label="2">
-            拒绝
-          </el-radio>
-          <el-radio label="3">
-            驳回
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="审批结论">
-        <el-input
-          :rows="4"
-          type="textarea"
-        />
-      </el-form-item>
       <el-row :gutter="24">
-        <el-col :span="10">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="审批人">
             <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
-        <el-col :span="14">
+        <el-col :span="12">
           <el-form-item label="审批时间">
             <el-input disabled :value="approvetime" />
           </el-form-item>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index e74d70e..2003e31 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -1,7 +1,8 @@
 <!-- 新增或详情弹窗 -->
-<script lang="ts" setup name="addNotice">
+<script lang="ts" setup name="add">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
+import addRow from './addRow.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
@@ -16,6 +17,7 @@
 const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const name = ref('')
+const borrowList = ref([])
 const ruleForm = ref({
   assetNo: '', // 资产编号
   assetType: '', // 资产类型
@@ -357,10 +359,86 @@
     isShowCalibration.value = true
   }
 })
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerLevelName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+  },
+])
+const addRowRef = ref()
+// 添加行
+const addRowBtn = () => {
+  addRowRef.value.initDialog({ title: '添加' })
+}
+// 删除行
+const removeRowBtn = () => {
+  const removeArr = borrowList.value.filter(item => item.remove !== '')
+  if (removeArr.length) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      borrowList.value = borrowList.value.filter(item => item.remove === '')
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 借用设备列表添加
+const addRowMethods = (row) => {
+  row.forEach((element) => {
+    borrowList.value.push({ ...element, remove: '' })
+  })
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
     <detail-page :title="`${name}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
@@ -378,15 +456,16 @@
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder="">
+              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -430,7 +509,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -454,28 +533,56 @@
         </el-row>
       </el-form>
     </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>
+    <div>
+      <detail-block title="借用设备列表">
+        <template #btns>
+          <el-button type="primary" @click="addRowBtn">
+            添加行
+          </el-button>
+          <el-button type="info" @click="removeRowBtn">
+            删除行
+          </el-button>
+        </template>
+        <normal-table
+          :data="borrowList" :total="1" :columns="columns as any"
+        >
+          <template #preColumns>
+            <el-table-column label="选择" width="55" align="center">
+              <template #default="scope">
+                <el-checkbox v-model="scope.row.remove" :label="scope.$index" size="large" />
+              </template>
+            </el-table-column>
+            <el-table-column label="序号" width="60" align="center">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </detail-block>
+      <detail-block 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>
+    </div>
   </app-container>
 </template>
 
@@ -484,6 +591,10 @@
   background-color: #fff;
 }
 
+:deep(.el-checkbox__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,
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index aaaaf61..d588b8d 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,6 +1,7 @@
 <script lang="ts" setup name="bench">
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
+import type { trainLogStatistic } from './bench-interface'
 import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
 import { getPlanList } from '@/api/system/plan'
 import { listPageApi } from '@/api/measure/file'
@@ -132,15 +133,19 @@
     account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
+    const result: trainLogStatistic = res.data
+    const notQualified: number = Number(result.trainCount) - result.qualifiedCount
+    const qualifiedRate = ((result.qualifiedCount / result.trainCount) * 100).toFixed(2) // 合格率
+    const notQualifiedRate = ((notQualified / result.trainCount) * 100).toFixed(2) // 不合格率
     TrainLogSList.value = [
-      { name: `合格     ${res.data.qualified}-${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
-      { name: `不合格   ${res.data.notQualified}- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+      { name: `合   格   ${result.qualifiedCount}-${qualifiedRate}%`, value: result.qualifiedCount },
+      { name: `不合格   ${notQualified}- ${notQualifiedRate}%`, value: notQualified },
     ]
     TrainLogTitle.value = res.data.trainCount
   }).catch((_) => {
     // 处理异常
     TrainLogSList.value = [
-      { name: '合格     0 - 50%', value: 0 },
+      { name: '合   格   0 - 50%', value: 0 },
       { name: '不合格   0 - 50%', value: 0 },
     ]
     TrainLogTitle.value = 0
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 9ef0b93..1ad577b 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -270,7 +270,7 @@
               <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="6">
             <el-form-item label="名称" prop="fileName">
               <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
             </el-form-item>
@@ -279,13 +279,14 @@
         <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" class="fill-input" disabled>
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled style="width: 100%;">
                 <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="请选择发布单位"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -295,6 +296,7 @@
                 v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -311,12 +313,13 @@
                 v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人" prop="createUserId">
-              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index b45fbc3..542b284 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -26,7 +26,7 @@
   createUser: '', // 创建人
   createTime: '', // 创建
   approvalStatus: props.value, // 审批状态
-  limit: 10,
+  limit: 20,
   offset: 1,
   fileType: '', // 类型
   formId: '',
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 7d4724b..e54ddf5 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -26,7 +26,7 @@
   fileCode: '', // 文件号
   effectiveTime: '', // 实施时间
   effectiveStatus: '', // 实施状态
-  limit: 10,
+  limit: 20,
   offset: 1,
   fileType: '', // 类型
 }) // 查询参数
@@ -75,13 +75,19 @@
 const getStatus = () => {
   getDictByCode('effectiveStatus').then((res) => {
     if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
+      effectiveStatusSelect.value = [...res.data, { name: '全部', value: '', id: 'quanbu' }]
     }
   })
 }
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.publishTime) {
+    searchQuery.publishTime = ''
+  }
+  if (!searchQuery.effectiveTime) {
+    searchQuery.effectiveTime = ''
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -252,13 +258,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" />
         </search-item>
         <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
@@ -274,20 +280,16 @@
           <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: 185px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
             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: 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" placeholder="实施状态" clearable>
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index 5ca3275..a95c665 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -505,21 +505,21 @@
         <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] === '详情'" @change="directorChange">
+              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;" @change="directorChange">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.name" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
-              <el-select v-model="ruleForm.technologyJob" :placeholder="title.split('-')[2] === '详情' ? '' : '技术职务'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.technologyJob" :placeholder="title.split('-')[2] === '详情' ? '' : '技术职务'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;">
                 <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="administrationJob">
-              <el-select v-model="ruleForm.administrationJob" :placeholder="title.split('-')[2] === '详情' ? '' : '行政职务'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.administrationJob" :placeholder="title.split('-')[2] === '详情' ? '' : '行政职务'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index aac1ef2..11d6d0a 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -22,7 +22,7 @@
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
-  limit: 10,
+  limit: 20,
   offset: 1,
   organizeType: '', // 类型
   createTime: '', // 创建时间
@@ -118,6 +118,9 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.createTime) {
+    searchQuery.createTime = ''
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows.map(item => ({ ...item, createTime: item.createTime.split(' ')[0] }))
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 3f472eb..bc5d9d4 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -7,7 +7,9 @@
 // import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
-import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+// import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const props = defineProps({
   isRemind: {
     type: Boolean,
@@ -78,11 +80,14 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 // 获取所有部门
-const deptList = ref<DeptTreeNode[]>([])
+const deptList = ref([])
 const getDeptList = async () => {
   getDeptTreeList().then((res) => {
-    deptList.value = res.data
+    deptList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
@@ -177,6 +182,7 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   searchQuery.staffNo = ''
@@ -184,6 +190,7 @@
   searchQuery.deptId = ''
   searchQuery.certificateStatus = ''
   searchQuery.verifierCertificateNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -212,10 +219,6 @@
     loading.close()
   })
 }
-// 打印
-const print = () => {
-
-}
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传图片
@@ -268,20 +271,24 @@
           <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+          <!-- <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
             <el-option
               v-for="item in deptList"
               :key="item.id"
               :label="item.name"
               :value="item.id"
             />
-          </el-select>
+          </el-select> -->
+          <com-tree-select
+            ref="selectTreeRef" v-model="searchQuery.deptId" :options="deptList"
+            placeholder="工作部门" :tree-props="deptProps"
+          />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况">
+          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况" clearable>
             <el-option
               v-for="item in certificateStatusList"
               :key="item.id"
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 4352604..5a5f036 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -389,10 +389,10 @@
           关闭
         </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">
-            <el-form-item prop="minioFileName" label-width="70px">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item prop="minioFileName">
               <el-upload
                 class="avatar-uploader"
                 :show-file-list="false"
@@ -423,23 +423,24 @@
               <el-date-picker
                 v-model="ruleForm.birthday" type="date" format="YYYY-MM" value-format="YYYY-MM"
                 placeholder="出生年月" :disabled="title === '详情'"
+                style="width: 100%;"
               />
             </el-form-item>
             <el-form-item label="工作部门" prop="deptId" class="marg-item">
-              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled>
+              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled style="width: 100%;">
                 <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="ruleForm.deptId" :options="PubListTree"
-                placeholder="选择组织机构" :tree-props="deptProps"
+                placeholder="选择组织机构" :tree-props="deptProps" style="width: 100%;"
               />
             </el-form-item>
             <el-form-item label="计量专业" prop="major" class="marg-item">
               <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
             </el-form-item>
             <el-form-item label="是否特操人" prop="specialOperator" class="marg-item">
-              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -449,23 +450,23 @@
               <el-input v-model.trim="ruleForm.staffNo" placeholder="系统自动生成" disabled />
             </el-form-item>
             <el-form-item label="性别" prop="sex" class="marg-item">
-              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="技术职务" prop="technologyJob" class="marg-item">
-              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="从事日期" prop="workDate" class="marg-item">
               <el-date-picker
                 v-model="ruleForm.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-                placeholder="请选择从事日期"
+                placeholder="请选择从事日期" style="width: 100%;"
               />
             </el-form-item>
-            <el-form-item label="是否技术考核" prop="technologyExam" class="marg-item">
-              <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'">
+            <el-form-item label="是否技术考核" prop="technologyExam" class="marg-item" style="width: 100%;">
+              <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -475,17 +476,17 @@
               <el-input ref="cardRef" v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" @blur="getBirthday" />
             </el-form-item>
             <el-form-item label="文化程度" prop="education" class="marg-item">
-              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="行政职务" prop="administrationJob" class="marg-item">
-              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="是否主考人" prop="mainExaminer" class="marg-item">
-              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index 042636e..660f2b0 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -264,7 +264,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="性别" prop="meterStaff.sex">
-              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -273,21 +273,21 @@
         <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-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -296,7 +296,7 @@
         <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-select v-if="title === '详情'" v-model="meterStaff.deptId" disabled style="width: 100%;">
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
               <com-tree-select
@@ -304,6 +304,7 @@
                 ref="selectTreeRef" v-model="meterStaff.deptId" :options="PubListTree"
                 placeholder="选择组织机构"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -316,7 +317,7 @@
             <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="请选择从事日期"
+                placeholder="请选择从事日期" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -347,7 +348,7 @@
             <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="请选择发证日期"
+                placeholder="请选择发证日期" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -355,7 +356,7 @@
             <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="请选择有效日期"
+                placeholder="请选择有效日期" style="width: 100%;"
               />
             </el-form-item>
           </el-col>

diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index bb58885..2959118 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -53,3 +53,64 @@
   }
   return true
 }
+
+/**
+ * 验证小写字母
+ * @param str
+ * @returns
+ */
+export function validateLowerCase(str: string) {
+  const reg = /^[a-z]+$/
+  return reg.test(str)
+}
+
+/* 验证大写字母 */
+export function validateUpperCase(str: string) {
+  const reg = /^[A-Z]+$/
+  return reg.test(str)
+}
+
+/* 验证大小写字母 */
+export function validateAlphabets(str: string) {
+  const reg = /^[A-Za-z]+$/
+  return reg.test(str)
+}
+
+/**
+ * 验证邮箱
+ * @param email
+ * @returns {boolean}
+ */
+export function validateEmail(email: string) {
+  const re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
+  return re.test(email)
+}
+
+/**
+ * 验证手机号
+ * @param phone
+ * @returns {boolean}
+ */
+export function validateMobile(phone: string) {
+  const re = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/
+  return re.test(phone)
+}
+
+/**
+ * 校验身份证号
+ * @param value
+ * @returns
+ */
+export function validateIdCardNo(value: string) {
+  const re = /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/
+  return re.test(value)
+}
+/**
+ *
+ * @param value 验证电话号码
+ * @returns
+ */
+export function validatePhone(value: string) {
+  const re = /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/
+  return re.test(value)
+}
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 1c2405e..bca0958 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,13 +1,46 @@
-<script lang="ts" setup name="borrowHandle">
-// 逻辑代码
+<!-- 设备借用处理 -->
+<script lang="ts" setup name="borrowApply">
+import list from './components/handleList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '待借用', comp: list },
+  { name: '已借用', comp: list },
+  { name: '已归还', comp: list },
+])
+const current = ref('待借用')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用处理
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 03d414b..c5771f7 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,13 +1,50 @@
+<!-- 设备借用申请 -->
 <script lang="ts" setup name="borrowApply">
-// 逻辑代码
+import list from './components/applyList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '全部', comp: list },
+  { name: '草稿箱', comp: list },
+  { name: '待审批', comp: list },
+  { name: '审批中', comp: list },
+  { name: '已通过', comp: list },
+  { name: '未通过', comp: list },
+  { name: '已取消', comp: list },
+])
+const current = ref('全部')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用申请
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
new file mode 100644
index 0000000..052f3ce
--- /dev/null
+++ b/src/views/device/borrow/components/applyList.vue
@@ -0,0 +1,328 @@
+<script lang="ts" setup name="borrowApplyList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '文件号',
+    value: 'fileNo',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '类别',
+    value: 'catergory',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '李四',
+      time: '2020-12-14 00:00:00',
+      status: '未通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const approveRef = ref()
+// 同意
+const agree = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '1',
+  })
+}
+// 驳回
+const reject = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '3',
+  })
+}
+// 拒绝
+const refuse = (row: any) => {
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
+}
+// 取消
+const cancel = (rowrow: any) => {
+  ElMessageBox.confirm(
+    '确认取消吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" @click="addBtn" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="agree(row)">
+                  同意
+                </el-button>
+                <el-button size="small" type="primary" link @click="reject(row)">
+                  驳回
+                </el-button>
+                <el-button size="small" type="primary" link @click="refuse(row)">
+                  拒绝
+                </el-button>
+                <el-button size="small" type="primary" link @click="cancel(row)">
+                  取消
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/components/approvalActionDialog.vue b/src/views/device/borrow/components/approvalActionDialog.vue
new file mode 100644
index 0000000..214876c
--- /dev/null
+++ b/src/views/device/borrow/components/approvalActionDialog.vue
@@ -0,0 +1,104 @@
+<!-- 审批操作弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
+const dialogVisibleApprove = ref(false)
+const form = reactive({
+  radio: '1',
+})
+const ruleFormRef = ref<FormInstance>()
+const rules = reactive<FormRules>({
+})
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const approvetime = ref('') // 审批时间
+const initDialog = (row: any) => {
+  dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
+}
+defineExpose({ initDialog })
+
+// 点击保存
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      dialogVisibleApprove.value = false
+      emits('resetData')
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  formEl.resetFields()
+  dialogVisibleApprove.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
+    <el-form
+      ref="ruleFormRef" :model="form"
+      :rules="rules" label-width="110px"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人">
+            <el-input disabled :value="userInfo.$state.name" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间">
+            <el-input disabled :value="approvetime" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
+        <el-button @click="resetForm(ruleFormRef)">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
new file mode 100644
index 0000000..cfda00a
--- /dev/null
+++ b/src/views/device/borrow/components/handleList.vue
@@ -0,0 +1,281 @@
+<script lang="ts" setup name="borrowHandleList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '申请编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'dept',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      dept: '顶级',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      dept: '徐州分中心',
+      user: '里斯',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+const borrow = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="borrow(row)">
+                  借用
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/addRow.vue b/src/views/device/standingBook/components/addRow.vue
index 1678cdb..07b03d1 100644
--- a/src/views/device/standingBook/components/addRow.vue
+++ b/src/views/device/standingBook/components/addRow.vue
@@ -5,7 +5,7 @@
 import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
+const formLabelWidth = '110px'
 const form = ref({})
 const formTable = ref([
   {
@@ -91,108 +91,188 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`">
+  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
     >
       <div v-if="name === '周检记录'">
-        <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录表编号" />
-        </el-form-item>
-        <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录人" />
-        </el-form-item>
-        <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="检定日期"
-          />
-        </el-form-item>
-        <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="有效日期"
-          />
-        </el-form-item>
-        <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="送检人" />
-        </el-form-item>
-        <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录表编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="检定日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="有效日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="送检人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '状态变更记录'">
-        <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="状态类型" clearable>
-            <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="结束日期"
-          />
-        </el-form-item>
-        <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="申请人" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="状态类型" clearable style="width: 100%;">
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="申请人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '使用记录'">
-        <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用人" />
-        </el-form-item>
-        <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用部门" />
-        </el-form-item>
-        <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="使用类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用结束日期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用部门" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="使用类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '检定证书'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="证书类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书出具日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书有效期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
     </el-form>
     <template #footer>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 5f7b347..9a9f798 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -352,7 +352,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -376,7 +376,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -391,7 +391,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -404,14 +404,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -434,7 +434,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -443,20 +443,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -480,23 +480,23 @@
               <com-tree-select
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -507,10 +507,10 @@
             <el-form-item label="检定部门" prop="mesureDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -520,7 +520,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -529,13 +529,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -544,21 +544,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -578,14 +578,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -594,14 +594,14 @@
         <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-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -669,7 +669,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index fc3fd54..d9d4514 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -199,6 +199,8 @@
     useDeptList.value = toTreeList(res.data, '0', true)
   })
 }
+const selectTreeRef1 = ref()
+const selectTreeRef2 = ref()
 // 重置
 const resetDATA = () => {
   ruleForm.value = {
@@ -254,6 +256,10 @@
     isStandardSupportEquipment: '', //		是否标准配套设备
     id: '',
   }
+  if (title.value !== '详情') {
+    selectTreeRef1.value.clearSelected()
+    selectTreeRef2.value.clearSelected()
+  }
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
@@ -378,7 +384,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -402,7 +408,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -416,8 +422,7 @@
             <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"
+                :placeholder="title === '详情' ? '' : '出厂年月'" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -430,14 +435,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -460,7 +465,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -469,20 +474,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -505,24 +510,26 @@
             <el-form-item label="使用部门" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
+                ref="selectTreeRef2"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -536,10 +543,12 @@
               </el-select> -->
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                ref="selectTreeRef1"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -549,7 +558,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -558,13 +567,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -573,21 +582,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -607,14 +616,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -624,14 +633,14 @@
           <el-col :span="6">
             <el-form-item label="资本来源" prop="capitalSource">
               <!-- <el-input v-model.trim="ruleForm.capitalSource" placeholder="资本来源" :disabled="title === '详情'" /> -->
-              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -699,7 +708,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f653095..f4229a6 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -147,19 +147,17 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
-  setTimeout(() => {
-    list.value = [
-      {
-        equipmentNo: 123,
-        equipmentName: 'test',
-        modelNo: '001',
-        usePersonName: '张三',
-        validDate: '2022-12-12 00:00:00',
-        useDeptName: '顶级',
-      },
-    ]
-    total.value = 1
-  }, 1000)
+  list.value = [
+    {
+      equipmentNo: 123,
+      equipmentName: 'test',
+      modelNo: '001',
+      usePersonName: '张三',
+      validDate: '2022-12-12 00:00:00',
+      useDeptName: '顶级',
+    },
+  ] as any
+  total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -220,9 +218,11 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -300,13 +300,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.mesureType" class="m-2 normal-select" placeholder="检定方式" clearable>
+          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable>
             <el-option
               v-for="item in mesureTypeList"
               :key="item.id"
@@ -316,7 +316,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.managerState" class="m-2 normal-select" placeholder="管理状态" clearable>
+          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable>
             <el-option
               v-for="item in managerStateList"
               :key="item.id"
@@ -327,8 +327,9 @@
         </search-item>
         <search-item>
           <com-tree-select
+            ref="selectTreeRef"
             v-model="searchQuery.useDept" :options="useDeptList" placeholder="使用部门"
-            :tree-props="deptProps" style="width: 150px;"
+            :tree-props="deptProps"
           />
         </search-item>
         <search-item>
@@ -336,11 +337,10 @@
             v-model="searchQuery.validDate" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="有效日期"
             class="normal-date"
-            style="width: 150px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.abc" class="m-2 normal-select" placeholder="ABC" clearable>
+          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable>
             <el-option
               v-for="item in abcList"
               :key="item.id"
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 78a3800..4c31a94 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -2,9 +2,10 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/fixedAssetsAdd.vue'
-import type { fixedAssetsType } from './standingBook-interface'
+import type { fixedAssetsType, selectType } from './standingBook-interface'
 import { exportFile } from '@/utils/exportUtils'
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
+import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   assetNo: '', // 固定编号
@@ -50,7 +51,7 @@
   },
   {
     text: '设备类型',
-    value: 'assetTypeName',
+    value: 'equipmentTypeName',
     width: '150',
     align: 'center',
   },
@@ -102,6 +103,7 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+const equipmentCategoryList = ref<selectType[]>([]) // 设备类别
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
@@ -242,6 +244,10 @@
 }
 onMounted(() => {
   getList()
+  // 获取设备类别
+  getDictByCode('equipmentCategory').then((response) => {
+    equipmentCategoryList.value = response.data
+  })
 })
 </script>
 
@@ -265,7 +271,10 @@
           <el-input v-model="searchQuery.equipmentSpecifications" placeholder="设备规格" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-select v-model="searchQuery.equipmentCategory" placeholder="设备类别" clearable>
+            <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+          </el-select>
         </search-item>
       </search-area>
       <table-container>
diff --git a/src/views/device/stateManage/components/addRow.vue b/src/views/device/stateManage/components/addRow.vue
new file mode 100644
index 0000000..3ba82d6
--- /dev/null
+++ b/src/views/device/stateManage/components/addRow.vue
@@ -0,0 +1,160 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { listPageApi } from '@/api/device/standingBook'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  limit: 10,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '出厂编号',
+    value: 'manufacturingNo',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+  },
+])
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listPageApi(listQuery.value as any).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map(item => ({ ...item, checked: '' }))
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    equipmentName: '', // 姓名
+    equipmentNo: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const checkedArr = list.value.filter(item => item.checked !== '')
+  if (checkedArr.length) {
+    console.log(checkedArr, '选中的设备')
+    emits('add', checkedArr)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择设备')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns as any" :query="listQuery"
+        :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-checkbox v-model="scope.row.checked" :label="scope.$index" size="large" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-checkbox__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index 56417d6..214876c 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -47,38 +47,45 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="30%">
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
-      :rules="rules"
+      :rules="rules" label-width="110px"
     >
-      <el-form-item label="审批意见">
-        <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
-        <el-radio-group v-model="form.radio">
-          <el-radio label="1">
-            同意
-          </el-radio>
-          <el-radio label="2">
-            拒绝
-          </el-radio>
-          <el-radio label="3">
-            驳回
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="审批结论">
-        <el-input
-          :rows="4"
-          type="textarea"
-        />
-      </el-form-item>
       <el-row :gutter="24">
-        <el-col :span="10">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="审批人">
             <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
-        <el-col :span="14">
+        <el-col :span="12">
           <el-form-item label="审批时间">
             <el-input disabled :value="approvetime" />
           </el-form-item>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index e74d70e..2003e31 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -1,7 +1,8 @@
 <!-- 新增或详情弹窗 -->
-<script lang="ts" setup name="addNotice">
+<script lang="ts" setup name="add">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
+import addRow from './addRow.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
@@ -16,6 +17,7 @@
 const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const name = ref('')
+const borrowList = ref([])
 const ruleForm = ref({
   assetNo: '', // 资产编号
   assetType: '', // 资产类型
@@ -357,10 +359,86 @@
     isShowCalibration.value = true
   }
 })
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerLevelName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+  },
+])
+const addRowRef = ref()
+// 添加行
+const addRowBtn = () => {
+  addRowRef.value.initDialog({ title: '添加' })
+}
+// 删除行
+const removeRowBtn = () => {
+  const removeArr = borrowList.value.filter(item => item.remove !== '')
+  if (removeArr.length) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      borrowList.value = borrowList.value.filter(item => item.remove === '')
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 借用设备列表添加
+const addRowMethods = (row) => {
+  row.forEach((element) => {
+    borrowList.value.push({ ...element, remove: '' })
+  })
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
     <detail-page :title="`${name}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
@@ -378,15 +456,16 @@
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder="">
+              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -430,7 +509,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -454,28 +533,56 @@
         </el-row>
       </el-form>
     </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>
+    <div>
+      <detail-block title="借用设备列表">
+        <template #btns>
+          <el-button type="primary" @click="addRowBtn">
+            添加行
+          </el-button>
+          <el-button type="info" @click="removeRowBtn">
+            删除行
+          </el-button>
+        </template>
+        <normal-table
+          :data="borrowList" :total="1" :columns="columns as any"
+        >
+          <template #preColumns>
+            <el-table-column label="选择" width="55" align="center">
+              <template #default="scope">
+                <el-checkbox v-model="scope.row.remove" :label="scope.$index" size="large" />
+              </template>
+            </el-table-column>
+            <el-table-column label="序号" width="60" align="center">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </detail-block>
+      <detail-block 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>
+    </div>
   </app-container>
 </template>
 
@@ -484,6 +591,10 @@
   background-color: #fff;
 }
 
+:deep(.el-checkbox__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,
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index aaaaf61..d588b8d 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,6 +1,7 @@
 <script lang="ts" setup name="bench">
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
+import type { trainLogStatistic } from './bench-interface'
 import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
 import { getPlanList } from '@/api/system/plan'
 import { listPageApi } from '@/api/measure/file'
@@ -132,15 +133,19 @@
     account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
+    const result: trainLogStatistic = res.data
+    const notQualified: number = Number(result.trainCount) - result.qualifiedCount
+    const qualifiedRate = ((result.qualifiedCount / result.trainCount) * 100).toFixed(2) // 合格率
+    const notQualifiedRate = ((notQualified / result.trainCount) * 100).toFixed(2) // 不合格率
     TrainLogSList.value = [
-      { name: `合格     ${res.data.qualified}-${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
-      { name: `不合格   ${res.data.notQualified}- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+      { name: `合   格   ${result.qualifiedCount}-${qualifiedRate}%`, value: result.qualifiedCount },
+      { name: `不合格   ${notQualified}- ${notQualifiedRate}%`, value: notQualified },
     ]
     TrainLogTitle.value = res.data.trainCount
   }).catch((_) => {
     // 处理异常
     TrainLogSList.value = [
-      { name: '合格     0 - 50%', value: 0 },
+      { name: '合   格   0 - 50%', value: 0 },
       { name: '不合格   0 - 50%', value: 0 },
     ]
     TrainLogTitle.value = 0
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 9ef0b93..1ad577b 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -270,7 +270,7 @@
               <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="6">
             <el-form-item label="名称" prop="fileName">
               <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
             </el-form-item>
@@ -279,13 +279,14 @@
         <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" class="fill-input" disabled>
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled style="width: 100%;">
                 <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="请选择发布单位"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -295,6 +296,7 @@
                 v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -311,12 +313,13 @@
                 v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人" prop="createUserId">
-              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index b45fbc3..542b284 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -26,7 +26,7 @@
   createUser: '', // 创建人
   createTime: '', // 创建
   approvalStatus: props.value, // 审批状态
-  limit: 10,
+  limit: 20,
   offset: 1,
   fileType: '', // 类型
   formId: '',
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 7d4724b..e54ddf5 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -26,7 +26,7 @@
   fileCode: '', // 文件号
   effectiveTime: '', // 实施时间
   effectiveStatus: '', // 实施状态
-  limit: 10,
+  limit: 20,
   offset: 1,
   fileType: '', // 类型
 }) // 查询参数
@@ -75,13 +75,19 @@
 const getStatus = () => {
   getDictByCode('effectiveStatus').then((res) => {
     if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
+      effectiveStatusSelect.value = [...res.data, { name: '全部', value: '', id: 'quanbu' }]
     }
   })
 }
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.publishTime) {
+    searchQuery.publishTime = ''
+  }
+  if (!searchQuery.effectiveTime) {
+    searchQuery.effectiveTime = ''
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -252,13 +258,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" />
         </search-item>
         <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
@@ -274,20 +280,16 @@
           <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: 185px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
             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: 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" placeholder="实施状态" clearable>
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index 5ca3275..a95c665 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -505,21 +505,21 @@
         <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] === '详情'" @change="directorChange">
+              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;" @change="directorChange">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.name" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
-              <el-select v-model="ruleForm.technologyJob" :placeholder="title.split('-')[2] === '详情' ? '' : '技术职务'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.technologyJob" :placeholder="title.split('-')[2] === '详情' ? '' : '技术职务'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;">
                 <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="administrationJob">
-              <el-select v-model="ruleForm.administrationJob" :placeholder="title.split('-')[2] === '详情' ? '' : '行政职务'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.administrationJob" :placeholder="title.split('-')[2] === '详情' ? '' : '行政职务'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index aac1ef2..11d6d0a 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -22,7 +22,7 @@
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
-  limit: 10,
+  limit: 20,
   offset: 1,
   organizeType: '', // 类型
   createTime: '', // 创建时间
@@ -118,6 +118,9 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.createTime) {
+    searchQuery.createTime = ''
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows.map(item => ({ ...item, createTime: item.createTime.split(' ')[0] }))
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 3f472eb..bc5d9d4 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -7,7 +7,9 @@
 // import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
-import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+// import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const props = defineProps({
   isRemind: {
     type: Boolean,
@@ -78,11 +80,14 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 // 获取所有部门
-const deptList = ref<DeptTreeNode[]>([])
+const deptList = ref([])
 const getDeptList = async () => {
   getDeptTreeList().then((res) => {
-    deptList.value = res.data
+    deptList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
@@ -177,6 +182,7 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   searchQuery.staffNo = ''
@@ -184,6 +190,7 @@
   searchQuery.deptId = ''
   searchQuery.certificateStatus = ''
   searchQuery.verifierCertificateNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -212,10 +219,6 @@
     loading.close()
   })
 }
-// 打印
-const print = () => {
-
-}
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传图片
@@ -268,20 +271,24 @@
           <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+          <!-- <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
             <el-option
               v-for="item in deptList"
               :key="item.id"
               :label="item.name"
               :value="item.id"
             />
-          </el-select>
+          </el-select> -->
+          <com-tree-select
+            ref="selectTreeRef" v-model="searchQuery.deptId" :options="deptList"
+            placeholder="工作部门" :tree-props="deptProps"
+          />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况">
+          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况" clearable>
             <el-option
               v-for="item in certificateStatusList"
               :key="item.id"
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 4352604..5a5f036 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -389,10 +389,10 @@
           关闭
         </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">
-            <el-form-item prop="minioFileName" label-width="70px">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item prop="minioFileName">
               <el-upload
                 class="avatar-uploader"
                 :show-file-list="false"
@@ -423,23 +423,24 @@
               <el-date-picker
                 v-model="ruleForm.birthday" type="date" format="YYYY-MM" value-format="YYYY-MM"
                 placeholder="出生年月" :disabled="title === '详情'"
+                style="width: 100%;"
               />
             </el-form-item>
             <el-form-item label="工作部门" prop="deptId" class="marg-item">
-              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled>
+              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled style="width: 100%;">
                 <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="ruleForm.deptId" :options="PubListTree"
-                placeholder="选择组织机构" :tree-props="deptProps"
+                placeholder="选择组织机构" :tree-props="deptProps" style="width: 100%;"
               />
             </el-form-item>
             <el-form-item label="计量专业" prop="major" class="marg-item">
               <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
             </el-form-item>
             <el-form-item label="是否特操人" prop="specialOperator" class="marg-item">
-              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -449,23 +450,23 @@
               <el-input v-model.trim="ruleForm.staffNo" placeholder="系统自动生成" disabled />
             </el-form-item>
             <el-form-item label="性别" prop="sex" class="marg-item">
-              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="技术职务" prop="technologyJob" class="marg-item">
-              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="从事日期" prop="workDate" class="marg-item">
               <el-date-picker
                 v-model="ruleForm.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-                placeholder="请选择从事日期"
+                placeholder="请选择从事日期" style="width: 100%;"
               />
             </el-form-item>
-            <el-form-item label="是否技术考核" prop="technologyExam" class="marg-item">
-              <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'">
+            <el-form-item label="是否技术考核" prop="technologyExam" class="marg-item" style="width: 100%;">
+              <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -475,17 +476,17 @@
               <el-input ref="cardRef" v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" @blur="getBirthday" />
             </el-form-item>
             <el-form-item label="文化程度" prop="education" class="marg-item">
-              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="行政职务" prop="administrationJob" class="marg-item">
-              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="是否主考人" prop="mainExaminer" class="marg-item">
-              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index 042636e..660f2b0 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -264,7 +264,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="性别" prop="meterStaff.sex">
-              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -273,21 +273,21 @@
         <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-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -296,7 +296,7 @@
         <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-select v-if="title === '详情'" v-model="meterStaff.deptId" disabled style="width: 100%;">
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
               <com-tree-select
@@ -304,6 +304,7 @@
                 ref="selectTreeRef" v-model="meterStaff.deptId" :options="PubListTree"
                 placeholder="选择组织机构"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -316,7 +317,7 @@
             <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="请选择从事日期"
+                placeholder="请选择从事日期" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -347,7 +348,7 @@
             <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="请选择发证日期"
+                placeholder="请选择发证日期" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -355,7 +356,7 @@
             <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="请选择有效日期"
+                placeholder="请选择有效日期" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 178fc12..d0116f3 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -3,7 +3,7 @@
 import type { FormInstance, FormRules } from 'element-plus'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
+const formLabelWidth = '110px'
 const form = reactive({
   certificateNo: '', // 证书号
   certificateName: '', // 证书名称
@@ -71,32 +71,52 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`" width="40%">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
     >
-      <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
-        <el-input v-model="form.certificateNo" placeholder="证书号" />
-      </el-form-item>
-      <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
-        <el-input v-model="form.certificateName" placeholder="证书名称" />
-      </el-form-item>
-      <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
-        <el-input v-model="form.certificateCompany" placeholder="发证单位" />
-      </el-form-item>
-      <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
-        <el-date-picker
-          v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择发证日期"
-        />
-      </el-form-item>
-      <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-        <el-date-picker
-          v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择有效日期"
-        />
-      </el-form-item>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
+            <el-input v-model="form.certificateNo" placeholder="证书号" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
+            <el-input v-model="form.certificateName" placeholder="证书名称" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
+            <el-input v-model="form.certificateCompany" placeholder="发证单位" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
+            <el-date-picker
+              v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择发证日期" style="width: 100%;"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+            <el-date-picker
+              v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择有效日期" style="width: 100%;"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <template #footer>
       <span class="dialog-footer">

diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index bb58885..2959118 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -53,3 +53,64 @@
   }
   return true
 }
+
+/**
+ * 验证小写字母
+ * @param str
+ * @returns
+ */
+export function validateLowerCase(str: string) {
+  const reg = /^[a-z]+$/
+  return reg.test(str)
+}
+
+/* 验证大写字母 */
+export function validateUpperCase(str: string) {
+  const reg = /^[A-Z]+$/
+  return reg.test(str)
+}
+
+/* 验证大小写字母 */
+export function validateAlphabets(str: string) {
+  const reg = /^[A-Za-z]+$/
+  return reg.test(str)
+}
+
+/**
+ * 验证邮箱
+ * @param email
+ * @returns {boolean}
+ */
+export function validateEmail(email: string) {
+  const re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
+  return re.test(email)
+}
+
+/**
+ * 验证手机号
+ * @param phone
+ * @returns {boolean}
+ */
+export function validateMobile(phone: string) {
+  const re = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/
+  return re.test(phone)
+}
+
+/**
+ * 校验身份证号
+ * @param value
+ * @returns
+ */
+export function validateIdCardNo(value: string) {
+  const re = /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/
+  return re.test(value)
+}
+/**
+ *
+ * @param value 验证电话号码
+ * @returns
+ */
+export function validatePhone(value: string) {
+  const re = /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/
+  return re.test(value)
+}
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 1c2405e..bca0958 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,13 +1,46 @@
-<script lang="ts" setup name="borrowHandle">
-// 逻辑代码
+<!-- 设备借用处理 -->
+<script lang="ts" setup name="borrowApply">
+import list from './components/handleList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '待借用', comp: list },
+  { name: '已借用', comp: list },
+  { name: '已归还', comp: list },
+])
+const current = ref('待借用')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用处理
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 03d414b..c5771f7 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,13 +1,50 @@
+<!-- 设备借用申请 -->
 <script lang="ts" setup name="borrowApply">
-// 逻辑代码
+import list from './components/applyList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '全部', comp: list },
+  { name: '草稿箱', comp: list },
+  { name: '待审批', comp: list },
+  { name: '审批中', comp: list },
+  { name: '已通过', comp: list },
+  { name: '未通过', comp: list },
+  { name: '已取消', comp: list },
+])
+const current = ref('全部')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用申请
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
new file mode 100644
index 0000000..052f3ce
--- /dev/null
+++ b/src/views/device/borrow/components/applyList.vue
@@ -0,0 +1,328 @@
+<script lang="ts" setup name="borrowApplyList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '文件号',
+    value: 'fileNo',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '类别',
+    value: 'catergory',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '李四',
+      time: '2020-12-14 00:00:00',
+      status: '未通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const approveRef = ref()
+// 同意
+const agree = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '1',
+  })
+}
+// 驳回
+const reject = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '3',
+  })
+}
+// 拒绝
+const refuse = (row: any) => {
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
+}
+// 取消
+const cancel = (rowrow: any) => {
+  ElMessageBox.confirm(
+    '确认取消吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" @click="addBtn" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="agree(row)">
+                  同意
+                </el-button>
+                <el-button size="small" type="primary" link @click="reject(row)">
+                  驳回
+                </el-button>
+                <el-button size="small" type="primary" link @click="refuse(row)">
+                  拒绝
+                </el-button>
+                <el-button size="small" type="primary" link @click="cancel(row)">
+                  取消
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/components/approvalActionDialog.vue b/src/views/device/borrow/components/approvalActionDialog.vue
new file mode 100644
index 0000000..214876c
--- /dev/null
+++ b/src/views/device/borrow/components/approvalActionDialog.vue
@@ -0,0 +1,104 @@
+<!-- 审批操作弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
+const dialogVisibleApprove = ref(false)
+const form = reactive({
+  radio: '1',
+})
+const ruleFormRef = ref<FormInstance>()
+const rules = reactive<FormRules>({
+})
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const approvetime = ref('') // 审批时间
+const initDialog = (row: any) => {
+  dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
+}
+defineExpose({ initDialog })
+
+// 点击保存
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      dialogVisibleApprove.value = false
+      emits('resetData')
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  formEl.resetFields()
+  dialogVisibleApprove.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
+    <el-form
+      ref="ruleFormRef" :model="form"
+      :rules="rules" label-width="110px"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人">
+            <el-input disabled :value="userInfo.$state.name" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间">
+            <el-input disabled :value="approvetime" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
+        <el-button @click="resetForm(ruleFormRef)">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
new file mode 100644
index 0000000..cfda00a
--- /dev/null
+++ b/src/views/device/borrow/components/handleList.vue
@@ -0,0 +1,281 @@
+<script lang="ts" setup name="borrowHandleList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '申请编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'dept',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      dept: '顶级',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      dept: '徐州分中心',
+      user: '里斯',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+const borrow = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="borrow(row)">
+                  借用
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/addRow.vue b/src/views/device/standingBook/components/addRow.vue
index 1678cdb..07b03d1 100644
--- a/src/views/device/standingBook/components/addRow.vue
+++ b/src/views/device/standingBook/components/addRow.vue
@@ -5,7 +5,7 @@
 import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
+const formLabelWidth = '110px'
 const form = ref({})
 const formTable = ref([
   {
@@ -91,108 +91,188 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`">
+  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
     >
       <div v-if="name === '周检记录'">
-        <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录表编号" />
-        </el-form-item>
-        <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录人" />
-        </el-form-item>
-        <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="检定日期"
-          />
-        </el-form-item>
-        <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="有效日期"
-          />
-        </el-form-item>
-        <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="送检人" />
-        </el-form-item>
-        <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录表编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="检定日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="有效日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="送检人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '状态变更记录'">
-        <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="状态类型" clearable>
-            <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="结束日期"
-          />
-        </el-form-item>
-        <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="申请人" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="状态类型" clearable style="width: 100%;">
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="申请人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '使用记录'">
-        <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用人" />
-        </el-form-item>
-        <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用部门" />
-        </el-form-item>
-        <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="使用类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用结束日期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用部门" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="使用类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '检定证书'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="证书类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书出具日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书有效期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
     </el-form>
     <template #footer>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 5f7b347..9a9f798 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -352,7 +352,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -376,7 +376,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -391,7 +391,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -404,14 +404,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -434,7 +434,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -443,20 +443,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -480,23 +480,23 @@
               <com-tree-select
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -507,10 +507,10 @@
             <el-form-item label="检定部门" prop="mesureDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -520,7 +520,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -529,13 +529,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -544,21 +544,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -578,14 +578,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -594,14 +594,14 @@
         <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-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -669,7 +669,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index fc3fd54..d9d4514 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -199,6 +199,8 @@
     useDeptList.value = toTreeList(res.data, '0', true)
   })
 }
+const selectTreeRef1 = ref()
+const selectTreeRef2 = ref()
 // 重置
 const resetDATA = () => {
   ruleForm.value = {
@@ -254,6 +256,10 @@
     isStandardSupportEquipment: '', //		是否标准配套设备
     id: '',
   }
+  if (title.value !== '详情') {
+    selectTreeRef1.value.clearSelected()
+    selectTreeRef2.value.clearSelected()
+  }
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
@@ -378,7 +384,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -402,7 +408,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -416,8 +422,7 @@
             <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"
+                :placeholder="title === '详情' ? '' : '出厂年月'" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -430,14 +435,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -460,7 +465,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -469,20 +474,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -505,24 +510,26 @@
             <el-form-item label="使用部门" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
+                ref="selectTreeRef2"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -536,10 +543,12 @@
               </el-select> -->
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                ref="selectTreeRef1"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -549,7 +558,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -558,13 +567,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -573,21 +582,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -607,14 +616,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -624,14 +633,14 @@
           <el-col :span="6">
             <el-form-item label="资本来源" prop="capitalSource">
               <!-- <el-input v-model.trim="ruleForm.capitalSource" placeholder="资本来源" :disabled="title === '详情'" /> -->
-              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -699,7 +708,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f653095..f4229a6 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -147,19 +147,17 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
-  setTimeout(() => {
-    list.value = [
-      {
-        equipmentNo: 123,
-        equipmentName: 'test',
-        modelNo: '001',
-        usePersonName: '张三',
-        validDate: '2022-12-12 00:00:00',
-        useDeptName: '顶级',
-      },
-    ]
-    total.value = 1
-  }, 1000)
+  list.value = [
+    {
+      equipmentNo: 123,
+      equipmentName: 'test',
+      modelNo: '001',
+      usePersonName: '张三',
+      validDate: '2022-12-12 00:00:00',
+      useDeptName: '顶级',
+    },
+  ] as any
+  total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -220,9 +218,11 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -300,13 +300,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.mesureType" class="m-2 normal-select" placeholder="检定方式" clearable>
+          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable>
             <el-option
               v-for="item in mesureTypeList"
               :key="item.id"
@@ -316,7 +316,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.managerState" class="m-2 normal-select" placeholder="管理状态" clearable>
+          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable>
             <el-option
               v-for="item in managerStateList"
               :key="item.id"
@@ -327,8 +327,9 @@
         </search-item>
         <search-item>
           <com-tree-select
+            ref="selectTreeRef"
             v-model="searchQuery.useDept" :options="useDeptList" placeholder="使用部门"
-            :tree-props="deptProps" style="width: 150px;"
+            :tree-props="deptProps"
           />
         </search-item>
         <search-item>
@@ -336,11 +337,10 @@
             v-model="searchQuery.validDate" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="有效日期"
             class="normal-date"
-            style="width: 150px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.abc" class="m-2 normal-select" placeholder="ABC" clearable>
+          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable>
             <el-option
               v-for="item in abcList"
               :key="item.id"
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 78a3800..4c31a94 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -2,9 +2,10 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/fixedAssetsAdd.vue'
-import type { fixedAssetsType } from './standingBook-interface'
+import type { fixedAssetsType, selectType } from './standingBook-interface'
 import { exportFile } from '@/utils/exportUtils'
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
+import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   assetNo: '', // 固定编号
@@ -50,7 +51,7 @@
   },
   {
     text: '设备类型',
-    value: 'assetTypeName',
+    value: 'equipmentTypeName',
     width: '150',
     align: 'center',
   },
@@ -102,6 +103,7 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+const equipmentCategoryList = ref<selectType[]>([]) // 设备类别
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
@@ -242,6 +244,10 @@
 }
 onMounted(() => {
   getList()
+  // 获取设备类别
+  getDictByCode('equipmentCategory').then((response) => {
+    equipmentCategoryList.value = response.data
+  })
 })
 </script>
 
@@ -265,7 +271,10 @@
           <el-input v-model="searchQuery.equipmentSpecifications" placeholder="设备规格" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-select v-model="searchQuery.equipmentCategory" placeholder="设备类别" clearable>
+            <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+          </el-select>
         </search-item>
       </search-area>
       <table-container>
diff --git a/src/views/device/stateManage/components/addRow.vue b/src/views/device/stateManage/components/addRow.vue
new file mode 100644
index 0000000..3ba82d6
--- /dev/null
+++ b/src/views/device/stateManage/components/addRow.vue
@@ -0,0 +1,160 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { listPageApi } from '@/api/device/standingBook'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  limit: 10,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '出厂编号',
+    value: 'manufacturingNo',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+  },
+])
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listPageApi(listQuery.value as any).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map(item => ({ ...item, checked: '' }))
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    equipmentName: '', // 姓名
+    equipmentNo: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const checkedArr = list.value.filter(item => item.checked !== '')
+  if (checkedArr.length) {
+    console.log(checkedArr, '选中的设备')
+    emits('add', checkedArr)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择设备')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns as any" :query="listQuery"
+        :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-checkbox v-model="scope.row.checked" :label="scope.$index" size="large" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-checkbox__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index 56417d6..214876c 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -47,38 +47,45 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="30%">
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
-      :rules="rules"
+      :rules="rules" label-width="110px"
     >
-      <el-form-item label="审批意见">
-        <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
-        <el-radio-group v-model="form.radio">
-          <el-radio label="1">
-            同意
-          </el-radio>
-          <el-radio label="2">
-            拒绝
-          </el-radio>
-          <el-radio label="3">
-            驳回
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="审批结论">
-        <el-input
-          :rows="4"
-          type="textarea"
-        />
-      </el-form-item>
       <el-row :gutter="24">
-        <el-col :span="10">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="审批人">
             <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
-        <el-col :span="14">
+        <el-col :span="12">
           <el-form-item label="审批时间">
             <el-input disabled :value="approvetime" />
           </el-form-item>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index e74d70e..2003e31 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -1,7 +1,8 @@
 <!-- 新增或详情弹窗 -->
-<script lang="ts" setup name="addNotice">
+<script lang="ts" setup name="add">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
+import addRow from './addRow.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
@@ -16,6 +17,7 @@
 const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const name = ref('')
+const borrowList = ref([])
 const ruleForm = ref({
   assetNo: '', // 资产编号
   assetType: '', // 资产类型
@@ -357,10 +359,86 @@
     isShowCalibration.value = true
   }
 })
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerLevelName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+  },
+])
+const addRowRef = ref()
+// 添加行
+const addRowBtn = () => {
+  addRowRef.value.initDialog({ title: '添加' })
+}
+// 删除行
+const removeRowBtn = () => {
+  const removeArr = borrowList.value.filter(item => item.remove !== '')
+  if (removeArr.length) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      borrowList.value = borrowList.value.filter(item => item.remove === '')
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 借用设备列表添加
+const addRowMethods = (row) => {
+  row.forEach((element) => {
+    borrowList.value.push({ ...element, remove: '' })
+  })
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
     <detail-page :title="`${name}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
@@ -378,15 +456,16 @@
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder="">
+              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -430,7 +509,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -454,28 +533,56 @@
         </el-row>
       </el-form>
     </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>
+    <div>
+      <detail-block title="借用设备列表">
+        <template #btns>
+          <el-button type="primary" @click="addRowBtn">
+            添加行
+          </el-button>
+          <el-button type="info" @click="removeRowBtn">
+            删除行
+          </el-button>
+        </template>
+        <normal-table
+          :data="borrowList" :total="1" :columns="columns as any"
+        >
+          <template #preColumns>
+            <el-table-column label="选择" width="55" align="center">
+              <template #default="scope">
+                <el-checkbox v-model="scope.row.remove" :label="scope.$index" size="large" />
+              </template>
+            </el-table-column>
+            <el-table-column label="序号" width="60" align="center">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </detail-block>
+      <detail-block 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>
+    </div>
   </app-container>
 </template>
 
@@ -484,6 +591,10 @@
   background-color: #fff;
 }
 
+:deep(.el-checkbox__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,
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index aaaaf61..d588b8d 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,6 +1,7 @@
 <script lang="ts" setup name="bench">
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
+import type { trainLogStatistic } from './bench-interface'
 import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
 import { getPlanList } from '@/api/system/plan'
 import { listPageApi } from '@/api/measure/file'
@@ -132,15 +133,19 @@
     account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
+    const result: trainLogStatistic = res.data
+    const notQualified: number = Number(result.trainCount) - result.qualifiedCount
+    const qualifiedRate = ((result.qualifiedCount / result.trainCount) * 100).toFixed(2) // 合格率
+    const notQualifiedRate = ((notQualified / result.trainCount) * 100).toFixed(2) // 不合格率
     TrainLogSList.value = [
-      { name: `合格     ${res.data.qualified}-${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
-      { name: `不合格   ${res.data.notQualified}- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+      { name: `合   格   ${result.qualifiedCount}-${qualifiedRate}%`, value: result.qualifiedCount },
+      { name: `不合格   ${notQualified}- ${notQualifiedRate}%`, value: notQualified },
     ]
     TrainLogTitle.value = res.data.trainCount
   }).catch((_) => {
     // 处理异常
     TrainLogSList.value = [
-      { name: '合格     0 - 50%', value: 0 },
+      { name: '合   格   0 - 50%', value: 0 },
       { name: '不合格   0 - 50%', value: 0 },
     ]
     TrainLogTitle.value = 0
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 9ef0b93..1ad577b 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -270,7 +270,7 @@
               <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="6">
             <el-form-item label="名称" prop="fileName">
               <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
             </el-form-item>
@@ -279,13 +279,14 @@
         <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" class="fill-input" disabled>
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled style="width: 100%;">
                 <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="请选择发布单位"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -295,6 +296,7 @@
                 v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -311,12 +313,13 @@
                 v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人" prop="createUserId">
-              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index b45fbc3..542b284 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -26,7 +26,7 @@
   createUser: '', // 创建人
   createTime: '', // 创建
   approvalStatus: props.value, // 审批状态
-  limit: 10,
+  limit: 20,
   offset: 1,
   fileType: '', // 类型
   formId: '',
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 7d4724b..e54ddf5 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -26,7 +26,7 @@
   fileCode: '', // 文件号
   effectiveTime: '', // 实施时间
   effectiveStatus: '', // 实施状态
-  limit: 10,
+  limit: 20,
   offset: 1,
   fileType: '', // 类型
 }) // 查询参数
@@ -75,13 +75,19 @@
 const getStatus = () => {
   getDictByCode('effectiveStatus').then((res) => {
     if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
+      effectiveStatusSelect.value = [...res.data, { name: '全部', value: '', id: 'quanbu' }]
     }
   })
 }
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.publishTime) {
+    searchQuery.publishTime = ''
+  }
+  if (!searchQuery.effectiveTime) {
+    searchQuery.effectiveTime = ''
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -252,13 +258,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" />
         </search-item>
         <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
@@ -274,20 +280,16 @@
           <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: 185px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
             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: 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" placeholder="实施状态" clearable>
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index 5ca3275..a95c665 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -505,21 +505,21 @@
         <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] === '详情'" @change="directorChange">
+              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;" @change="directorChange">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.name" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
-              <el-select v-model="ruleForm.technologyJob" :placeholder="title.split('-')[2] === '详情' ? '' : '技术职务'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.technologyJob" :placeholder="title.split('-')[2] === '详情' ? '' : '技术职务'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;">
                 <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="administrationJob">
-              <el-select v-model="ruleForm.administrationJob" :placeholder="title.split('-')[2] === '详情' ? '' : '行政职务'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.administrationJob" :placeholder="title.split('-')[2] === '详情' ? '' : '行政职务'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index aac1ef2..11d6d0a 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -22,7 +22,7 @@
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
-  limit: 10,
+  limit: 20,
   offset: 1,
   organizeType: '', // 类型
   createTime: '', // 创建时间
@@ -118,6 +118,9 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.createTime) {
+    searchQuery.createTime = ''
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows.map(item => ({ ...item, createTime: item.createTime.split(' ')[0] }))
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 3f472eb..bc5d9d4 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -7,7 +7,9 @@
 // import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
-import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+// import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const props = defineProps({
   isRemind: {
     type: Boolean,
@@ -78,11 +80,14 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 // 获取所有部门
-const deptList = ref<DeptTreeNode[]>([])
+const deptList = ref([])
 const getDeptList = async () => {
   getDeptTreeList().then((res) => {
-    deptList.value = res.data
+    deptList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
@@ -177,6 +182,7 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   searchQuery.staffNo = ''
@@ -184,6 +190,7 @@
   searchQuery.deptId = ''
   searchQuery.certificateStatus = ''
   searchQuery.verifierCertificateNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -212,10 +219,6 @@
     loading.close()
   })
 }
-// 打印
-const print = () => {
-
-}
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传图片
@@ -268,20 +271,24 @@
           <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+          <!-- <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
             <el-option
               v-for="item in deptList"
               :key="item.id"
               :label="item.name"
               :value="item.id"
             />
-          </el-select>
+          </el-select> -->
+          <com-tree-select
+            ref="selectTreeRef" v-model="searchQuery.deptId" :options="deptList"
+            placeholder="工作部门" :tree-props="deptProps"
+          />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况">
+          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况" clearable>
             <el-option
               v-for="item in certificateStatusList"
               :key="item.id"
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 4352604..5a5f036 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -389,10 +389,10 @@
           关闭
         </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">
-            <el-form-item prop="minioFileName" label-width="70px">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item prop="minioFileName">
               <el-upload
                 class="avatar-uploader"
                 :show-file-list="false"
@@ -423,23 +423,24 @@
               <el-date-picker
                 v-model="ruleForm.birthday" type="date" format="YYYY-MM" value-format="YYYY-MM"
                 placeholder="出生年月" :disabled="title === '详情'"
+                style="width: 100%;"
               />
             </el-form-item>
             <el-form-item label="工作部门" prop="deptId" class="marg-item">
-              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled>
+              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled style="width: 100%;">
                 <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="ruleForm.deptId" :options="PubListTree"
-                placeholder="选择组织机构" :tree-props="deptProps"
+                placeholder="选择组织机构" :tree-props="deptProps" style="width: 100%;"
               />
             </el-form-item>
             <el-form-item label="计量专业" prop="major" class="marg-item">
               <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
             </el-form-item>
             <el-form-item label="是否特操人" prop="specialOperator" class="marg-item">
-              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -449,23 +450,23 @@
               <el-input v-model.trim="ruleForm.staffNo" placeholder="系统自动生成" disabled />
             </el-form-item>
             <el-form-item label="性别" prop="sex" class="marg-item">
-              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="技术职务" prop="technologyJob" class="marg-item">
-              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="从事日期" prop="workDate" class="marg-item">
               <el-date-picker
                 v-model="ruleForm.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-                placeholder="请选择从事日期"
+                placeholder="请选择从事日期" style="width: 100%;"
               />
             </el-form-item>
-            <el-form-item label="是否技术考核" prop="technologyExam" class="marg-item">
-              <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'">
+            <el-form-item label="是否技术考核" prop="technologyExam" class="marg-item" style="width: 100%;">
+              <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -475,17 +476,17 @@
               <el-input ref="cardRef" v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" @blur="getBirthday" />
             </el-form-item>
             <el-form-item label="文化程度" prop="education" class="marg-item">
-              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="行政职务" prop="administrationJob" class="marg-item">
-              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="是否主考人" prop="mainExaminer" class="marg-item">
-              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index 042636e..660f2b0 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -264,7 +264,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="性别" prop="meterStaff.sex">
-              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -273,21 +273,21 @@
         <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-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -296,7 +296,7 @@
         <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-select v-if="title === '详情'" v-model="meterStaff.deptId" disabled style="width: 100%;">
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
               <com-tree-select
@@ -304,6 +304,7 @@
                 ref="selectTreeRef" v-model="meterStaff.deptId" :options="PubListTree"
                 placeholder="选择组织机构"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -316,7 +317,7 @@
             <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="请选择从事日期"
+                placeholder="请选择从事日期" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -347,7 +348,7 @@
             <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="请选择发证日期"
+                placeholder="请选择发证日期" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -355,7 +356,7 @@
             <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="请选择有效日期"
+                placeholder="请选择有效日期" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 178fc12..d0116f3 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -3,7 +3,7 @@
 import type { FormInstance, FormRules } from 'element-plus'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
+const formLabelWidth = '110px'
 const form = reactive({
   certificateNo: '', // 证书号
   certificateName: '', // 证书名称
@@ -71,32 +71,52 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`" width="40%">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
     >
-      <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
-        <el-input v-model="form.certificateNo" placeholder="证书号" />
-      </el-form-item>
-      <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
-        <el-input v-model="form.certificateName" placeholder="证书名称" />
-      </el-form-item>
-      <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
-        <el-input v-model="form.certificateCompany" placeholder="发证单位" />
-      </el-form-item>
-      <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
-        <el-date-picker
-          v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择发证日期"
-        />
-      </el-form-item>
-      <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-        <el-date-picker
-          v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择有效日期"
-        />
-      </el-form-item>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
+            <el-input v-model="form.certificateNo" placeholder="证书号" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
+            <el-input v-model="form.certificateName" placeholder="证书名称" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
+            <el-input v-model="form.certificateCompany" placeholder="发证单位" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
+            <el-date-picker
+              v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择发证日期" style="width: 100%;"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+            <el-date-picker
+              v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择有效日期" style="width: 100%;"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <template #footer>
       <span class="dialog-footer">
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
index 5e20d1b..10b0deb 100644
--- a/src/views/measure/person/components/personListDialog.vue
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -1,8 +1,11 @@
 <!-- 计量人员列表弹窗 -->
 <script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
 import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import { getDeptTreeList } from '@/api/system/dept'
-import type { TreeStructure } from '@/views/system/user/user-interface'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -10,7 +13,7 @@
   staffNo: '', // 人员编号
   name: '', // 姓名
   deptId: '', // 所在部门
-  limit: 5,
+  limit: 10,
   offset: 1,
 })
 const loadingTable = ref<boolean>(false)
@@ -32,20 +35,22 @@
   },
 ])
 // 获取部门
-const deptIdList = ref<TreeStructure[]>([])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const deptIdList = ref([])
 const getDeptList = () => {
   getDeptTreeList().then((res) => {
-    deptIdList.value = res.data
+    deptIdList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
 const fetchData = () => {
-  select.value = ''
+  select.value = -1
   getStaffList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.records
       total.value = Number(res.data.total)
-      console.log(list.value, 'list')
     }
   })
 }
@@ -53,6 +58,7 @@
 const search = () => {
   fetchData()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   listQuery.value = {
@@ -62,6 +68,7 @@
     limit: 10,
     offset: 1,
   }
+  selectTreeRef.value.clearSelected()
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -76,18 +83,24 @@
 }
 // 点击保存
 const submitForm = () => {
-  const person = list.value.filter((item, index) => index == select.value)[0]
-  console.log(person, 'person')
-  getStaffDetail(person).then((res) => {
-    if (res.code === 200) {
-      emits('add', res.data)
-      dialogFormVisible.value = false
-    }
-  })
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    getStaffDetail(person).then((res) => {
+      if (res.code === 200) {
+        emits('add', res.data)
+        dialogFormVisible.value = false
+        reset()
+      }
+    })
+  }
+  else {
+    ElMessage.warning('请先选择人员')
+  }
 }
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
+  reset()
 }
 // 初始化
 const initDialog = () => {
@@ -99,39 +112,45 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员" width="50%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable style="width: 150px;" />
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable style="width: 150px;" />
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
+        <!-- <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
           <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
+        </el-select> -->
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
-    <normal-table
-      :data="list" :total="total" :columns="columns" :query="listQuery"
-      :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>
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :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">
             {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
           </template>
         </el-table-column> -->
-      </template>
-    </normal-table>
+        </template>
+      </normal-table>
+    </div>
     <template #footer>
       <span class="dialog-footer">
         <el-button type="primary" @click="submitForm">确认</el-button>

diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index bb58885..2959118 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -53,3 +53,64 @@
   }
   return true
 }
+
+/**
+ * 验证小写字母
+ * @param str
+ * @returns
+ */
+export function validateLowerCase(str: string) {
+  const reg = /^[a-z]+$/
+  return reg.test(str)
+}
+
+/* 验证大写字母 */
+export function validateUpperCase(str: string) {
+  const reg = /^[A-Z]+$/
+  return reg.test(str)
+}
+
+/* 验证大小写字母 */
+export function validateAlphabets(str: string) {
+  const reg = /^[A-Za-z]+$/
+  return reg.test(str)
+}
+
+/**
+ * 验证邮箱
+ * @param email
+ * @returns {boolean}
+ */
+export function validateEmail(email: string) {
+  const re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
+  return re.test(email)
+}
+
+/**
+ * 验证手机号
+ * @param phone
+ * @returns {boolean}
+ */
+export function validateMobile(phone: string) {
+  const re = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/
+  return re.test(phone)
+}
+
+/**
+ * 校验身份证号
+ * @param value
+ * @returns
+ */
+export function validateIdCardNo(value: string) {
+  const re = /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/
+  return re.test(value)
+}
+/**
+ *
+ * @param value 验证电话号码
+ * @returns
+ */
+export function validatePhone(value: string) {
+  const re = /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/
+  return re.test(value)
+}
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 1c2405e..bca0958 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,13 +1,46 @@
-<script lang="ts" setup name="borrowHandle">
-// 逻辑代码
+<!-- 设备借用处理 -->
+<script lang="ts" setup name="borrowApply">
+import list from './components/handleList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '待借用', comp: list },
+  { name: '已借用', comp: list },
+  { name: '已归还', comp: list },
+])
+const current = ref('待借用')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用处理
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 03d414b..c5771f7 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,13 +1,50 @@
+<!-- 设备借用申请 -->
 <script lang="ts" setup name="borrowApply">
-// 逻辑代码
+import list from './components/applyList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '全部', comp: list },
+  { name: '草稿箱', comp: list },
+  { name: '待审批', comp: list },
+  { name: '审批中', comp: list },
+  { name: '已通过', comp: list },
+  { name: '未通过', comp: list },
+  { name: '已取消', comp: list },
+])
+const current = ref('全部')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用申请
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
new file mode 100644
index 0000000..052f3ce
--- /dev/null
+++ b/src/views/device/borrow/components/applyList.vue
@@ -0,0 +1,328 @@
+<script lang="ts" setup name="borrowApplyList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '文件号',
+    value: 'fileNo',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '类别',
+    value: 'catergory',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '李四',
+      time: '2020-12-14 00:00:00',
+      status: '未通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const approveRef = ref()
+// 同意
+const agree = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '1',
+  })
+}
+// 驳回
+const reject = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '3',
+  })
+}
+// 拒绝
+const refuse = (row: any) => {
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
+}
+// 取消
+const cancel = (rowrow: any) => {
+  ElMessageBox.confirm(
+    '确认取消吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" @click="addBtn" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="agree(row)">
+                  同意
+                </el-button>
+                <el-button size="small" type="primary" link @click="reject(row)">
+                  驳回
+                </el-button>
+                <el-button size="small" type="primary" link @click="refuse(row)">
+                  拒绝
+                </el-button>
+                <el-button size="small" type="primary" link @click="cancel(row)">
+                  取消
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/components/approvalActionDialog.vue b/src/views/device/borrow/components/approvalActionDialog.vue
new file mode 100644
index 0000000..214876c
--- /dev/null
+++ b/src/views/device/borrow/components/approvalActionDialog.vue
@@ -0,0 +1,104 @@
+<!-- 审批操作弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
+const dialogVisibleApprove = ref(false)
+const form = reactive({
+  radio: '1',
+})
+const ruleFormRef = ref<FormInstance>()
+const rules = reactive<FormRules>({
+})
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const approvetime = ref('') // 审批时间
+const initDialog = (row: any) => {
+  dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
+}
+defineExpose({ initDialog })
+
+// 点击保存
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      dialogVisibleApprove.value = false
+      emits('resetData')
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  formEl.resetFields()
+  dialogVisibleApprove.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
+    <el-form
+      ref="ruleFormRef" :model="form"
+      :rules="rules" label-width="110px"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人">
+            <el-input disabled :value="userInfo.$state.name" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间">
+            <el-input disabled :value="approvetime" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
+        <el-button @click="resetForm(ruleFormRef)">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
new file mode 100644
index 0000000..cfda00a
--- /dev/null
+++ b/src/views/device/borrow/components/handleList.vue
@@ -0,0 +1,281 @@
+<script lang="ts" setup name="borrowHandleList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '申请编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'dept',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      dept: '顶级',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      dept: '徐州分中心',
+      user: '里斯',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+const borrow = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="borrow(row)">
+                  借用
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/addRow.vue b/src/views/device/standingBook/components/addRow.vue
index 1678cdb..07b03d1 100644
--- a/src/views/device/standingBook/components/addRow.vue
+++ b/src/views/device/standingBook/components/addRow.vue
@@ -5,7 +5,7 @@
 import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
+const formLabelWidth = '110px'
 const form = ref({})
 const formTable = ref([
   {
@@ -91,108 +91,188 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`">
+  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
     >
       <div v-if="name === '周检记录'">
-        <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录表编号" />
-        </el-form-item>
-        <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录人" />
-        </el-form-item>
-        <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="检定日期"
-          />
-        </el-form-item>
-        <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="有效日期"
-          />
-        </el-form-item>
-        <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="送检人" />
-        </el-form-item>
-        <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录表编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="检定日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="有效日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="送检人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '状态变更记录'">
-        <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="状态类型" clearable>
-            <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="结束日期"
-          />
-        </el-form-item>
-        <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="申请人" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="状态类型" clearable style="width: 100%;">
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="申请人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '使用记录'">
-        <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用人" />
-        </el-form-item>
-        <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用部门" />
-        </el-form-item>
-        <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="使用类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用结束日期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用部门" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="使用类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '检定证书'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="证书类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书出具日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书有效期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
     </el-form>
     <template #footer>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 5f7b347..9a9f798 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -352,7 +352,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -376,7 +376,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -391,7 +391,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -404,14 +404,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -434,7 +434,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -443,20 +443,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -480,23 +480,23 @@
               <com-tree-select
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -507,10 +507,10 @@
             <el-form-item label="检定部门" prop="mesureDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -520,7 +520,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -529,13 +529,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -544,21 +544,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -578,14 +578,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -594,14 +594,14 @@
         <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-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -669,7 +669,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index fc3fd54..d9d4514 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -199,6 +199,8 @@
     useDeptList.value = toTreeList(res.data, '0', true)
   })
 }
+const selectTreeRef1 = ref()
+const selectTreeRef2 = ref()
 // 重置
 const resetDATA = () => {
   ruleForm.value = {
@@ -254,6 +256,10 @@
     isStandardSupportEquipment: '', //		是否标准配套设备
     id: '',
   }
+  if (title.value !== '详情') {
+    selectTreeRef1.value.clearSelected()
+    selectTreeRef2.value.clearSelected()
+  }
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
@@ -378,7 +384,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -402,7 +408,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -416,8 +422,7 @@
             <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"
+                :placeholder="title === '详情' ? '' : '出厂年月'" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -430,14 +435,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -460,7 +465,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -469,20 +474,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -505,24 +510,26 @@
             <el-form-item label="使用部门" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
+                ref="selectTreeRef2"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -536,10 +543,12 @@
               </el-select> -->
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                ref="selectTreeRef1"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -549,7 +558,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -558,13 +567,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -573,21 +582,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -607,14 +616,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -624,14 +633,14 @@
           <el-col :span="6">
             <el-form-item label="资本来源" prop="capitalSource">
               <!-- <el-input v-model.trim="ruleForm.capitalSource" placeholder="资本来源" :disabled="title === '详情'" /> -->
-              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -699,7 +708,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f653095..f4229a6 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -147,19 +147,17 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
-  setTimeout(() => {
-    list.value = [
-      {
-        equipmentNo: 123,
-        equipmentName: 'test',
-        modelNo: '001',
-        usePersonName: '张三',
-        validDate: '2022-12-12 00:00:00',
-        useDeptName: '顶级',
-      },
-    ]
-    total.value = 1
-  }, 1000)
+  list.value = [
+    {
+      equipmentNo: 123,
+      equipmentName: 'test',
+      modelNo: '001',
+      usePersonName: '张三',
+      validDate: '2022-12-12 00:00:00',
+      useDeptName: '顶级',
+    },
+  ] as any
+  total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -220,9 +218,11 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -300,13 +300,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.mesureType" class="m-2 normal-select" placeholder="检定方式" clearable>
+          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable>
             <el-option
               v-for="item in mesureTypeList"
               :key="item.id"
@@ -316,7 +316,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.managerState" class="m-2 normal-select" placeholder="管理状态" clearable>
+          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable>
             <el-option
               v-for="item in managerStateList"
               :key="item.id"
@@ -327,8 +327,9 @@
         </search-item>
         <search-item>
           <com-tree-select
+            ref="selectTreeRef"
             v-model="searchQuery.useDept" :options="useDeptList" placeholder="使用部门"
-            :tree-props="deptProps" style="width: 150px;"
+            :tree-props="deptProps"
           />
         </search-item>
         <search-item>
@@ -336,11 +337,10 @@
             v-model="searchQuery.validDate" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="有效日期"
             class="normal-date"
-            style="width: 150px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.abc" class="m-2 normal-select" placeholder="ABC" clearable>
+          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable>
             <el-option
               v-for="item in abcList"
               :key="item.id"
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 78a3800..4c31a94 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -2,9 +2,10 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/fixedAssetsAdd.vue'
-import type { fixedAssetsType } from './standingBook-interface'
+import type { fixedAssetsType, selectType } from './standingBook-interface'
 import { exportFile } from '@/utils/exportUtils'
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
+import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   assetNo: '', // 固定编号
@@ -50,7 +51,7 @@
   },
   {
     text: '设备类型',
-    value: 'assetTypeName',
+    value: 'equipmentTypeName',
     width: '150',
     align: 'center',
   },
@@ -102,6 +103,7 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+const equipmentCategoryList = ref<selectType[]>([]) // 设备类别
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
@@ -242,6 +244,10 @@
 }
 onMounted(() => {
   getList()
+  // 获取设备类别
+  getDictByCode('equipmentCategory').then((response) => {
+    equipmentCategoryList.value = response.data
+  })
 })
 </script>
 
@@ -265,7 +271,10 @@
           <el-input v-model="searchQuery.equipmentSpecifications" placeholder="设备规格" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-select v-model="searchQuery.equipmentCategory" placeholder="设备类别" clearable>
+            <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+          </el-select>
         </search-item>
       </search-area>
       <table-container>
diff --git a/src/views/device/stateManage/components/addRow.vue b/src/views/device/stateManage/components/addRow.vue
new file mode 100644
index 0000000..3ba82d6
--- /dev/null
+++ b/src/views/device/stateManage/components/addRow.vue
@@ -0,0 +1,160 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { listPageApi } from '@/api/device/standingBook'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  limit: 10,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '出厂编号',
+    value: 'manufacturingNo',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+  },
+])
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listPageApi(listQuery.value as any).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map(item => ({ ...item, checked: '' }))
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    equipmentName: '', // 姓名
+    equipmentNo: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const checkedArr = list.value.filter(item => item.checked !== '')
+  if (checkedArr.length) {
+    console.log(checkedArr, '选中的设备')
+    emits('add', checkedArr)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择设备')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns as any" :query="listQuery"
+        :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-checkbox v-model="scope.row.checked" :label="scope.$index" size="large" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-checkbox__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index 56417d6..214876c 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -47,38 +47,45 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="30%">
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
-      :rules="rules"
+      :rules="rules" label-width="110px"
     >
-      <el-form-item label="审批意见">
-        <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
-        <el-radio-group v-model="form.radio">
-          <el-radio label="1">
-            同意
-          </el-radio>
-          <el-radio label="2">
-            拒绝
-          </el-radio>
-          <el-radio label="3">
-            驳回
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="审批结论">
-        <el-input
-          :rows="4"
-          type="textarea"
-        />
-      </el-form-item>
       <el-row :gutter="24">
-        <el-col :span="10">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="审批人">
             <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
-        <el-col :span="14">
+        <el-col :span="12">
           <el-form-item label="审批时间">
             <el-input disabled :value="approvetime" />
           </el-form-item>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index e74d70e..2003e31 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -1,7 +1,8 @@
 <!-- 新增或详情弹窗 -->
-<script lang="ts" setup name="addNotice">
+<script lang="ts" setup name="add">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
+import addRow from './addRow.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
@@ -16,6 +17,7 @@
 const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const name = ref('')
+const borrowList = ref([])
 const ruleForm = ref({
   assetNo: '', // 资产编号
   assetType: '', // 资产类型
@@ -357,10 +359,86 @@
     isShowCalibration.value = true
   }
 })
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerLevelName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+  },
+])
+const addRowRef = ref()
+// 添加行
+const addRowBtn = () => {
+  addRowRef.value.initDialog({ title: '添加' })
+}
+// 删除行
+const removeRowBtn = () => {
+  const removeArr = borrowList.value.filter(item => item.remove !== '')
+  if (removeArr.length) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      borrowList.value = borrowList.value.filter(item => item.remove === '')
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 借用设备列表添加
+const addRowMethods = (row) => {
+  row.forEach((element) => {
+    borrowList.value.push({ ...element, remove: '' })
+  })
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
     <detail-page :title="`${name}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
@@ -378,15 +456,16 @@
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder="">
+              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -430,7 +509,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -454,28 +533,56 @@
         </el-row>
       </el-form>
     </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>
+    <div>
+      <detail-block title="借用设备列表">
+        <template #btns>
+          <el-button type="primary" @click="addRowBtn">
+            添加行
+          </el-button>
+          <el-button type="info" @click="removeRowBtn">
+            删除行
+          </el-button>
+        </template>
+        <normal-table
+          :data="borrowList" :total="1" :columns="columns as any"
+        >
+          <template #preColumns>
+            <el-table-column label="选择" width="55" align="center">
+              <template #default="scope">
+                <el-checkbox v-model="scope.row.remove" :label="scope.$index" size="large" />
+              </template>
+            </el-table-column>
+            <el-table-column label="序号" width="60" align="center">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </detail-block>
+      <detail-block 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>
+    </div>
   </app-container>
 </template>
 
@@ -484,6 +591,10 @@
   background-color: #fff;
 }
 
+:deep(.el-checkbox__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,
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index aaaaf61..d588b8d 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,6 +1,7 @@
 <script lang="ts" setup name="bench">
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
+import type { trainLogStatistic } from './bench-interface'
 import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
 import { getPlanList } from '@/api/system/plan'
 import { listPageApi } from '@/api/measure/file'
@@ -132,15 +133,19 @@
     account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
+    const result: trainLogStatistic = res.data
+    const notQualified: number = Number(result.trainCount) - result.qualifiedCount
+    const qualifiedRate = ((result.qualifiedCount / result.trainCount) * 100).toFixed(2) // 合格率
+    const notQualifiedRate = ((notQualified / result.trainCount) * 100).toFixed(2) // 不合格率
     TrainLogSList.value = [
-      { name: `合格     ${res.data.qualified}-${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
-      { name: `不合格   ${res.data.notQualified}- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+      { name: `合   格   ${result.qualifiedCount}-${qualifiedRate}%`, value: result.qualifiedCount },
+      { name: `不合格   ${notQualified}- ${notQualifiedRate}%`, value: notQualified },
     ]
     TrainLogTitle.value = res.data.trainCount
   }).catch((_) => {
     // 处理异常
     TrainLogSList.value = [
-      { name: '合格     0 - 50%', value: 0 },
+      { name: '合   格   0 - 50%', value: 0 },
       { name: '不合格   0 - 50%', value: 0 },
     ]
     TrainLogTitle.value = 0
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 9ef0b93..1ad577b 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -270,7 +270,7 @@
               <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="6">
             <el-form-item label="名称" prop="fileName">
               <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
             </el-form-item>
@@ -279,13 +279,14 @@
         <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" class="fill-input" disabled>
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled style="width: 100%;">
                 <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="请选择发布单位"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -295,6 +296,7 @@
                 v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -311,12 +313,13 @@
                 v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人" prop="createUserId">
-              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index b45fbc3..542b284 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -26,7 +26,7 @@
   createUser: '', // 创建人
   createTime: '', // 创建
   approvalStatus: props.value, // 审批状态
-  limit: 10,
+  limit: 20,
   offset: 1,
   fileType: '', // 类型
   formId: '',
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 7d4724b..e54ddf5 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -26,7 +26,7 @@
   fileCode: '', // 文件号
   effectiveTime: '', // 实施时间
   effectiveStatus: '', // 实施状态
-  limit: 10,
+  limit: 20,
   offset: 1,
   fileType: '', // 类型
 }) // 查询参数
@@ -75,13 +75,19 @@
 const getStatus = () => {
   getDictByCode('effectiveStatus').then((res) => {
     if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
+      effectiveStatusSelect.value = [...res.data, { name: '全部', value: '', id: 'quanbu' }]
     }
   })
 }
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.publishTime) {
+    searchQuery.publishTime = ''
+  }
+  if (!searchQuery.effectiveTime) {
+    searchQuery.effectiveTime = ''
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -252,13 +258,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" />
         </search-item>
         <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
@@ -274,20 +280,16 @@
           <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: 185px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
             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: 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" placeholder="实施状态" clearable>
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index 5ca3275..a95c665 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -505,21 +505,21 @@
         <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] === '详情'" @change="directorChange">
+              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;" @change="directorChange">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.name" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
-              <el-select v-model="ruleForm.technologyJob" :placeholder="title.split('-')[2] === '详情' ? '' : '技术职务'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.technologyJob" :placeholder="title.split('-')[2] === '详情' ? '' : '技术职务'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;">
                 <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="administrationJob">
-              <el-select v-model="ruleForm.administrationJob" :placeholder="title.split('-')[2] === '详情' ? '' : '行政职务'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.administrationJob" :placeholder="title.split('-')[2] === '详情' ? '' : '行政职务'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index aac1ef2..11d6d0a 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -22,7 +22,7 @@
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
-  limit: 10,
+  limit: 20,
   offset: 1,
   organizeType: '', // 类型
   createTime: '', // 创建时间
@@ -118,6 +118,9 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.createTime) {
+    searchQuery.createTime = ''
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows.map(item => ({ ...item, createTime: item.createTime.split(' ')[0] }))
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 3f472eb..bc5d9d4 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -7,7 +7,9 @@
 // import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
-import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+// import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const props = defineProps({
   isRemind: {
     type: Boolean,
@@ -78,11 +80,14 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 // 获取所有部门
-const deptList = ref<DeptTreeNode[]>([])
+const deptList = ref([])
 const getDeptList = async () => {
   getDeptTreeList().then((res) => {
-    deptList.value = res.data
+    deptList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
@@ -177,6 +182,7 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   searchQuery.staffNo = ''
@@ -184,6 +190,7 @@
   searchQuery.deptId = ''
   searchQuery.certificateStatus = ''
   searchQuery.verifierCertificateNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -212,10 +219,6 @@
     loading.close()
   })
 }
-// 打印
-const print = () => {
-
-}
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传图片
@@ -268,20 +271,24 @@
           <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+          <!-- <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
             <el-option
               v-for="item in deptList"
               :key="item.id"
               :label="item.name"
               :value="item.id"
             />
-          </el-select>
+          </el-select> -->
+          <com-tree-select
+            ref="selectTreeRef" v-model="searchQuery.deptId" :options="deptList"
+            placeholder="工作部门" :tree-props="deptProps"
+          />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况">
+          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况" clearable>
             <el-option
               v-for="item in certificateStatusList"
               :key="item.id"
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 4352604..5a5f036 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -389,10 +389,10 @@
           关闭
         </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">
-            <el-form-item prop="minioFileName" label-width="70px">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item prop="minioFileName">
               <el-upload
                 class="avatar-uploader"
                 :show-file-list="false"
@@ -423,23 +423,24 @@
               <el-date-picker
                 v-model="ruleForm.birthday" type="date" format="YYYY-MM" value-format="YYYY-MM"
                 placeholder="出生年月" :disabled="title === '详情'"
+                style="width: 100%;"
               />
             </el-form-item>
             <el-form-item label="工作部门" prop="deptId" class="marg-item">
-              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled>
+              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled style="width: 100%;">
                 <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="ruleForm.deptId" :options="PubListTree"
-                placeholder="选择组织机构" :tree-props="deptProps"
+                placeholder="选择组织机构" :tree-props="deptProps" style="width: 100%;"
               />
             </el-form-item>
             <el-form-item label="计量专业" prop="major" class="marg-item">
               <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
             </el-form-item>
             <el-form-item label="是否特操人" prop="specialOperator" class="marg-item">
-              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -449,23 +450,23 @@
               <el-input v-model.trim="ruleForm.staffNo" placeholder="系统自动生成" disabled />
             </el-form-item>
             <el-form-item label="性别" prop="sex" class="marg-item">
-              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="技术职务" prop="technologyJob" class="marg-item">
-              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="从事日期" prop="workDate" class="marg-item">
               <el-date-picker
                 v-model="ruleForm.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-                placeholder="请选择从事日期"
+                placeholder="请选择从事日期" style="width: 100%;"
               />
             </el-form-item>
-            <el-form-item label="是否技术考核" prop="technologyExam" class="marg-item">
-              <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'">
+            <el-form-item label="是否技术考核" prop="technologyExam" class="marg-item" style="width: 100%;">
+              <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -475,17 +476,17 @@
               <el-input ref="cardRef" v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" @blur="getBirthday" />
             </el-form-item>
             <el-form-item label="文化程度" prop="education" class="marg-item">
-              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="行政职务" prop="administrationJob" class="marg-item">
-              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="是否主考人" prop="mainExaminer" class="marg-item">
-              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index 042636e..660f2b0 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -264,7 +264,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="性别" prop="meterStaff.sex">
-              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -273,21 +273,21 @@
         <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-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -296,7 +296,7 @@
         <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-select v-if="title === '详情'" v-model="meterStaff.deptId" disabled style="width: 100%;">
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
               <com-tree-select
@@ -304,6 +304,7 @@
                 ref="selectTreeRef" v-model="meterStaff.deptId" :options="PubListTree"
                 placeholder="选择组织机构"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -316,7 +317,7 @@
             <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="请选择从事日期"
+                placeholder="请选择从事日期" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -347,7 +348,7 @@
             <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="请选择发证日期"
+                placeholder="请选择发证日期" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -355,7 +356,7 @@
             <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="请选择有效日期"
+                placeholder="请选择有效日期" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 178fc12..d0116f3 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -3,7 +3,7 @@
 import type { FormInstance, FormRules } from 'element-plus'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
+const formLabelWidth = '110px'
 const form = reactive({
   certificateNo: '', // 证书号
   certificateName: '', // 证书名称
@@ -71,32 +71,52 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`" width="40%">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
     >
-      <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
-        <el-input v-model="form.certificateNo" placeholder="证书号" />
-      </el-form-item>
-      <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
-        <el-input v-model="form.certificateName" placeholder="证书名称" />
-      </el-form-item>
-      <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
-        <el-input v-model="form.certificateCompany" placeholder="发证单位" />
-      </el-form-item>
-      <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
-        <el-date-picker
-          v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择发证日期"
-        />
-      </el-form-item>
-      <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-        <el-date-picker
-          v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择有效日期"
-        />
-      </el-form-item>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
+            <el-input v-model="form.certificateNo" placeholder="证书号" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
+            <el-input v-model="form.certificateName" placeholder="证书名称" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
+            <el-input v-model="form.certificateCompany" placeholder="发证单位" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
+            <el-date-picker
+              v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择发证日期" style="width: 100%;"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+            <el-date-picker
+              v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择有效日期" style="width: 100%;"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <template #footer>
       <span class="dialog-footer">
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
index 5e20d1b..10b0deb 100644
--- a/src/views/measure/person/components/personListDialog.vue
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -1,8 +1,11 @@
 <!-- 计量人员列表弹窗 -->
 <script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
 import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import { getDeptTreeList } from '@/api/system/dept'
-import type { TreeStructure } from '@/views/system/user/user-interface'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -10,7 +13,7 @@
   staffNo: '', // 人员编号
   name: '', // 姓名
   deptId: '', // 所在部门
-  limit: 5,
+  limit: 10,
   offset: 1,
 })
 const loadingTable = ref<boolean>(false)
@@ -32,20 +35,22 @@
   },
 ])
 // 获取部门
-const deptIdList = ref<TreeStructure[]>([])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const deptIdList = ref([])
 const getDeptList = () => {
   getDeptTreeList().then((res) => {
-    deptIdList.value = res.data
+    deptIdList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
 const fetchData = () => {
-  select.value = ''
+  select.value = -1
   getStaffList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.records
       total.value = Number(res.data.total)
-      console.log(list.value, 'list')
     }
   })
 }
@@ -53,6 +58,7 @@
 const search = () => {
   fetchData()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   listQuery.value = {
@@ -62,6 +68,7 @@
     limit: 10,
     offset: 1,
   }
+  selectTreeRef.value.clearSelected()
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -76,18 +83,24 @@
 }
 // 点击保存
 const submitForm = () => {
-  const person = list.value.filter((item, index) => index == select.value)[0]
-  console.log(person, 'person')
-  getStaffDetail(person).then((res) => {
-    if (res.code === 200) {
-      emits('add', res.data)
-      dialogFormVisible.value = false
-    }
-  })
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    getStaffDetail(person).then((res) => {
+      if (res.code === 200) {
+        emits('add', res.data)
+        dialogFormVisible.value = false
+        reset()
+      }
+    })
+  }
+  else {
+    ElMessage.warning('请先选择人员')
+  }
 }
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
+  reset()
 }
 // 初始化
 const initDialog = () => {
@@ -99,39 +112,45 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员" width="50%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable style="width: 150px;" />
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable style="width: 150px;" />
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
+        <!-- <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
           <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
+        </el-select> -->
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
-    <normal-table
-      :data="list" :total="total" :columns="columns" :query="listQuery"
-      :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>
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :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">
             {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
           </template>
         </el-table-column> -->
-      </template>
-    </normal-table>
+        </template>
+      </normal-table>
+    </div>
     <template #footer>
       <span class="dialog-footer">
         <el-button type="primary" @click="submitForm">确认</el-button>
diff --git a/src/views/measure/person/components/userListDialog.vue b/src/views/measure/person/components/userListDialog.vue
index dcd05b5..cd62a73 100644
--- a/src/views/measure/person/components/userListDialog.vue
+++ b/src/views/measure/person/components/userListDialog.vue
@@ -3,14 +3,16 @@
 import { ElMessage } from 'element-plus'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
-import type { TreeStructure } from '@/views/system/user/user-interface'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
 const listQuery = ref({
   keywords: '', // 姓名
   deptId: '', // 所在部门
-  limit: 5,
+  limit: 10,
   offset: 1,
 })
 const loadingTable = ref<boolean>(false)
@@ -31,11 +33,14 @@
     value: 'deptName',
   },
 ])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 // 获取部门
-const deptIdList = ref<TreeStructure[]>([])
+const deptIdList = ref([])
 const getDeptList = () => {
   getDeptTreeList().then((res) => {
-    deptIdList.value = res.data
+    deptIdList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
@@ -52,6 +57,7 @@
 const search = () => {
   fetchData()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   listQuery.value = {
@@ -60,6 +66,7 @@
     limit: 10,
     offset: 1,
   }
+  selectTreeRef.value.clearSelected()
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -74,11 +81,11 @@
 }
 // 点击保存
 const submitForm = () => {
-  console.log(select.value)
   if (select.value >= 0) {
     const person = list.value.filter((item, index) => index == select.value)[0]
     emits('add', person)
     dialogFormVisible.value = false
+    reset()
   }
   else {
     ElMessage.warning('请先选择人员')
@@ -87,9 +94,11 @@
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
+  reset()
 }
 // 初始化
 const initDialog = () => {
+  // reset()
   dialogFormVisible.value = true
   getDeptList()
   fetchData()
@@ -98,16 +107,20 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+  <el-dialog v-model="dialogFormVisible" title="选择人员" width="50%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
         <el-input v-model.trim="listQuery.keywords" placeholder="真实姓名" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable>
+        <!-- <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable>
           <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
+        </el-select> -->
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->

diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index bb58885..2959118 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -53,3 +53,64 @@
   }
   return true
 }
+
+/**
+ * 验证小写字母
+ * @param str
+ * @returns
+ */
+export function validateLowerCase(str: string) {
+  const reg = /^[a-z]+$/
+  return reg.test(str)
+}
+
+/* 验证大写字母 */
+export function validateUpperCase(str: string) {
+  const reg = /^[A-Z]+$/
+  return reg.test(str)
+}
+
+/* 验证大小写字母 */
+export function validateAlphabets(str: string) {
+  const reg = /^[A-Za-z]+$/
+  return reg.test(str)
+}
+
+/**
+ * 验证邮箱
+ * @param email
+ * @returns {boolean}
+ */
+export function validateEmail(email: string) {
+  const re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
+  return re.test(email)
+}
+
+/**
+ * 验证手机号
+ * @param phone
+ * @returns {boolean}
+ */
+export function validateMobile(phone: string) {
+  const re = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/
+  return re.test(phone)
+}
+
+/**
+ * 校验身份证号
+ * @param value
+ * @returns
+ */
+export function validateIdCardNo(value: string) {
+  const re = /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/
+  return re.test(value)
+}
+/**
+ *
+ * @param value 验证电话号码
+ * @returns
+ */
+export function validatePhone(value: string) {
+  const re = /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/
+  return re.test(value)
+}
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 1c2405e..bca0958 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,13 +1,46 @@
-<script lang="ts" setup name="borrowHandle">
-// 逻辑代码
+<!-- 设备借用处理 -->
+<script lang="ts" setup name="borrowApply">
+import list from './components/handleList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '待借用', comp: list },
+  { name: '已借用', comp: list },
+  { name: '已归还', comp: list },
+])
+const current = ref('待借用')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用处理
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 03d414b..c5771f7 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,13 +1,50 @@
+<!-- 设备借用申请 -->
 <script lang="ts" setup name="borrowApply">
-// 逻辑代码
+import list from './components/applyList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '全部', comp: list },
+  { name: '草稿箱', comp: list },
+  { name: '待审批', comp: list },
+  { name: '审批中', comp: list },
+  { name: '已通过', comp: list },
+  { name: '未通过', comp: list },
+  { name: '已取消', comp: list },
+])
+const current = ref('全部')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用申请
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
new file mode 100644
index 0000000..052f3ce
--- /dev/null
+++ b/src/views/device/borrow/components/applyList.vue
@@ -0,0 +1,328 @@
+<script lang="ts" setup name="borrowApplyList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '文件号',
+    value: 'fileNo',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '类别',
+    value: 'catergory',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '李四',
+      time: '2020-12-14 00:00:00',
+      status: '未通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const approveRef = ref()
+// 同意
+const agree = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '1',
+  })
+}
+// 驳回
+const reject = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '3',
+  })
+}
+// 拒绝
+const refuse = (row: any) => {
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
+}
+// 取消
+const cancel = (rowrow: any) => {
+  ElMessageBox.confirm(
+    '确认取消吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" @click="addBtn" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="agree(row)">
+                  同意
+                </el-button>
+                <el-button size="small" type="primary" link @click="reject(row)">
+                  驳回
+                </el-button>
+                <el-button size="small" type="primary" link @click="refuse(row)">
+                  拒绝
+                </el-button>
+                <el-button size="small" type="primary" link @click="cancel(row)">
+                  取消
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/components/approvalActionDialog.vue b/src/views/device/borrow/components/approvalActionDialog.vue
new file mode 100644
index 0000000..214876c
--- /dev/null
+++ b/src/views/device/borrow/components/approvalActionDialog.vue
@@ -0,0 +1,104 @@
+<!-- 审批操作弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
+const dialogVisibleApprove = ref(false)
+const form = reactive({
+  radio: '1',
+})
+const ruleFormRef = ref<FormInstance>()
+const rules = reactive<FormRules>({
+})
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const approvetime = ref('') // 审批时间
+const initDialog = (row: any) => {
+  dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
+}
+defineExpose({ initDialog })
+
+// 点击保存
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      dialogVisibleApprove.value = false
+      emits('resetData')
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  formEl.resetFields()
+  dialogVisibleApprove.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
+    <el-form
+      ref="ruleFormRef" :model="form"
+      :rules="rules" label-width="110px"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人">
+            <el-input disabled :value="userInfo.$state.name" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间">
+            <el-input disabled :value="approvetime" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
+        <el-button @click="resetForm(ruleFormRef)">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
new file mode 100644
index 0000000..cfda00a
--- /dev/null
+++ b/src/views/device/borrow/components/handleList.vue
@@ -0,0 +1,281 @@
+<script lang="ts" setup name="borrowHandleList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '申请编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'dept',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      dept: '顶级',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      dept: '徐州分中心',
+      user: '里斯',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+const borrow = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="borrow(row)">
+                  借用
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/addRow.vue b/src/views/device/standingBook/components/addRow.vue
index 1678cdb..07b03d1 100644
--- a/src/views/device/standingBook/components/addRow.vue
+++ b/src/views/device/standingBook/components/addRow.vue
@@ -5,7 +5,7 @@
 import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
+const formLabelWidth = '110px'
 const form = ref({})
 const formTable = ref([
   {
@@ -91,108 +91,188 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`">
+  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
     >
       <div v-if="name === '周检记录'">
-        <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录表编号" />
-        </el-form-item>
-        <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录人" />
-        </el-form-item>
-        <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="检定日期"
-          />
-        </el-form-item>
-        <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="有效日期"
-          />
-        </el-form-item>
-        <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="送检人" />
-        </el-form-item>
-        <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录表编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="检定日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="有效日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="送检人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '状态变更记录'">
-        <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="状态类型" clearable>
-            <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="结束日期"
-          />
-        </el-form-item>
-        <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="申请人" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="状态类型" clearable style="width: 100%;">
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="申请人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '使用记录'">
-        <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用人" />
-        </el-form-item>
-        <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用部门" />
-        </el-form-item>
-        <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="使用类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用结束日期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用部门" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="使用类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '检定证书'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="证书类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书出具日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书有效期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
     </el-form>
     <template #footer>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 5f7b347..9a9f798 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -352,7 +352,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -376,7 +376,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -391,7 +391,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -404,14 +404,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -434,7 +434,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -443,20 +443,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -480,23 +480,23 @@
               <com-tree-select
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -507,10 +507,10 @@
             <el-form-item label="检定部门" prop="mesureDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -520,7 +520,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -529,13 +529,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -544,21 +544,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -578,14 +578,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -594,14 +594,14 @@
         <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-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -669,7 +669,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index fc3fd54..d9d4514 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -199,6 +199,8 @@
     useDeptList.value = toTreeList(res.data, '0', true)
   })
 }
+const selectTreeRef1 = ref()
+const selectTreeRef2 = ref()
 // 重置
 const resetDATA = () => {
   ruleForm.value = {
@@ -254,6 +256,10 @@
     isStandardSupportEquipment: '', //		是否标准配套设备
     id: '',
   }
+  if (title.value !== '详情') {
+    selectTreeRef1.value.clearSelected()
+    selectTreeRef2.value.clearSelected()
+  }
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
@@ -378,7 +384,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -402,7 +408,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -416,8 +422,7 @@
             <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"
+                :placeholder="title === '详情' ? '' : '出厂年月'" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -430,14 +435,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -460,7 +465,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -469,20 +474,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -505,24 +510,26 @@
             <el-form-item label="使用部门" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
+                ref="selectTreeRef2"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -536,10 +543,12 @@
               </el-select> -->
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                ref="selectTreeRef1"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -549,7 +558,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -558,13 +567,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -573,21 +582,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -607,14 +616,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -624,14 +633,14 @@
           <el-col :span="6">
             <el-form-item label="资本来源" prop="capitalSource">
               <!-- <el-input v-model.trim="ruleForm.capitalSource" placeholder="资本来源" :disabled="title === '详情'" /> -->
-              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -699,7 +708,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f653095..f4229a6 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -147,19 +147,17 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
-  setTimeout(() => {
-    list.value = [
-      {
-        equipmentNo: 123,
-        equipmentName: 'test',
-        modelNo: '001',
-        usePersonName: '张三',
-        validDate: '2022-12-12 00:00:00',
-        useDeptName: '顶级',
-      },
-    ]
-    total.value = 1
-  }, 1000)
+  list.value = [
+    {
+      equipmentNo: 123,
+      equipmentName: 'test',
+      modelNo: '001',
+      usePersonName: '张三',
+      validDate: '2022-12-12 00:00:00',
+      useDeptName: '顶级',
+    },
+  ] as any
+  total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -220,9 +218,11 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -300,13 +300,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.mesureType" class="m-2 normal-select" placeholder="检定方式" clearable>
+          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable>
             <el-option
               v-for="item in mesureTypeList"
               :key="item.id"
@@ -316,7 +316,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.managerState" class="m-2 normal-select" placeholder="管理状态" clearable>
+          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable>
             <el-option
               v-for="item in managerStateList"
               :key="item.id"
@@ -327,8 +327,9 @@
         </search-item>
         <search-item>
           <com-tree-select
+            ref="selectTreeRef"
             v-model="searchQuery.useDept" :options="useDeptList" placeholder="使用部门"
-            :tree-props="deptProps" style="width: 150px;"
+            :tree-props="deptProps"
           />
         </search-item>
         <search-item>
@@ -336,11 +337,10 @@
             v-model="searchQuery.validDate" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="有效日期"
             class="normal-date"
-            style="width: 150px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.abc" class="m-2 normal-select" placeholder="ABC" clearable>
+          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable>
             <el-option
               v-for="item in abcList"
               :key="item.id"
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 78a3800..4c31a94 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -2,9 +2,10 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/fixedAssetsAdd.vue'
-import type { fixedAssetsType } from './standingBook-interface'
+import type { fixedAssetsType, selectType } from './standingBook-interface'
 import { exportFile } from '@/utils/exportUtils'
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
+import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   assetNo: '', // 固定编号
@@ -50,7 +51,7 @@
   },
   {
     text: '设备类型',
-    value: 'assetTypeName',
+    value: 'equipmentTypeName',
     width: '150',
     align: 'center',
   },
@@ -102,6 +103,7 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+const equipmentCategoryList = ref<selectType[]>([]) // 设备类别
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
@@ -242,6 +244,10 @@
 }
 onMounted(() => {
   getList()
+  // 获取设备类别
+  getDictByCode('equipmentCategory').then((response) => {
+    equipmentCategoryList.value = response.data
+  })
 })
 </script>
 
@@ -265,7 +271,10 @@
           <el-input v-model="searchQuery.equipmentSpecifications" placeholder="设备规格" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-select v-model="searchQuery.equipmentCategory" placeholder="设备类别" clearable>
+            <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+          </el-select>
         </search-item>
       </search-area>
       <table-container>
diff --git a/src/views/device/stateManage/components/addRow.vue b/src/views/device/stateManage/components/addRow.vue
new file mode 100644
index 0000000..3ba82d6
--- /dev/null
+++ b/src/views/device/stateManage/components/addRow.vue
@@ -0,0 +1,160 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { listPageApi } from '@/api/device/standingBook'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  limit: 10,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '出厂编号',
+    value: 'manufacturingNo',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+  },
+])
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listPageApi(listQuery.value as any).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map(item => ({ ...item, checked: '' }))
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    equipmentName: '', // 姓名
+    equipmentNo: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const checkedArr = list.value.filter(item => item.checked !== '')
+  if (checkedArr.length) {
+    console.log(checkedArr, '选中的设备')
+    emits('add', checkedArr)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择设备')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns as any" :query="listQuery"
+        :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-checkbox v-model="scope.row.checked" :label="scope.$index" size="large" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-checkbox__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index 56417d6..214876c 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -47,38 +47,45 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="30%">
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
-      :rules="rules"
+      :rules="rules" label-width="110px"
     >
-      <el-form-item label="审批意见">
-        <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
-        <el-radio-group v-model="form.radio">
-          <el-radio label="1">
-            同意
-          </el-radio>
-          <el-radio label="2">
-            拒绝
-          </el-radio>
-          <el-radio label="3">
-            驳回
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="审批结论">
-        <el-input
-          :rows="4"
-          type="textarea"
-        />
-      </el-form-item>
       <el-row :gutter="24">
-        <el-col :span="10">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="审批人">
             <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
-        <el-col :span="14">
+        <el-col :span="12">
           <el-form-item label="审批时间">
             <el-input disabled :value="approvetime" />
           </el-form-item>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index e74d70e..2003e31 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -1,7 +1,8 @@
 <!-- 新增或详情弹窗 -->
-<script lang="ts" setup name="addNotice">
+<script lang="ts" setup name="add">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
+import addRow from './addRow.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
@@ -16,6 +17,7 @@
 const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const name = ref('')
+const borrowList = ref([])
 const ruleForm = ref({
   assetNo: '', // 资产编号
   assetType: '', // 资产类型
@@ -357,10 +359,86 @@
     isShowCalibration.value = true
   }
 })
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerLevelName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+  },
+])
+const addRowRef = ref()
+// 添加行
+const addRowBtn = () => {
+  addRowRef.value.initDialog({ title: '添加' })
+}
+// 删除行
+const removeRowBtn = () => {
+  const removeArr = borrowList.value.filter(item => item.remove !== '')
+  if (removeArr.length) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      borrowList.value = borrowList.value.filter(item => item.remove === '')
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 借用设备列表添加
+const addRowMethods = (row) => {
+  row.forEach((element) => {
+    borrowList.value.push({ ...element, remove: '' })
+  })
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
     <detail-page :title="`${name}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
@@ -378,15 +456,16 @@
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder="">
+              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -430,7 +509,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -454,28 +533,56 @@
         </el-row>
       </el-form>
     </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>
+    <div>
+      <detail-block title="借用设备列表">
+        <template #btns>
+          <el-button type="primary" @click="addRowBtn">
+            添加行
+          </el-button>
+          <el-button type="info" @click="removeRowBtn">
+            删除行
+          </el-button>
+        </template>
+        <normal-table
+          :data="borrowList" :total="1" :columns="columns as any"
+        >
+          <template #preColumns>
+            <el-table-column label="选择" width="55" align="center">
+              <template #default="scope">
+                <el-checkbox v-model="scope.row.remove" :label="scope.$index" size="large" />
+              </template>
+            </el-table-column>
+            <el-table-column label="序号" width="60" align="center">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </detail-block>
+      <detail-block 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>
+    </div>
   </app-container>
 </template>
 
@@ -484,6 +591,10 @@
   background-color: #fff;
 }
 
+:deep(.el-checkbox__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,
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index aaaaf61..d588b8d 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,6 +1,7 @@
 <script lang="ts" setup name="bench">
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
+import type { trainLogStatistic } from './bench-interface'
 import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
 import { getPlanList } from '@/api/system/plan'
 import { listPageApi } from '@/api/measure/file'
@@ -132,15 +133,19 @@
     account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
+    const result: trainLogStatistic = res.data
+    const notQualified: number = Number(result.trainCount) - result.qualifiedCount
+    const qualifiedRate = ((result.qualifiedCount / result.trainCount) * 100).toFixed(2) // 合格率
+    const notQualifiedRate = ((notQualified / result.trainCount) * 100).toFixed(2) // 不合格率
     TrainLogSList.value = [
-      { name: `合格     ${res.data.qualified}-${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
-      { name: `不合格   ${res.data.notQualified}- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+      { name: `合   格   ${result.qualifiedCount}-${qualifiedRate}%`, value: result.qualifiedCount },
+      { name: `不合格   ${notQualified}- ${notQualifiedRate}%`, value: notQualified },
     ]
     TrainLogTitle.value = res.data.trainCount
   }).catch((_) => {
     // 处理异常
     TrainLogSList.value = [
-      { name: '合格     0 - 50%', value: 0 },
+      { name: '合   格   0 - 50%', value: 0 },
       { name: '不合格   0 - 50%', value: 0 },
     ]
     TrainLogTitle.value = 0
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 9ef0b93..1ad577b 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -270,7 +270,7 @@
               <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="6">
             <el-form-item label="名称" prop="fileName">
               <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
             </el-form-item>
@@ -279,13 +279,14 @@
         <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" class="fill-input" disabled>
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled style="width: 100%;">
                 <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="请选择发布单位"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -295,6 +296,7 @@
                 v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -311,12 +313,13 @@
                 v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人" prop="createUserId">
-              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index b45fbc3..542b284 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -26,7 +26,7 @@
   createUser: '', // 创建人
   createTime: '', // 创建
   approvalStatus: props.value, // 审批状态
-  limit: 10,
+  limit: 20,
   offset: 1,
   fileType: '', // 类型
   formId: '',
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 7d4724b..e54ddf5 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -26,7 +26,7 @@
   fileCode: '', // 文件号
   effectiveTime: '', // 实施时间
   effectiveStatus: '', // 实施状态
-  limit: 10,
+  limit: 20,
   offset: 1,
   fileType: '', // 类型
 }) // 查询参数
@@ -75,13 +75,19 @@
 const getStatus = () => {
   getDictByCode('effectiveStatus').then((res) => {
     if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
+      effectiveStatusSelect.value = [...res.data, { name: '全部', value: '', id: 'quanbu' }]
     }
   })
 }
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.publishTime) {
+    searchQuery.publishTime = ''
+  }
+  if (!searchQuery.effectiveTime) {
+    searchQuery.effectiveTime = ''
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -252,13 +258,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" />
         </search-item>
         <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
@@ -274,20 +280,16 @@
           <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: 185px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
             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: 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" placeholder="实施状态" clearable>
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index 5ca3275..a95c665 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -505,21 +505,21 @@
         <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] === '详情'" @change="directorChange">
+              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;" @change="directorChange">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.name" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
-              <el-select v-model="ruleForm.technologyJob" :placeholder="title.split('-')[2] === '详情' ? '' : '技术职务'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.technologyJob" :placeholder="title.split('-')[2] === '详情' ? '' : '技术职务'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;">
                 <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="administrationJob">
-              <el-select v-model="ruleForm.administrationJob" :placeholder="title.split('-')[2] === '详情' ? '' : '行政职务'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.administrationJob" :placeholder="title.split('-')[2] === '详情' ? '' : '行政职务'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index aac1ef2..11d6d0a 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -22,7 +22,7 @@
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
-  limit: 10,
+  limit: 20,
   offset: 1,
   organizeType: '', // 类型
   createTime: '', // 创建时间
@@ -118,6 +118,9 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.createTime) {
+    searchQuery.createTime = ''
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows.map(item => ({ ...item, createTime: item.createTime.split(' ')[0] }))
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 3f472eb..bc5d9d4 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -7,7 +7,9 @@
 // import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
-import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+// import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const props = defineProps({
   isRemind: {
     type: Boolean,
@@ -78,11 +80,14 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 // 获取所有部门
-const deptList = ref<DeptTreeNode[]>([])
+const deptList = ref([])
 const getDeptList = async () => {
   getDeptTreeList().then((res) => {
-    deptList.value = res.data
+    deptList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
@@ -177,6 +182,7 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   searchQuery.staffNo = ''
@@ -184,6 +190,7 @@
   searchQuery.deptId = ''
   searchQuery.certificateStatus = ''
   searchQuery.verifierCertificateNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -212,10 +219,6 @@
     loading.close()
   })
 }
-// 打印
-const print = () => {
-
-}
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传图片
@@ -268,20 +271,24 @@
           <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+          <!-- <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
             <el-option
               v-for="item in deptList"
               :key="item.id"
               :label="item.name"
               :value="item.id"
             />
-          </el-select>
+          </el-select> -->
+          <com-tree-select
+            ref="selectTreeRef" v-model="searchQuery.deptId" :options="deptList"
+            placeholder="工作部门" :tree-props="deptProps"
+          />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况">
+          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况" clearable>
             <el-option
               v-for="item in certificateStatusList"
               :key="item.id"
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 4352604..5a5f036 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -389,10 +389,10 @@
           关闭
         </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">
-            <el-form-item prop="minioFileName" label-width="70px">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item prop="minioFileName">
               <el-upload
                 class="avatar-uploader"
                 :show-file-list="false"
@@ -423,23 +423,24 @@
               <el-date-picker
                 v-model="ruleForm.birthday" type="date" format="YYYY-MM" value-format="YYYY-MM"
                 placeholder="出生年月" :disabled="title === '详情'"
+                style="width: 100%;"
               />
             </el-form-item>
             <el-form-item label="工作部门" prop="deptId" class="marg-item">
-              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled>
+              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled style="width: 100%;">
                 <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="ruleForm.deptId" :options="PubListTree"
-                placeholder="选择组织机构" :tree-props="deptProps"
+                placeholder="选择组织机构" :tree-props="deptProps" style="width: 100%;"
               />
             </el-form-item>
             <el-form-item label="计量专业" prop="major" class="marg-item">
               <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
             </el-form-item>
             <el-form-item label="是否特操人" prop="specialOperator" class="marg-item">
-              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -449,23 +450,23 @@
               <el-input v-model.trim="ruleForm.staffNo" placeholder="系统自动生成" disabled />
             </el-form-item>
             <el-form-item label="性别" prop="sex" class="marg-item">
-              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="技术职务" prop="technologyJob" class="marg-item">
-              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="从事日期" prop="workDate" class="marg-item">
               <el-date-picker
                 v-model="ruleForm.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-                placeholder="请选择从事日期"
+                placeholder="请选择从事日期" style="width: 100%;"
               />
             </el-form-item>
-            <el-form-item label="是否技术考核" prop="technologyExam" class="marg-item">
-              <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'">
+            <el-form-item label="是否技术考核" prop="technologyExam" class="marg-item" style="width: 100%;">
+              <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -475,17 +476,17 @@
               <el-input ref="cardRef" v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" @blur="getBirthday" />
             </el-form-item>
             <el-form-item label="文化程度" prop="education" class="marg-item">
-              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="行政职务" prop="administrationJob" class="marg-item">
-              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="是否主考人" prop="mainExaminer" class="marg-item">
-              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index 042636e..660f2b0 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -264,7 +264,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="性别" prop="meterStaff.sex">
-              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -273,21 +273,21 @@
         <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-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -296,7 +296,7 @@
         <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-select v-if="title === '详情'" v-model="meterStaff.deptId" disabled style="width: 100%;">
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
               <com-tree-select
@@ -304,6 +304,7 @@
                 ref="selectTreeRef" v-model="meterStaff.deptId" :options="PubListTree"
                 placeholder="选择组织机构"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -316,7 +317,7 @@
             <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="请选择从事日期"
+                placeholder="请选择从事日期" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -347,7 +348,7 @@
             <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="请选择发证日期"
+                placeholder="请选择发证日期" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -355,7 +356,7 @@
             <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="请选择有效日期"
+                placeholder="请选择有效日期" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 178fc12..d0116f3 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -3,7 +3,7 @@
 import type { FormInstance, FormRules } from 'element-plus'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
+const formLabelWidth = '110px'
 const form = reactive({
   certificateNo: '', // 证书号
   certificateName: '', // 证书名称
@@ -71,32 +71,52 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`" width="40%">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
     >
-      <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
-        <el-input v-model="form.certificateNo" placeholder="证书号" />
-      </el-form-item>
-      <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
-        <el-input v-model="form.certificateName" placeholder="证书名称" />
-      </el-form-item>
-      <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
-        <el-input v-model="form.certificateCompany" placeholder="发证单位" />
-      </el-form-item>
-      <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
-        <el-date-picker
-          v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择发证日期"
-        />
-      </el-form-item>
-      <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-        <el-date-picker
-          v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择有效日期"
-        />
-      </el-form-item>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
+            <el-input v-model="form.certificateNo" placeholder="证书号" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
+            <el-input v-model="form.certificateName" placeholder="证书名称" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
+            <el-input v-model="form.certificateCompany" placeholder="发证单位" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
+            <el-date-picker
+              v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择发证日期" style="width: 100%;"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+            <el-date-picker
+              v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择有效日期" style="width: 100%;"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <template #footer>
       <span class="dialog-footer">
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
index 5e20d1b..10b0deb 100644
--- a/src/views/measure/person/components/personListDialog.vue
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -1,8 +1,11 @@
 <!-- 计量人员列表弹窗 -->
 <script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
 import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import { getDeptTreeList } from '@/api/system/dept'
-import type { TreeStructure } from '@/views/system/user/user-interface'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -10,7 +13,7 @@
   staffNo: '', // 人员编号
   name: '', // 姓名
   deptId: '', // 所在部门
-  limit: 5,
+  limit: 10,
   offset: 1,
 })
 const loadingTable = ref<boolean>(false)
@@ -32,20 +35,22 @@
   },
 ])
 // 获取部门
-const deptIdList = ref<TreeStructure[]>([])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const deptIdList = ref([])
 const getDeptList = () => {
   getDeptTreeList().then((res) => {
-    deptIdList.value = res.data
+    deptIdList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
 const fetchData = () => {
-  select.value = ''
+  select.value = -1
   getStaffList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.records
       total.value = Number(res.data.total)
-      console.log(list.value, 'list')
     }
   })
 }
@@ -53,6 +58,7 @@
 const search = () => {
   fetchData()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   listQuery.value = {
@@ -62,6 +68,7 @@
     limit: 10,
     offset: 1,
   }
+  selectTreeRef.value.clearSelected()
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -76,18 +83,24 @@
 }
 // 点击保存
 const submitForm = () => {
-  const person = list.value.filter((item, index) => index == select.value)[0]
-  console.log(person, 'person')
-  getStaffDetail(person).then((res) => {
-    if (res.code === 200) {
-      emits('add', res.data)
-      dialogFormVisible.value = false
-    }
-  })
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    getStaffDetail(person).then((res) => {
+      if (res.code === 200) {
+        emits('add', res.data)
+        dialogFormVisible.value = false
+        reset()
+      }
+    })
+  }
+  else {
+    ElMessage.warning('请先选择人员')
+  }
 }
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
+  reset()
 }
 // 初始化
 const initDialog = () => {
@@ -99,39 +112,45 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员" width="50%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable style="width: 150px;" />
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable style="width: 150px;" />
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
+        <!-- <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
           <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
+        </el-select> -->
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
-    <normal-table
-      :data="list" :total="total" :columns="columns" :query="listQuery"
-      :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>
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :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">
             {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
           </template>
         </el-table-column> -->
-      </template>
-    </normal-table>
+        </template>
+      </normal-table>
+    </div>
     <template #footer>
       <span class="dialog-footer">
         <el-button type="primary" @click="submitForm">确认</el-button>
diff --git a/src/views/measure/person/components/userListDialog.vue b/src/views/measure/person/components/userListDialog.vue
index dcd05b5..cd62a73 100644
--- a/src/views/measure/person/components/userListDialog.vue
+++ b/src/views/measure/person/components/userListDialog.vue
@@ -3,14 +3,16 @@
 import { ElMessage } from 'element-plus'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
-import type { TreeStructure } from '@/views/system/user/user-interface'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
 const listQuery = ref({
   keywords: '', // 姓名
   deptId: '', // 所在部门
-  limit: 5,
+  limit: 10,
   offset: 1,
 })
 const loadingTable = ref<boolean>(false)
@@ -31,11 +33,14 @@
     value: 'deptName',
   },
 ])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 // 获取部门
-const deptIdList = ref<TreeStructure[]>([])
+const deptIdList = ref([])
 const getDeptList = () => {
   getDeptTreeList().then((res) => {
-    deptIdList.value = res.data
+    deptIdList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
@@ -52,6 +57,7 @@
 const search = () => {
   fetchData()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   listQuery.value = {
@@ -60,6 +66,7 @@
     limit: 10,
     offset: 1,
   }
+  selectTreeRef.value.clearSelected()
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -74,11 +81,11 @@
 }
 // 点击保存
 const submitForm = () => {
-  console.log(select.value)
   if (select.value >= 0) {
     const person = list.value.filter((item, index) => index == select.value)[0]
     emits('add', person)
     dialogFormVisible.value = false
+    reset()
   }
   else {
     ElMessage.warning('请先选择人员')
@@ -87,9 +94,11 @@
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
+  reset()
 }
 // 初始化
 const initDialog = () => {
+  // reset()
   dialogFormVisible.value = true
   getDeptList()
   fetchData()
@@ -98,16 +107,20 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+  <el-dialog v-model="dialogFormVisible" title="选择人员" width="50%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
         <el-input v-model.trim="listQuery.keywords" placeholder="真实姓名" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable>
+        <!-- <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable>
           <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
+        </el-select> -->
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 9c6f65d..355473a 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -7,7 +7,9 @@
 // import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
-import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+// import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
@@ -16,7 +18,7 @@
   major: '', // 计量专业
   verifierCertificateNo: '', // 证书号
   certificateStatus: '', // 证书状态
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -52,10 +54,10 @@
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取所有部门
-const deptList = ref<DeptTreeNode[]>([])
+const deptList = ref([])
 const getDeptList = async () => {
   getDeptTreeList().then((res) => {
-    deptList.value = res.data
+    deptList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
@@ -126,6 +128,7 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   searchQuery.staffNo = ''
@@ -133,6 +136,7 @@
   searchQuery.deptId = ''
   searchQuery.major = ''
   searchQuery.verifierCertificateNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -160,10 +164,9 @@
     loading.close()
   })
 }
-// 打印
-const print = () => {
-
-}
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传图片
@@ -216,14 +219,18 @@
           <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+          <!-- <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
             <el-option
               v-for="item in deptList"
               :key="item.id"
               :label="item.name"
               :value="item.id"
             />
-          </el-select>
+          </el-select> -->
+          <com-tree-select
+            ref="selectTreeRef" v-model="searchQuery.deptId" :options="deptList"
+            placeholder="工作部门" :tree-props="deptProps"
+          />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.major" placeholder="计量专业" clearable class="w-50 m-2" />

diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index bb58885..2959118 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -53,3 +53,64 @@
   }
   return true
 }
+
+/**
+ * 验证小写字母
+ * @param str
+ * @returns
+ */
+export function validateLowerCase(str: string) {
+  const reg = /^[a-z]+$/
+  return reg.test(str)
+}
+
+/* 验证大写字母 */
+export function validateUpperCase(str: string) {
+  const reg = /^[A-Z]+$/
+  return reg.test(str)
+}
+
+/* 验证大小写字母 */
+export function validateAlphabets(str: string) {
+  const reg = /^[A-Za-z]+$/
+  return reg.test(str)
+}
+
+/**
+ * 验证邮箱
+ * @param email
+ * @returns {boolean}
+ */
+export function validateEmail(email: string) {
+  const re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
+  return re.test(email)
+}
+
+/**
+ * 验证手机号
+ * @param phone
+ * @returns {boolean}
+ */
+export function validateMobile(phone: string) {
+  const re = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/
+  return re.test(phone)
+}
+
+/**
+ * 校验身份证号
+ * @param value
+ * @returns
+ */
+export function validateIdCardNo(value: string) {
+  const re = /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/
+  return re.test(value)
+}
+/**
+ *
+ * @param value 验证电话号码
+ * @returns
+ */
+export function validatePhone(value: string) {
+  const re = /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/
+  return re.test(value)
+}
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 1c2405e..bca0958 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,13 +1,46 @@
-<script lang="ts" setup name="borrowHandle">
-// 逻辑代码
+<!-- 设备借用处理 -->
+<script lang="ts" setup name="borrowApply">
+import list from './components/handleList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '待借用', comp: list },
+  { name: '已借用', comp: list },
+  { name: '已归还', comp: list },
+])
+const current = ref('待借用')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用处理
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 03d414b..c5771f7 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,13 +1,50 @@
+<!-- 设备借用申请 -->
 <script lang="ts" setup name="borrowApply">
-// 逻辑代码
+import list from './components/applyList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '全部', comp: list },
+  { name: '草稿箱', comp: list },
+  { name: '待审批', comp: list },
+  { name: '审批中', comp: list },
+  { name: '已通过', comp: list },
+  { name: '未通过', comp: list },
+  { name: '已取消', comp: list },
+])
+const current = ref('全部')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用申请
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
new file mode 100644
index 0000000..052f3ce
--- /dev/null
+++ b/src/views/device/borrow/components/applyList.vue
@@ -0,0 +1,328 @@
+<script lang="ts" setup name="borrowApplyList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '文件号',
+    value: 'fileNo',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '类别',
+    value: 'catergory',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '李四',
+      time: '2020-12-14 00:00:00',
+      status: '未通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const approveRef = ref()
+// 同意
+const agree = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '1',
+  })
+}
+// 驳回
+const reject = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '3',
+  })
+}
+// 拒绝
+const refuse = (row: any) => {
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
+}
+// 取消
+const cancel = (rowrow: any) => {
+  ElMessageBox.confirm(
+    '确认取消吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" @click="addBtn" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="agree(row)">
+                  同意
+                </el-button>
+                <el-button size="small" type="primary" link @click="reject(row)">
+                  驳回
+                </el-button>
+                <el-button size="small" type="primary" link @click="refuse(row)">
+                  拒绝
+                </el-button>
+                <el-button size="small" type="primary" link @click="cancel(row)">
+                  取消
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/components/approvalActionDialog.vue b/src/views/device/borrow/components/approvalActionDialog.vue
new file mode 100644
index 0000000..214876c
--- /dev/null
+++ b/src/views/device/borrow/components/approvalActionDialog.vue
@@ -0,0 +1,104 @@
+<!-- 审批操作弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
+const dialogVisibleApprove = ref(false)
+const form = reactive({
+  radio: '1',
+})
+const ruleFormRef = ref<FormInstance>()
+const rules = reactive<FormRules>({
+})
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const approvetime = ref('') // 审批时间
+const initDialog = (row: any) => {
+  dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
+}
+defineExpose({ initDialog })
+
+// 点击保存
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      dialogVisibleApprove.value = false
+      emits('resetData')
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  formEl.resetFields()
+  dialogVisibleApprove.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
+    <el-form
+      ref="ruleFormRef" :model="form"
+      :rules="rules" label-width="110px"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人">
+            <el-input disabled :value="userInfo.$state.name" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间">
+            <el-input disabled :value="approvetime" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
+        <el-button @click="resetForm(ruleFormRef)">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
new file mode 100644
index 0000000..cfda00a
--- /dev/null
+++ b/src/views/device/borrow/components/handleList.vue
@@ -0,0 +1,281 @@
+<script lang="ts" setup name="borrowHandleList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '申请编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'dept',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      dept: '顶级',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      dept: '徐州分中心',
+      user: '里斯',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+const borrow = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="borrow(row)">
+                  借用
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/addRow.vue b/src/views/device/standingBook/components/addRow.vue
index 1678cdb..07b03d1 100644
--- a/src/views/device/standingBook/components/addRow.vue
+++ b/src/views/device/standingBook/components/addRow.vue
@@ -5,7 +5,7 @@
 import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
+const formLabelWidth = '110px'
 const form = ref({})
 const formTable = ref([
   {
@@ -91,108 +91,188 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`">
+  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
     >
       <div v-if="name === '周检记录'">
-        <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录表编号" />
-        </el-form-item>
-        <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录人" />
-        </el-form-item>
-        <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="检定日期"
-          />
-        </el-form-item>
-        <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="有效日期"
-          />
-        </el-form-item>
-        <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="送检人" />
-        </el-form-item>
-        <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录表编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="检定日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="有效日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="送检人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '状态变更记录'">
-        <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="状态类型" clearable>
-            <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="结束日期"
-          />
-        </el-form-item>
-        <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="申请人" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="状态类型" clearable style="width: 100%;">
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="申请人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '使用记录'">
-        <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用人" />
-        </el-form-item>
-        <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用部门" />
-        </el-form-item>
-        <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="使用类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用结束日期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用部门" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="使用类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '检定证书'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="证书类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书出具日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书有效期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
     </el-form>
     <template #footer>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 5f7b347..9a9f798 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -352,7 +352,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -376,7 +376,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -391,7 +391,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -404,14 +404,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -434,7 +434,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -443,20 +443,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -480,23 +480,23 @@
               <com-tree-select
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -507,10 +507,10 @@
             <el-form-item label="检定部门" prop="mesureDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -520,7 +520,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -529,13 +529,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -544,21 +544,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -578,14 +578,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -594,14 +594,14 @@
         <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-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -669,7 +669,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index fc3fd54..d9d4514 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -199,6 +199,8 @@
     useDeptList.value = toTreeList(res.data, '0', true)
   })
 }
+const selectTreeRef1 = ref()
+const selectTreeRef2 = ref()
 // 重置
 const resetDATA = () => {
   ruleForm.value = {
@@ -254,6 +256,10 @@
     isStandardSupportEquipment: '', //		是否标准配套设备
     id: '',
   }
+  if (title.value !== '详情') {
+    selectTreeRef1.value.clearSelected()
+    selectTreeRef2.value.clearSelected()
+  }
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
@@ -378,7 +384,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -402,7 +408,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -416,8 +422,7 @@
             <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"
+                :placeholder="title === '详情' ? '' : '出厂年月'" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -430,14 +435,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -460,7 +465,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -469,20 +474,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -505,24 +510,26 @@
             <el-form-item label="使用部门" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
+                ref="selectTreeRef2"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -536,10 +543,12 @@
               </el-select> -->
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                ref="selectTreeRef1"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -549,7 +558,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -558,13 +567,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -573,21 +582,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -607,14 +616,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -624,14 +633,14 @@
           <el-col :span="6">
             <el-form-item label="资本来源" prop="capitalSource">
               <!-- <el-input v-model.trim="ruleForm.capitalSource" placeholder="资本来源" :disabled="title === '详情'" /> -->
-              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -699,7 +708,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f653095..f4229a6 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -147,19 +147,17 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
-  setTimeout(() => {
-    list.value = [
-      {
-        equipmentNo: 123,
-        equipmentName: 'test',
-        modelNo: '001',
-        usePersonName: '张三',
-        validDate: '2022-12-12 00:00:00',
-        useDeptName: '顶级',
-      },
-    ]
-    total.value = 1
-  }, 1000)
+  list.value = [
+    {
+      equipmentNo: 123,
+      equipmentName: 'test',
+      modelNo: '001',
+      usePersonName: '张三',
+      validDate: '2022-12-12 00:00:00',
+      useDeptName: '顶级',
+    },
+  ] as any
+  total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -220,9 +218,11 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -300,13 +300,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.mesureType" class="m-2 normal-select" placeholder="检定方式" clearable>
+          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable>
             <el-option
               v-for="item in mesureTypeList"
               :key="item.id"
@@ -316,7 +316,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.managerState" class="m-2 normal-select" placeholder="管理状态" clearable>
+          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable>
             <el-option
               v-for="item in managerStateList"
               :key="item.id"
@@ -327,8 +327,9 @@
         </search-item>
         <search-item>
           <com-tree-select
+            ref="selectTreeRef"
             v-model="searchQuery.useDept" :options="useDeptList" placeholder="使用部门"
-            :tree-props="deptProps" style="width: 150px;"
+            :tree-props="deptProps"
           />
         </search-item>
         <search-item>
@@ -336,11 +337,10 @@
             v-model="searchQuery.validDate" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="有效日期"
             class="normal-date"
-            style="width: 150px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.abc" class="m-2 normal-select" placeholder="ABC" clearable>
+          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable>
             <el-option
               v-for="item in abcList"
               :key="item.id"
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 78a3800..4c31a94 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -2,9 +2,10 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/fixedAssetsAdd.vue'
-import type { fixedAssetsType } from './standingBook-interface'
+import type { fixedAssetsType, selectType } from './standingBook-interface'
 import { exportFile } from '@/utils/exportUtils'
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
+import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   assetNo: '', // 固定编号
@@ -50,7 +51,7 @@
   },
   {
     text: '设备类型',
-    value: 'assetTypeName',
+    value: 'equipmentTypeName',
     width: '150',
     align: 'center',
   },
@@ -102,6 +103,7 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+const equipmentCategoryList = ref<selectType[]>([]) // 设备类别
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
@@ -242,6 +244,10 @@
 }
 onMounted(() => {
   getList()
+  // 获取设备类别
+  getDictByCode('equipmentCategory').then((response) => {
+    equipmentCategoryList.value = response.data
+  })
 })
 </script>
 
@@ -265,7 +271,10 @@
           <el-input v-model="searchQuery.equipmentSpecifications" placeholder="设备规格" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-select v-model="searchQuery.equipmentCategory" placeholder="设备类别" clearable>
+            <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+          </el-select>
         </search-item>
       </search-area>
       <table-container>
diff --git a/src/views/device/stateManage/components/addRow.vue b/src/views/device/stateManage/components/addRow.vue
new file mode 100644
index 0000000..3ba82d6
--- /dev/null
+++ b/src/views/device/stateManage/components/addRow.vue
@@ -0,0 +1,160 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { listPageApi } from '@/api/device/standingBook'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  limit: 10,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '出厂编号',
+    value: 'manufacturingNo',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+  },
+])
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listPageApi(listQuery.value as any).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map(item => ({ ...item, checked: '' }))
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    equipmentName: '', // 姓名
+    equipmentNo: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const checkedArr = list.value.filter(item => item.checked !== '')
+  if (checkedArr.length) {
+    console.log(checkedArr, '选中的设备')
+    emits('add', checkedArr)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择设备')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns as any" :query="listQuery"
+        :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-checkbox v-model="scope.row.checked" :label="scope.$index" size="large" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-checkbox__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index 56417d6..214876c 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -47,38 +47,45 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="30%">
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
-      :rules="rules"
+      :rules="rules" label-width="110px"
     >
-      <el-form-item label="审批意见">
-        <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
-        <el-radio-group v-model="form.radio">
-          <el-radio label="1">
-            同意
-          </el-radio>
-          <el-radio label="2">
-            拒绝
-          </el-radio>
-          <el-radio label="3">
-            驳回
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="审批结论">
-        <el-input
-          :rows="4"
-          type="textarea"
-        />
-      </el-form-item>
       <el-row :gutter="24">
-        <el-col :span="10">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="审批人">
             <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
-        <el-col :span="14">
+        <el-col :span="12">
           <el-form-item label="审批时间">
             <el-input disabled :value="approvetime" />
           </el-form-item>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index e74d70e..2003e31 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -1,7 +1,8 @@
 <!-- 新增或详情弹窗 -->
-<script lang="ts" setup name="addNotice">
+<script lang="ts" setup name="add">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
+import addRow from './addRow.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
@@ -16,6 +17,7 @@
 const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const name = ref('')
+const borrowList = ref([])
 const ruleForm = ref({
   assetNo: '', // 资产编号
   assetType: '', // 资产类型
@@ -357,10 +359,86 @@
     isShowCalibration.value = true
   }
 })
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerLevelName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+  },
+])
+const addRowRef = ref()
+// 添加行
+const addRowBtn = () => {
+  addRowRef.value.initDialog({ title: '添加' })
+}
+// 删除行
+const removeRowBtn = () => {
+  const removeArr = borrowList.value.filter(item => item.remove !== '')
+  if (removeArr.length) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      borrowList.value = borrowList.value.filter(item => item.remove === '')
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 借用设备列表添加
+const addRowMethods = (row) => {
+  row.forEach((element) => {
+    borrowList.value.push({ ...element, remove: '' })
+  })
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
     <detail-page :title="`${name}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
@@ -378,15 +456,16 @@
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder="">
+              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -430,7 +509,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -454,28 +533,56 @@
         </el-row>
       </el-form>
     </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>
+    <div>
+      <detail-block title="借用设备列表">
+        <template #btns>
+          <el-button type="primary" @click="addRowBtn">
+            添加行
+          </el-button>
+          <el-button type="info" @click="removeRowBtn">
+            删除行
+          </el-button>
+        </template>
+        <normal-table
+          :data="borrowList" :total="1" :columns="columns as any"
+        >
+          <template #preColumns>
+            <el-table-column label="选择" width="55" align="center">
+              <template #default="scope">
+                <el-checkbox v-model="scope.row.remove" :label="scope.$index" size="large" />
+              </template>
+            </el-table-column>
+            <el-table-column label="序号" width="60" align="center">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </detail-block>
+      <detail-block 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>
+    </div>
   </app-container>
 </template>
 
@@ -484,6 +591,10 @@
   background-color: #fff;
 }
 
+:deep(.el-checkbox__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,
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index aaaaf61..d588b8d 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,6 +1,7 @@
 <script lang="ts" setup name="bench">
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
+import type { trainLogStatistic } from './bench-interface'
 import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
 import { getPlanList } from '@/api/system/plan'
 import { listPageApi } from '@/api/measure/file'
@@ -132,15 +133,19 @@
     account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
+    const result: trainLogStatistic = res.data
+    const notQualified: number = Number(result.trainCount) - result.qualifiedCount
+    const qualifiedRate = ((result.qualifiedCount / result.trainCount) * 100).toFixed(2) // 合格率
+    const notQualifiedRate = ((notQualified / result.trainCount) * 100).toFixed(2) // 不合格率
     TrainLogSList.value = [
-      { name: `合格     ${res.data.qualified}-${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
-      { name: `不合格   ${res.data.notQualified}- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+      { name: `合   格   ${result.qualifiedCount}-${qualifiedRate}%`, value: result.qualifiedCount },
+      { name: `不合格   ${notQualified}- ${notQualifiedRate}%`, value: notQualified },
     ]
     TrainLogTitle.value = res.data.trainCount
   }).catch((_) => {
     // 处理异常
     TrainLogSList.value = [
-      { name: '合格     0 - 50%', value: 0 },
+      { name: '合   格   0 - 50%', value: 0 },
       { name: '不合格   0 - 50%', value: 0 },
     ]
     TrainLogTitle.value = 0
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 9ef0b93..1ad577b 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -270,7 +270,7 @@
               <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="6">
             <el-form-item label="名称" prop="fileName">
               <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
             </el-form-item>
@@ -279,13 +279,14 @@
         <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" class="fill-input" disabled>
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled style="width: 100%;">
                 <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="请选择发布单位"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -295,6 +296,7 @@
                 v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -311,12 +313,13 @@
                 v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人" prop="createUserId">
-              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index b45fbc3..542b284 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -26,7 +26,7 @@
   createUser: '', // 创建人
   createTime: '', // 创建
   approvalStatus: props.value, // 审批状态
-  limit: 10,
+  limit: 20,
   offset: 1,
   fileType: '', // 类型
   formId: '',
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 7d4724b..e54ddf5 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -26,7 +26,7 @@
   fileCode: '', // 文件号
   effectiveTime: '', // 实施时间
   effectiveStatus: '', // 实施状态
-  limit: 10,
+  limit: 20,
   offset: 1,
   fileType: '', // 类型
 }) // 查询参数
@@ -75,13 +75,19 @@
 const getStatus = () => {
   getDictByCode('effectiveStatus').then((res) => {
     if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
+      effectiveStatusSelect.value = [...res.data, { name: '全部', value: '', id: 'quanbu' }]
     }
   })
 }
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.publishTime) {
+    searchQuery.publishTime = ''
+  }
+  if (!searchQuery.effectiveTime) {
+    searchQuery.effectiveTime = ''
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -252,13 +258,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" />
         </search-item>
         <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
@@ -274,20 +280,16 @@
           <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: 185px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
             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: 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" placeholder="实施状态" clearable>
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index 5ca3275..a95c665 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -505,21 +505,21 @@
         <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] === '详情'" @change="directorChange">
+              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;" @change="directorChange">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.name" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
-              <el-select v-model="ruleForm.technologyJob" :placeholder="title.split('-')[2] === '详情' ? '' : '技术职务'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.technologyJob" :placeholder="title.split('-')[2] === '详情' ? '' : '技术职务'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;">
                 <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="administrationJob">
-              <el-select v-model="ruleForm.administrationJob" :placeholder="title.split('-')[2] === '详情' ? '' : '行政职务'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.administrationJob" :placeholder="title.split('-')[2] === '详情' ? '' : '行政职务'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index aac1ef2..11d6d0a 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -22,7 +22,7 @@
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
-  limit: 10,
+  limit: 20,
   offset: 1,
   organizeType: '', // 类型
   createTime: '', // 创建时间
@@ -118,6 +118,9 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.createTime) {
+    searchQuery.createTime = ''
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows.map(item => ({ ...item, createTime: item.createTime.split(' ')[0] }))
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 3f472eb..bc5d9d4 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -7,7 +7,9 @@
 // import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
-import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+// import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const props = defineProps({
   isRemind: {
     type: Boolean,
@@ -78,11 +80,14 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 // 获取所有部门
-const deptList = ref<DeptTreeNode[]>([])
+const deptList = ref([])
 const getDeptList = async () => {
   getDeptTreeList().then((res) => {
-    deptList.value = res.data
+    deptList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
@@ -177,6 +182,7 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   searchQuery.staffNo = ''
@@ -184,6 +190,7 @@
   searchQuery.deptId = ''
   searchQuery.certificateStatus = ''
   searchQuery.verifierCertificateNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -212,10 +219,6 @@
     loading.close()
   })
 }
-// 打印
-const print = () => {
-
-}
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传图片
@@ -268,20 +271,24 @@
           <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+          <!-- <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
             <el-option
               v-for="item in deptList"
               :key="item.id"
               :label="item.name"
               :value="item.id"
             />
-          </el-select>
+          </el-select> -->
+          <com-tree-select
+            ref="selectTreeRef" v-model="searchQuery.deptId" :options="deptList"
+            placeholder="工作部门" :tree-props="deptProps"
+          />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况">
+          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况" clearable>
             <el-option
               v-for="item in certificateStatusList"
               :key="item.id"
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 4352604..5a5f036 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -389,10 +389,10 @@
           关闭
         </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">
-            <el-form-item prop="minioFileName" label-width="70px">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item prop="minioFileName">
               <el-upload
                 class="avatar-uploader"
                 :show-file-list="false"
@@ -423,23 +423,24 @@
               <el-date-picker
                 v-model="ruleForm.birthday" type="date" format="YYYY-MM" value-format="YYYY-MM"
                 placeholder="出生年月" :disabled="title === '详情'"
+                style="width: 100%;"
               />
             </el-form-item>
             <el-form-item label="工作部门" prop="deptId" class="marg-item">
-              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled>
+              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled style="width: 100%;">
                 <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="ruleForm.deptId" :options="PubListTree"
-                placeholder="选择组织机构" :tree-props="deptProps"
+                placeholder="选择组织机构" :tree-props="deptProps" style="width: 100%;"
               />
             </el-form-item>
             <el-form-item label="计量专业" prop="major" class="marg-item">
               <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
             </el-form-item>
             <el-form-item label="是否特操人" prop="specialOperator" class="marg-item">
-              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -449,23 +450,23 @@
               <el-input v-model.trim="ruleForm.staffNo" placeholder="系统自动生成" disabled />
             </el-form-item>
             <el-form-item label="性别" prop="sex" class="marg-item">
-              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="技术职务" prop="technologyJob" class="marg-item">
-              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="从事日期" prop="workDate" class="marg-item">
               <el-date-picker
                 v-model="ruleForm.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-                placeholder="请选择从事日期"
+                placeholder="请选择从事日期" style="width: 100%;"
               />
             </el-form-item>
-            <el-form-item label="是否技术考核" prop="technologyExam" class="marg-item">
-              <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'">
+            <el-form-item label="是否技术考核" prop="technologyExam" class="marg-item" style="width: 100%;">
+              <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -475,17 +476,17 @@
               <el-input ref="cardRef" v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" @blur="getBirthday" />
             </el-form-item>
             <el-form-item label="文化程度" prop="education" class="marg-item">
-              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="行政职务" prop="administrationJob" class="marg-item">
-              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="是否主考人" prop="mainExaminer" class="marg-item">
-              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index 042636e..660f2b0 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -264,7 +264,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="性别" prop="meterStaff.sex">
-              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -273,21 +273,21 @@
         <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-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -296,7 +296,7 @@
         <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-select v-if="title === '详情'" v-model="meterStaff.deptId" disabled style="width: 100%;">
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
               <com-tree-select
@@ -304,6 +304,7 @@
                 ref="selectTreeRef" v-model="meterStaff.deptId" :options="PubListTree"
                 placeholder="选择组织机构"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -316,7 +317,7 @@
             <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="请选择从事日期"
+                placeholder="请选择从事日期" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -347,7 +348,7 @@
             <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="请选择发证日期"
+                placeholder="请选择发证日期" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -355,7 +356,7 @@
             <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="请选择有效日期"
+                placeholder="请选择有效日期" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 178fc12..d0116f3 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -3,7 +3,7 @@
 import type { FormInstance, FormRules } from 'element-plus'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
+const formLabelWidth = '110px'
 const form = reactive({
   certificateNo: '', // 证书号
   certificateName: '', // 证书名称
@@ -71,32 +71,52 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`" width="40%">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
     >
-      <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
-        <el-input v-model="form.certificateNo" placeholder="证书号" />
-      </el-form-item>
-      <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
-        <el-input v-model="form.certificateName" placeholder="证书名称" />
-      </el-form-item>
-      <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
-        <el-input v-model="form.certificateCompany" placeholder="发证单位" />
-      </el-form-item>
-      <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
-        <el-date-picker
-          v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择发证日期"
-        />
-      </el-form-item>
-      <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-        <el-date-picker
-          v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择有效日期"
-        />
-      </el-form-item>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
+            <el-input v-model="form.certificateNo" placeholder="证书号" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
+            <el-input v-model="form.certificateName" placeholder="证书名称" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
+            <el-input v-model="form.certificateCompany" placeholder="发证单位" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
+            <el-date-picker
+              v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择发证日期" style="width: 100%;"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+            <el-date-picker
+              v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择有效日期" style="width: 100%;"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <template #footer>
       <span class="dialog-footer">
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
index 5e20d1b..10b0deb 100644
--- a/src/views/measure/person/components/personListDialog.vue
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -1,8 +1,11 @@
 <!-- 计量人员列表弹窗 -->
 <script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
 import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import { getDeptTreeList } from '@/api/system/dept'
-import type { TreeStructure } from '@/views/system/user/user-interface'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -10,7 +13,7 @@
   staffNo: '', // 人员编号
   name: '', // 姓名
   deptId: '', // 所在部门
-  limit: 5,
+  limit: 10,
   offset: 1,
 })
 const loadingTable = ref<boolean>(false)
@@ -32,20 +35,22 @@
   },
 ])
 // 获取部门
-const deptIdList = ref<TreeStructure[]>([])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const deptIdList = ref([])
 const getDeptList = () => {
   getDeptTreeList().then((res) => {
-    deptIdList.value = res.data
+    deptIdList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
 const fetchData = () => {
-  select.value = ''
+  select.value = -1
   getStaffList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.records
       total.value = Number(res.data.total)
-      console.log(list.value, 'list')
     }
   })
 }
@@ -53,6 +58,7 @@
 const search = () => {
   fetchData()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   listQuery.value = {
@@ -62,6 +68,7 @@
     limit: 10,
     offset: 1,
   }
+  selectTreeRef.value.clearSelected()
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -76,18 +83,24 @@
 }
 // 点击保存
 const submitForm = () => {
-  const person = list.value.filter((item, index) => index == select.value)[0]
-  console.log(person, 'person')
-  getStaffDetail(person).then((res) => {
-    if (res.code === 200) {
-      emits('add', res.data)
-      dialogFormVisible.value = false
-    }
-  })
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    getStaffDetail(person).then((res) => {
+      if (res.code === 200) {
+        emits('add', res.data)
+        dialogFormVisible.value = false
+        reset()
+      }
+    })
+  }
+  else {
+    ElMessage.warning('请先选择人员')
+  }
 }
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
+  reset()
 }
 // 初始化
 const initDialog = () => {
@@ -99,39 +112,45 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员" width="50%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable style="width: 150px;" />
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable style="width: 150px;" />
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
+        <!-- <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
           <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
+        </el-select> -->
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
-    <normal-table
-      :data="list" :total="total" :columns="columns" :query="listQuery"
-      :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>
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :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">
             {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
           </template>
         </el-table-column> -->
-      </template>
-    </normal-table>
+        </template>
+      </normal-table>
+    </div>
     <template #footer>
       <span class="dialog-footer">
         <el-button type="primary" @click="submitForm">确认</el-button>
diff --git a/src/views/measure/person/components/userListDialog.vue b/src/views/measure/person/components/userListDialog.vue
index dcd05b5..cd62a73 100644
--- a/src/views/measure/person/components/userListDialog.vue
+++ b/src/views/measure/person/components/userListDialog.vue
@@ -3,14 +3,16 @@
 import { ElMessage } from 'element-plus'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
-import type { TreeStructure } from '@/views/system/user/user-interface'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
 const listQuery = ref({
   keywords: '', // 姓名
   deptId: '', // 所在部门
-  limit: 5,
+  limit: 10,
   offset: 1,
 })
 const loadingTable = ref<boolean>(false)
@@ -31,11 +33,14 @@
     value: 'deptName',
   },
 ])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 // 获取部门
-const deptIdList = ref<TreeStructure[]>([])
+const deptIdList = ref([])
 const getDeptList = () => {
   getDeptTreeList().then((res) => {
-    deptIdList.value = res.data
+    deptIdList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
@@ -52,6 +57,7 @@
 const search = () => {
   fetchData()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   listQuery.value = {
@@ -60,6 +66,7 @@
     limit: 10,
     offset: 1,
   }
+  selectTreeRef.value.clearSelected()
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -74,11 +81,11 @@
 }
 // 点击保存
 const submitForm = () => {
-  console.log(select.value)
   if (select.value >= 0) {
     const person = list.value.filter((item, index) => index == select.value)[0]
     emits('add', person)
     dialogFormVisible.value = false
+    reset()
   }
   else {
     ElMessage.warning('请先选择人员')
@@ -87,9 +94,11 @@
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
+  reset()
 }
 // 初始化
 const initDialog = () => {
+  // reset()
   dialogFormVisible.value = true
   getDeptList()
   fetchData()
@@ -98,16 +107,20 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+  <el-dialog v-model="dialogFormVisible" title="选择人员" width="50%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
         <el-input v-model.trim="listQuery.keywords" placeholder="真实姓名" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable>
+        <!-- <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable>
           <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
+        </el-select> -->
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 9c6f65d..355473a 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -7,7 +7,9 @@
 // import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
-import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+// import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
@@ -16,7 +18,7 @@
   major: '', // 计量专业
   verifierCertificateNo: '', // 证书号
   certificateStatus: '', // 证书状态
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -52,10 +54,10 @@
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取所有部门
-const deptList = ref<DeptTreeNode[]>([])
+const deptList = ref([])
 const getDeptList = async () => {
   getDeptTreeList().then((res) => {
-    deptList.value = res.data
+    deptList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
@@ -126,6 +128,7 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   searchQuery.staffNo = ''
@@ -133,6 +136,7 @@
   searchQuery.deptId = ''
   searchQuery.major = ''
   searchQuery.verifierCertificateNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -160,10 +164,9 @@
     loading.close()
   })
 }
-// 打印
-const print = () => {
-
-}
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传图片
@@ -216,14 +219,18 @@
           <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+          <!-- <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
             <el-option
               v-for="item in deptList"
               :key="item.id"
               :label="item.name"
               :value="item.id"
             />
-          </el-select>
+          </el-select> -->
+          <com-tree-select
+            ref="selectTreeRef" v-model="searchQuery.deptId" :options="deptList"
+            placeholder="工作部门" :tree-props="deptProps"
+          />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.major" placeholder="计量专业" clearable class="w-50 m-2" />
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index af0a29d..2e0e7af 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -1,12 +1,15 @@
 <script lang="ts" setup name="ListSourceAdd">
-import { reactive, ref } from 'vue'
+/**
+ * 添加/编辑/详情溯源供方
+ */
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions, IformInline } from './list_interface'
+import type { IOptions, IformInline, traceSupplierPerson } from './list_interface'
 import { exportFile } from '@/utils/exportUtils'
 import { UploadFile } from '@/api/measure/file'
 import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+import { validatePhone } from '@/utils/validate'
 const props = defineProps({
   infoId: {
     type: String,
@@ -19,43 +22,45 @@
 })
 const emit = defineEmits(['close'])
 const formInline: Ref<IformInline> = ref({
-  businessContent: null,
-  supplierName: null,
-  supplierNo: null,
-  bankAccount: null,
-  bankAccountNumber: null,
-  bankName: null,
-  briefName: null,
-  businessScope: null,
-  companyAddress: null,
-  companyArea: null,
-  companyCity: null,
-  companyCountry: null,
-  companyProvince: null,
-  createTime: null,
-  director: null,
-  fax: null,
-  invoiceAddress: null,
-  invoiceArea: null,
-  invoiceCity: null,
-  invoiceCountry: null,
-  invoiceProvince: null,
-  mailbox: null,
-  minioFileName: null,
-  mobile: null,
-  phone: null,
-  postalCode: null,
-  remark: null,
-  taxNumber: null,
-  website: null,
+  id: '',
+  businessContent: '',
+  supplierName: '',
+  supplierNo: '',
+  bankAccount: '',
+  bankAccountNumber: '',
+  bankName: '',
+  briefName: '',
+  businessScope: '',
+  companyAddress: '',
+  companyArea: '',
+  companyCity: '',
+  companyCountry: '',
+  companyProvince: '',
+  createTime: '',
+  director: '',
+  fax: '',
+  invoiceAddress: '',
+  invoiceArea: '',
+  invoiceCity: '',
+  invoiceCountry: '',
+  invoiceProvince: '',
+  mailbox: '',
+  minioFileName: '',
+  mobile: '',
+  phone: '',
+  postalCode: '',
+  remark: '',
+  taxNumber: '',
+  website: '',
   traceSupplierPersonList: [],
 })
+const traceSupplierPersonList: Ref<traceSupplierPerson[]> = ref([])
 const columns = ref([
-  { text: '人员编号', value: 'personNo', show: true },
-  { text: '姓名', value: 'name', show: true },
-  { text: '工作部门', value: 'department', show: true },
-  { text: '职务', value: 'job', show: true },
-  { text: '联系方式', value: 'phone', show: true },
+  { text: '人员编号', value: 'personNo', required: false },
+  { text: '姓名', value: 'name', required: true },
+  { text: '工作部门', value: 'department', required: false },
+  { text: '职务', value: 'job', required: false },
+  { text: '联系方式', value: 'phone', required: true, reg: validatePhone },
 ])
 const ruleFormRef = ref<FormInstance>()
 const provinceList = ref<IOptions[]>([])
@@ -66,14 +71,17 @@
 const invoiceCityList = ref<IOptions[]>([])
 const areaInvoiceList = ref<IOptions[]>([])
 const dialogVisible = ref(false)
-const addPersonList = ref({
+// 人员对象
+const addPersonObj: traceSupplierPerson = {
+  id: '',
   personNo: '',
   name: '',
   department: '',
   job: '',
   phone: '',
-})
-const SelectionList = ref([])
+  editable: true,
+}
+const SelectionList: Ref<traceSupplierPerson[]> = ref([])
 const upload = ref<UploadInstance>()
 // 校验规则
 const rules = ref({
@@ -91,7 +99,7 @@
   })
 }
 // 表格选中
-const handleSelectionChange = (e: any) => {
+const handleSelectionChange = (e: traceSupplierPerson[]) => {
   SelectionList.value = e
 }
 // 获取公司地址省级
@@ -142,15 +150,33 @@
   })
 }
 // 点击增加行
-const addRoow = () => {
-  const object = {
-    personNo: '',
-    name: '',
-    department: '',
-    job: '',
-    phone: '',
+const addRow = () => {
+  // 检查上一行必填项
+  if (checkPersonList()) {
+    setAllRowReadable()
+    traceSupplierPersonList.value.push({ ...addPersonObj })
   }
-  formInline.value.traceSupplierPersonList.push(object)
+}
+// 检查人员列表
+function checkPersonList() {
+  for (let index = 0; index < traceSupplierPersonList.value.length; index++) {
+    const item = traceSupplierPersonList.value[index]
+    for (const prop of columns.value) {
+      // 检查必填
+      if (prop.required && !item[prop.value]) {
+        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
+        return false
+      }
+      // 验证正则
+      if (prop.reg && typeof prop.reg === 'function') {
+        if (!prop.reg(item[prop.value])) {
+          ElMessage.warning(`第${index + 1}行中${prop.text}输入不合法`)
+          return false
+        }
+      }
+    }
+  }
+  return true
 }
 // 点击关闭
 const handleClose = () => {
@@ -158,12 +184,12 @@
 }
 // 点击弹窗的完成追加到表格数组中
 const addPushList = () => {
-  formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonList.value)))
+  formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonObj.value)))
   handleClose()
 }
 // 删除行
 const deleteList = () => {
-  formInline.value.traceSupplierPersonList = formInline.value.traceSupplierPersonList.filter((item) => {
+  traceSupplierPersonList.value = traceSupplierPersonList.value.filter((item: traceSupplierPerson) => {
     return !SelectionList.value.includes(item)
   })
 }
@@ -261,10 +287,16 @@
     }
   })
 }
-// 双击表格显示输入框
-const dblclickName = (item: object) => {
-  console.log(item)
-  item.show = false
+// 双击行显示输入框
+const dblclickRow = (row: traceSupplierPerson) => {
+  setAllRowReadable()
+  row.editable = true
+}
+// 将所有人员信息列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of traceSupplierPersonList.value) {
+    item.editable = false
+  }
 }
 if (props.buttonType !== '新建') {
   getInfo()
@@ -273,7 +305,7 @@
 
 <template>
   <app-container>
-    <detail-page :title="`培训计划-${buttonType}`">
+    <detail-page :title="`溯源供方-${buttonType}`">
       <template #btns>
         <el-button
           type="primary"
@@ -617,39 +649,36 @@
       </el-form>
     </detail-page>
     <detail-block title="人员信息">
-      <template #btns>
-        <el-button
-          type="info"
-          :disabled="buttonType === '详情'"
-          @click="deleteList"
-        >
+      <template v-if="buttonType !== '详情'" #btns>
+        <el-button type="info" @click="deleteList">
           删除行
         </el-button>
-        <el-button
-          type="primary"
-          :disabled="buttonType === '详情'"
-          @click="addRoow"
-        >
+        <el-button type="primary" @click="addRow">
           增加行
         </el-button>
       </template>
       <el-table
-        :data="formInline.traceSupplierPersonList"
+        :data="traceSupplierPersonList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
+        @row-dblclick="dblclickRow"
       >
-        <el-table-column type="selection" width="55" />
+        <el-table-column type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column
           v-for="item in columns"
           :key="item.value"
           :prop="item.value"
           :label="item.text"
+          align="center"
         >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
           <template #default="scope">
-            <span v-show="item.show" style="color: gray;" @dblclick="dblclickName(item)">{{ scope.row[item.value] || `双击编辑${item.text}` }}</span>
-            <el-input v-show="!item.show" v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" @blur="item.show = true" />
+            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+            <el-input v-else v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
           </template>
         </el-table-column>
       </el-table>

diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index bb58885..2959118 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -53,3 +53,64 @@
   }
   return true
 }
+
+/**
+ * 验证小写字母
+ * @param str
+ * @returns
+ */
+export function validateLowerCase(str: string) {
+  const reg = /^[a-z]+$/
+  return reg.test(str)
+}
+
+/* 验证大写字母 */
+export function validateUpperCase(str: string) {
+  const reg = /^[A-Z]+$/
+  return reg.test(str)
+}
+
+/* 验证大小写字母 */
+export function validateAlphabets(str: string) {
+  const reg = /^[A-Za-z]+$/
+  return reg.test(str)
+}
+
+/**
+ * 验证邮箱
+ * @param email
+ * @returns {boolean}
+ */
+export function validateEmail(email: string) {
+  const re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
+  return re.test(email)
+}
+
+/**
+ * 验证手机号
+ * @param phone
+ * @returns {boolean}
+ */
+export function validateMobile(phone: string) {
+  const re = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/
+  return re.test(phone)
+}
+
+/**
+ * 校验身份证号
+ * @param value
+ * @returns
+ */
+export function validateIdCardNo(value: string) {
+  const re = /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/
+  return re.test(value)
+}
+/**
+ *
+ * @param value 验证电话号码
+ * @returns
+ */
+export function validatePhone(value: string) {
+  const re = /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/
+  return re.test(value)
+}
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 1c2405e..bca0958 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,13 +1,46 @@
-<script lang="ts" setup name="borrowHandle">
-// 逻辑代码
+<!-- 设备借用处理 -->
+<script lang="ts" setup name="borrowApply">
+import list from './components/handleList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '待借用', comp: list },
+  { name: '已借用', comp: list },
+  { name: '已归还', comp: list },
+])
+const current = ref('待借用')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用处理
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 03d414b..c5771f7 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,13 +1,50 @@
+<!-- 设备借用申请 -->
 <script lang="ts" setup name="borrowApply">
-// 逻辑代码
+import list from './components/applyList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '全部', comp: list },
+  { name: '草稿箱', comp: list },
+  { name: '待审批', comp: list },
+  { name: '审批中', comp: list },
+  { name: '已通过', comp: list },
+  { name: '未通过', comp: list },
+  { name: '已取消', comp: list },
+])
+const current = ref('全部')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用申请
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
new file mode 100644
index 0000000..052f3ce
--- /dev/null
+++ b/src/views/device/borrow/components/applyList.vue
@@ -0,0 +1,328 @@
+<script lang="ts" setup name="borrowApplyList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '文件号',
+    value: 'fileNo',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '类别',
+    value: 'catergory',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '李四',
+      time: '2020-12-14 00:00:00',
+      status: '未通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const approveRef = ref()
+// 同意
+const agree = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '1',
+  })
+}
+// 驳回
+const reject = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '3',
+  })
+}
+// 拒绝
+const refuse = (row: any) => {
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
+}
+// 取消
+const cancel = (rowrow: any) => {
+  ElMessageBox.confirm(
+    '确认取消吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" @click="addBtn" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="agree(row)">
+                  同意
+                </el-button>
+                <el-button size="small" type="primary" link @click="reject(row)">
+                  驳回
+                </el-button>
+                <el-button size="small" type="primary" link @click="refuse(row)">
+                  拒绝
+                </el-button>
+                <el-button size="small" type="primary" link @click="cancel(row)">
+                  取消
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/components/approvalActionDialog.vue b/src/views/device/borrow/components/approvalActionDialog.vue
new file mode 100644
index 0000000..214876c
--- /dev/null
+++ b/src/views/device/borrow/components/approvalActionDialog.vue
@@ -0,0 +1,104 @@
+<!-- 审批操作弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
+const dialogVisibleApprove = ref(false)
+const form = reactive({
+  radio: '1',
+})
+const ruleFormRef = ref<FormInstance>()
+const rules = reactive<FormRules>({
+})
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const approvetime = ref('') // 审批时间
+const initDialog = (row: any) => {
+  dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
+}
+defineExpose({ initDialog })
+
+// 点击保存
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      dialogVisibleApprove.value = false
+      emits('resetData')
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  formEl.resetFields()
+  dialogVisibleApprove.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
+    <el-form
+      ref="ruleFormRef" :model="form"
+      :rules="rules" label-width="110px"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人">
+            <el-input disabled :value="userInfo.$state.name" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间">
+            <el-input disabled :value="approvetime" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
+        <el-button @click="resetForm(ruleFormRef)">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
new file mode 100644
index 0000000..cfda00a
--- /dev/null
+++ b/src/views/device/borrow/components/handleList.vue
@@ -0,0 +1,281 @@
+<script lang="ts" setup name="borrowHandleList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '申请编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'dept',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      dept: '顶级',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      dept: '徐州分中心',
+      user: '里斯',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+const borrow = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="borrow(row)">
+                  借用
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/addRow.vue b/src/views/device/standingBook/components/addRow.vue
index 1678cdb..07b03d1 100644
--- a/src/views/device/standingBook/components/addRow.vue
+++ b/src/views/device/standingBook/components/addRow.vue
@@ -5,7 +5,7 @@
 import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
+const formLabelWidth = '110px'
 const form = ref({})
 const formTable = ref([
   {
@@ -91,108 +91,188 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`">
+  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
     >
       <div v-if="name === '周检记录'">
-        <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录表编号" />
-        </el-form-item>
-        <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录人" />
-        </el-form-item>
-        <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="检定日期"
-          />
-        </el-form-item>
-        <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="有效日期"
-          />
-        </el-form-item>
-        <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="送检人" />
-        </el-form-item>
-        <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录表编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="检定日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="有效日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="送检人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '状态变更记录'">
-        <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="状态类型" clearable>
-            <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="结束日期"
-          />
-        </el-form-item>
-        <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="申请人" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="状态类型" clearable style="width: 100%;">
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="申请人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '使用记录'">
-        <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用人" />
-        </el-form-item>
-        <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用部门" />
-        </el-form-item>
-        <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="使用类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用结束日期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用部门" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="使用类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '检定证书'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="证书类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书出具日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书有效期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
     </el-form>
     <template #footer>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 5f7b347..9a9f798 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -352,7 +352,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -376,7 +376,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -391,7 +391,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -404,14 +404,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -434,7 +434,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -443,20 +443,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -480,23 +480,23 @@
               <com-tree-select
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -507,10 +507,10 @@
             <el-form-item label="检定部门" prop="mesureDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -520,7 +520,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -529,13 +529,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -544,21 +544,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -578,14 +578,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -594,14 +594,14 @@
         <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-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -669,7 +669,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index fc3fd54..d9d4514 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -199,6 +199,8 @@
     useDeptList.value = toTreeList(res.data, '0', true)
   })
 }
+const selectTreeRef1 = ref()
+const selectTreeRef2 = ref()
 // 重置
 const resetDATA = () => {
   ruleForm.value = {
@@ -254,6 +256,10 @@
     isStandardSupportEquipment: '', //		是否标准配套设备
     id: '',
   }
+  if (title.value !== '详情') {
+    selectTreeRef1.value.clearSelected()
+    selectTreeRef2.value.clearSelected()
+  }
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
@@ -378,7 +384,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -402,7 +408,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -416,8 +422,7 @@
             <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"
+                :placeholder="title === '详情' ? '' : '出厂年月'" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -430,14 +435,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -460,7 +465,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -469,20 +474,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -505,24 +510,26 @@
             <el-form-item label="使用部门" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
+                ref="selectTreeRef2"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -536,10 +543,12 @@
               </el-select> -->
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                ref="selectTreeRef1"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -549,7 +558,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -558,13 +567,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -573,21 +582,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -607,14 +616,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -624,14 +633,14 @@
           <el-col :span="6">
             <el-form-item label="资本来源" prop="capitalSource">
               <!-- <el-input v-model.trim="ruleForm.capitalSource" placeholder="资本来源" :disabled="title === '详情'" /> -->
-              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -699,7 +708,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f653095..f4229a6 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -147,19 +147,17 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
-  setTimeout(() => {
-    list.value = [
-      {
-        equipmentNo: 123,
-        equipmentName: 'test',
-        modelNo: '001',
-        usePersonName: '张三',
-        validDate: '2022-12-12 00:00:00',
-        useDeptName: '顶级',
-      },
-    ]
-    total.value = 1
-  }, 1000)
+  list.value = [
+    {
+      equipmentNo: 123,
+      equipmentName: 'test',
+      modelNo: '001',
+      usePersonName: '张三',
+      validDate: '2022-12-12 00:00:00',
+      useDeptName: '顶级',
+    },
+  ] as any
+  total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -220,9 +218,11 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -300,13 +300,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.mesureType" class="m-2 normal-select" placeholder="检定方式" clearable>
+          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable>
             <el-option
               v-for="item in mesureTypeList"
               :key="item.id"
@@ -316,7 +316,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.managerState" class="m-2 normal-select" placeholder="管理状态" clearable>
+          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable>
             <el-option
               v-for="item in managerStateList"
               :key="item.id"
@@ -327,8 +327,9 @@
         </search-item>
         <search-item>
           <com-tree-select
+            ref="selectTreeRef"
             v-model="searchQuery.useDept" :options="useDeptList" placeholder="使用部门"
-            :tree-props="deptProps" style="width: 150px;"
+            :tree-props="deptProps"
           />
         </search-item>
         <search-item>
@@ -336,11 +337,10 @@
             v-model="searchQuery.validDate" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="有效日期"
             class="normal-date"
-            style="width: 150px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.abc" class="m-2 normal-select" placeholder="ABC" clearable>
+          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable>
             <el-option
               v-for="item in abcList"
               :key="item.id"
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 78a3800..4c31a94 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -2,9 +2,10 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/fixedAssetsAdd.vue'
-import type { fixedAssetsType } from './standingBook-interface'
+import type { fixedAssetsType, selectType } from './standingBook-interface'
 import { exportFile } from '@/utils/exportUtils'
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
+import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   assetNo: '', // 固定编号
@@ -50,7 +51,7 @@
   },
   {
     text: '设备类型',
-    value: 'assetTypeName',
+    value: 'equipmentTypeName',
     width: '150',
     align: 'center',
   },
@@ -102,6 +103,7 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+const equipmentCategoryList = ref<selectType[]>([]) // 设备类别
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
@@ -242,6 +244,10 @@
 }
 onMounted(() => {
   getList()
+  // 获取设备类别
+  getDictByCode('equipmentCategory').then((response) => {
+    equipmentCategoryList.value = response.data
+  })
 })
 </script>
 
@@ -265,7 +271,10 @@
           <el-input v-model="searchQuery.equipmentSpecifications" placeholder="设备规格" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-select v-model="searchQuery.equipmentCategory" placeholder="设备类别" clearable>
+            <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+          </el-select>
         </search-item>
       </search-area>
       <table-container>
diff --git a/src/views/device/stateManage/components/addRow.vue b/src/views/device/stateManage/components/addRow.vue
new file mode 100644
index 0000000..3ba82d6
--- /dev/null
+++ b/src/views/device/stateManage/components/addRow.vue
@@ -0,0 +1,160 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { listPageApi } from '@/api/device/standingBook'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  limit: 10,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '出厂编号',
+    value: 'manufacturingNo',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+  },
+])
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listPageApi(listQuery.value as any).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map(item => ({ ...item, checked: '' }))
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    equipmentName: '', // 姓名
+    equipmentNo: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const checkedArr = list.value.filter(item => item.checked !== '')
+  if (checkedArr.length) {
+    console.log(checkedArr, '选中的设备')
+    emits('add', checkedArr)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择设备')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns as any" :query="listQuery"
+        :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-checkbox v-model="scope.row.checked" :label="scope.$index" size="large" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-checkbox__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index 56417d6..214876c 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -47,38 +47,45 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="30%">
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
-      :rules="rules"
+      :rules="rules" label-width="110px"
     >
-      <el-form-item label="审批意见">
-        <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
-        <el-radio-group v-model="form.radio">
-          <el-radio label="1">
-            同意
-          </el-radio>
-          <el-radio label="2">
-            拒绝
-          </el-radio>
-          <el-radio label="3">
-            驳回
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="审批结论">
-        <el-input
-          :rows="4"
-          type="textarea"
-        />
-      </el-form-item>
       <el-row :gutter="24">
-        <el-col :span="10">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="审批人">
             <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
-        <el-col :span="14">
+        <el-col :span="12">
           <el-form-item label="审批时间">
             <el-input disabled :value="approvetime" />
           </el-form-item>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index e74d70e..2003e31 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -1,7 +1,8 @@
 <!-- 新增或详情弹窗 -->
-<script lang="ts" setup name="addNotice">
+<script lang="ts" setup name="add">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
+import addRow from './addRow.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
@@ -16,6 +17,7 @@
 const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const name = ref('')
+const borrowList = ref([])
 const ruleForm = ref({
   assetNo: '', // 资产编号
   assetType: '', // 资产类型
@@ -357,10 +359,86 @@
     isShowCalibration.value = true
   }
 })
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerLevelName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+  },
+])
+const addRowRef = ref()
+// 添加行
+const addRowBtn = () => {
+  addRowRef.value.initDialog({ title: '添加' })
+}
+// 删除行
+const removeRowBtn = () => {
+  const removeArr = borrowList.value.filter(item => item.remove !== '')
+  if (removeArr.length) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      borrowList.value = borrowList.value.filter(item => item.remove === '')
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 借用设备列表添加
+const addRowMethods = (row) => {
+  row.forEach((element) => {
+    borrowList.value.push({ ...element, remove: '' })
+  })
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
     <detail-page :title="`${name}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
@@ -378,15 +456,16 @@
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder="">
+              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -430,7 +509,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -454,28 +533,56 @@
         </el-row>
       </el-form>
     </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>
+    <div>
+      <detail-block title="借用设备列表">
+        <template #btns>
+          <el-button type="primary" @click="addRowBtn">
+            添加行
+          </el-button>
+          <el-button type="info" @click="removeRowBtn">
+            删除行
+          </el-button>
+        </template>
+        <normal-table
+          :data="borrowList" :total="1" :columns="columns as any"
+        >
+          <template #preColumns>
+            <el-table-column label="选择" width="55" align="center">
+              <template #default="scope">
+                <el-checkbox v-model="scope.row.remove" :label="scope.$index" size="large" />
+              </template>
+            </el-table-column>
+            <el-table-column label="序号" width="60" align="center">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </detail-block>
+      <detail-block 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>
+    </div>
   </app-container>
 </template>
 
@@ -484,6 +591,10 @@
   background-color: #fff;
 }
 
+:deep(.el-checkbox__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,
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index aaaaf61..d588b8d 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,6 +1,7 @@
 <script lang="ts" setup name="bench">
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
+import type { trainLogStatistic } from './bench-interface'
 import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
 import { getPlanList } from '@/api/system/plan'
 import { listPageApi } from '@/api/measure/file'
@@ -132,15 +133,19 @@
     account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
+    const result: trainLogStatistic = res.data
+    const notQualified: number = Number(result.trainCount) - result.qualifiedCount
+    const qualifiedRate = ((result.qualifiedCount / result.trainCount) * 100).toFixed(2) // 合格率
+    const notQualifiedRate = ((notQualified / result.trainCount) * 100).toFixed(2) // 不合格率
     TrainLogSList.value = [
-      { name: `合格     ${res.data.qualified}-${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
-      { name: `不合格   ${res.data.notQualified}- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+      { name: `合   格   ${result.qualifiedCount}-${qualifiedRate}%`, value: result.qualifiedCount },
+      { name: `不合格   ${notQualified}- ${notQualifiedRate}%`, value: notQualified },
     ]
     TrainLogTitle.value = res.data.trainCount
   }).catch((_) => {
     // 处理异常
     TrainLogSList.value = [
-      { name: '合格     0 - 50%', value: 0 },
+      { name: '合   格   0 - 50%', value: 0 },
       { name: '不合格   0 - 50%', value: 0 },
     ]
     TrainLogTitle.value = 0
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 9ef0b93..1ad577b 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -270,7 +270,7 @@
               <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="6">
             <el-form-item label="名称" prop="fileName">
               <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
             </el-form-item>
@@ -279,13 +279,14 @@
         <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" class="fill-input" disabled>
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled style="width: 100%;">
                 <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="请选择发布单位"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -295,6 +296,7 @@
                 v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -311,12 +313,13 @@
                 v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人" prop="createUserId">
-              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index b45fbc3..542b284 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -26,7 +26,7 @@
   createUser: '', // 创建人
   createTime: '', // 创建
   approvalStatus: props.value, // 审批状态
-  limit: 10,
+  limit: 20,
   offset: 1,
   fileType: '', // 类型
   formId: '',
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 7d4724b..e54ddf5 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -26,7 +26,7 @@
   fileCode: '', // 文件号
   effectiveTime: '', // 实施时间
   effectiveStatus: '', // 实施状态
-  limit: 10,
+  limit: 20,
   offset: 1,
   fileType: '', // 类型
 }) // 查询参数
@@ -75,13 +75,19 @@
 const getStatus = () => {
   getDictByCode('effectiveStatus').then((res) => {
     if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
+      effectiveStatusSelect.value = [...res.data, { name: '全部', value: '', id: 'quanbu' }]
     }
   })
 }
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.publishTime) {
+    searchQuery.publishTime = ''
+  }
+  if (!searchQuery.effectiveTime) {
+    searchQuery.effectiveTime = ''
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -252,13 +258,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" />
         </search-item>
         <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
@@ -274,20 +280,16 @@
           <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: 185px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
             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: 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" placeholder="实施状态" clearable>
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index 5ca3275..a95c665 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -505,21 +505,21 @@
         <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] === '详情'" @change="directorChange">
+              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;" @change="directorChange">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.name" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
-              <el-select v-model="ruleForm.technologyJob" :placeholder="title.split('-')[2] === '详情' ? '' : '技术职务'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.technologyJob" :placeholder="title.split('-')[2] === '详情' ? '' : '技术职务'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;">
                 <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="administrationJob">
-              <el-select v-model="ruleForm.administrationJob" :placeholder="title.split('-')[2] === '详情' ? '' : '行政职务'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.administrationJob" :placeholder="title.split('-')[2] === '详情' ? '' : '行政职务'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index aac1ef2..11d6d0a 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -22,7 +22,7 @@
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
-  limit: 10,
+  limit: 20,
   offset: 1,
   organizeType: '', // 类型
   createTime: '', // 创建时间
@@ -118,6 +118,9 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.createTime) {
+    searchQuery.createTime = ''
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows.map(item => ({ ...item, createTime: item.createTime.split(' ')[0] }))
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 3f472eb..bc5d9d4 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -7,7 +7,9 @@
 // import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
-import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+// import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const props = defineProps({
   isRemind: {
     type: Boolean,
@@ -78,11 +80,14 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 // 获取所有部门
-const deptList = ref<DeptTreeNode[]>([])
+const deptList = ref([])
 const getDeptList = async () => {
   getDeptTreeList().then((res) => {
-    deptList.value = res.data
+    deptList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
@@ -177,6 +182,7 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   searchQuery.staffNo = ''
@@ -184,6 +190,7 @@
   searchQuery.deptId = ''
   searchQuery.certificateStatus = ''
   searchQuery.verifierCertificateNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -212,10 +219,6 @@
     loading.close()
   })
 }
-// 打印
-const print = () => {
-
-}
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传图片
@@ -268,20 +271,24 @@
           <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+          <!-- <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
             <el-option
               v-for="item in deptList"
               :key="item.id"
               :label="item.name"
               :value="item.id"
             />
-          </el-select>
+          </el-select> -->
+          <com-tree-select
+            ref="selectTreeRef" v-model="searchQuery.deptId" :options="deptList"
+            placeholder="工作部门" :tree-props="deptProps"
+          />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况">
+          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况" clearable>
             <el-option
               v-for="item in certificateStatusList"
               :key="item.id"
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 4352604..5a5f036 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -389,10 +389,10 @@
           关闭
         </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">
-            <el-form-item prop="minioFileName" label-width="70px">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item prop="minioFileName">
               <el-upload
                 class="avatar-uploader"
                 :show-file-list="false"
@@ -423,23 +423,24 @@
               <el-date-picker
                 v-model="ruleForm.birthday" type="date" format="YYYY-MM" value-format="YYYY-MM"
                 placeholder="出生年月" :disabled="title === '详情'"
+                style="width: 100%;"
               />
             </el-form-item>
             <el-form-item label="工作部门" prop="deptId" class="marg-item">
-              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled>
+              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled style="width: 100%;">
                 <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="ruleForm.deptId" :options="PubListTree"
-                placeholder="选择组织机构" :tree-props="deptProps"
+                placeholder="选择组织机构" :tree-props="deptProps" style="width: 100%;"
               />
             </el-form-item>
             <el-form-item label="计量专业" prop="major" class="marg-item">
               <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
             </el-form-item>
             <el-form-item label="是否特操人" prop="specialOperator" class="marg-item">
-              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -449,23 +450,23 @@
               <el-input v-model.trim="ruleForm.staffNo" placeholder="系统自动生成" disabled />
             </el-form-item>
             <el-form-item label="性别" prop="sex" class="marg-item">
-              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="技术职务" prop="technologyJob" class="marg-item">
-              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="从事日期" prop="workDate" class="marg-item">
               <el-date-picker
                 v-model="ruleForm.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-                placeholder="请选择从事日期"
+                placeholder="请选择从事日期" style="width: 100%;"
               />
             </el-form-item>
-            <el-form-item label="是否技术考核" prop="technologyExam" class="marg-item">
-              <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'">
+            <el-form-item label="是否技术考核" prop="technologyExam" class="marg-item" style="width: 100%;">
+              <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -475,17 +476,17 @@
               <el-input ref="cardRef" v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" @blur="getBirthday" />
             </el-form-item>
             <el-form-item label="文化程度" prop="education" class="marg-item">
-              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="行政职务" prop="administrationJob" class="marg-item">
-              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="是否主考人" prop="mainExaminer" class="marg-item">
-              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index 042636e..660f2b0 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -264,7 +264,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="性别" prop="meterStaff.sex">
-              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -273,21 +273,21 @@
         <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-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -296,7 +296,7 @@
         <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-select v-if="title === '详情'" v-model="meterStaff.deptId" disabled style="width: 100%;">
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
               <com-tree-select
@@ -304,6 +304,7 @@
                 ref="selectTreeRef" v-model="meterStaff.deptId" :options="PubListTree"
                 placeholder="选择组织机构"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -316,7 +317,7 @@
             <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="请选择从事日期"
+                placeholder="请选择从事日期" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -347,7 +348,7 @@
             <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="请选择发证日期"
+                placeholder="请选择发证日期" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -355,7 +356,7 @@
             <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="请选择有效日期"
+                placeholder="请选择有效日期" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 178fc12..d0116f3 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -3,7 +3,7 @@
 import type { FormInstance, FormRules } from 'element-plus'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
+const formLabelWidth = '110px'
 const form = reactive({
   certificateNo: '', // 证书号
   certificateName: '', // 证书名称
@@ -71,32 +71,52 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`" width="40%">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
     >
-      <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
-        <el-input v-model="form.certificateNo" placeholder="证书号" />
-      </el-form-item>
-      <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
-        <el-input v-model="form.certificateName" placeholder="证书名称" />
-      </el-form-item>
-      <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
-        <el-input v-model="form.certificateCompany" placeholder="发证单位" />
-      </el-form-item>
-      <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
-        <el-date-picker
-          v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择发证日期"
-        />
-      </el-form-item>
-      <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-        <el-date-picker
-          v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择有效日期"
-        />
-      </el-form-item>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
+            <el-input v-model="form.certificateNo" placeholder="证书号" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
+            <el-input v-model="form.certificateName" placeholder="证书名称" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
+            <el-input v-model="form.certificateCompany" placeholder="发证单位" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
+            <el-date-picker
+              v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择发证日期" style="width: 100%;"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+            <el-date-picker
+              v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择有效日期" style="width: 100%;"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <template #footer>
       <span class="dialog-footer">
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
index 5e20d1b..10b0deb 100644
--- a/src/views/measure/person/components/personListDialog.vue
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -1,8 +1,11 @@
 <!-- 计量人员列表弹窗 -->
 <script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
 import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import { getDeptTreeList } from '@/api/system/dept'
-import type { TreeStructure } from '@/views/system/user/user-interface'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -10,7 +13,7 @@
   staffNo: '', // 人员编号
   name: '', // 姓名
   deptId: '', // 所在部门
-  limit: 5,
+  limit: 10,
   offset: 1,
 })
 const loadingTable = ref<boolean>(false)
@@ -32,20 +35,22 @@
   },
 ])
 // 获取部门
-const deptIdList = ref<TreeStructure[]>([])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const deptIdList = ref([])
 const getDeptList = () => {
   getDeptTreeList().then((res) => {
-    deptIdList.value = res.data
+    deptIdList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
 const fetchData = () => {
-  select.value = ''
+  select.value = -1
   getStaffList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.records
       total.value = Number(res.data.total)
-      console.log(list.value, 'list')
     }
   })
 }
@@ -53,6 +58,7 @@
 const search = () => {
   fetchData()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   listQuery.value = {
@@ -62,6 +68,7 @@
     limit: 10,
     offset: 1,
   }
+  selectTreeRef.value.clearSelected()
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -76,18 +83,24 @@
 }
 // 点击保存
 const submitForm = () => {
-  const person = list.value.filter((item, index) => index == select.value)[0]
-  console.log(person, 'person')
-  getStaffDetail(person).then((res) => {
-    if (res.code === 200) {
-      emits('add', res.data)
-      dialogFormVisible.value = false
-    }
-  })
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    getStaffDetail(person).then((res) => {
+      if (res.code === 200) {
+        emits('add', res.data)
+        dialogFormVisible.value = false
+        reset()
+      }
+    })
+  }
+  else {
+    ElMessage.warning('请先选择人员')
+  }
 }
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
+  reset()
 }
 // 初始化
 const initDialog = () => {
@@ -99,39 +112,45 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员" width="50%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable style="width: 150px;" />
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable style="width: 150px;" />
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
+        <!-- <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
           <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
+        </el-select> -->
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
-    <normal-table
-      :data="list" :total="total" :columns="columns" :query="listQuery"
-      :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>
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :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">
             {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
           </template>
         </el-table-column> -->
-      </template>
-    </normal-table>
+        </template>
+      </normal-table>
+    </div>
     <template #footer>
       <span class="dialog-footer">
         <el-button type="primary" @click="submitForm">确认</el-button>
diff --git a/src/views/measure/person/components/userListDialog.vue b/src/views/measure/person/components/userListDialog.vue
index dcd05b5..cd62a73 100644
--- a/src/views/measure/person/components/userListDialog.vue
+++ b/src/views/measure/person/components/userListDialog.vue
@@ -3,14 +3,16 @@
 import { ElMessage } from 'element-plus'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
-import type { TreeStructure } from '@/views/system/user/user-interface'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
 const listQuery = ref({
   keywords: '', // 姓名
   deptId: '', // 所在部门
-  limit: 5,
+  limit: 10,
   offset: 1,
 })
 const loadingTable = ref<boolean>(false)
@@ -31,11 +33,14 @@
     value: 'deptName',
   },
 ])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 // 获取部门
-const deptIdList = ref<TreeStructure[]>([])
+const deptIdList = ref([])
 const getDeptList = () => {
   getDeptTreeList().then((res) => {
-    deptIdList.value = res.data
+    deptIdList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
@@ -52,6 +57,7 @@
 const search = () => {
   fetchData()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   listQuery.value = {
@@ -60,6 +66,7 @@
     limit: 10,
     offset: 1,
   }
+  selectTreeRef.value.clearSelected()
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -74,11 +81,11 @@
 }
 // 点击保存
 const submitForm = () => {
-  console.log(select.value)
   if (select.value >= 0) {
     const person = list.value.filter((item, index) => index == select.value)[0]
     emits('add', person)
     dialogFormVisible.value = false
+    reset()
   }
   else {
     ElMessage.warning('请先选择人员')
@@ -87,9 +94,11 @@
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
+  reset()
 }
 // 初始化
 const initDialog = () => {
+  // reset()
   dialogFormVisible.value = true
   getDeptList()
   fetchData()
@@ -98,16 +107,20 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+  <el-dialog v-model="dialogFormVisible" title="选择人员" width="50%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
         <el-input v-model.trim="listQuery.keywords" placeholder="真实姓名" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable>
+        <!-- <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable>
           <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
+        </el-select> -->
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 9c6f65d..355473a 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -7,7 +7,9 @@
 // import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
-import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+// import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
@@ -16,7 +18,7 @@
   major: '', // 计量专业
   verifierCertificateNo: '', // 证书号
   certificateStatus: '', // 证书状态
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -52,10 +54,10 @@
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取所有部门
-const deptList = ref<DeptTreeNode[]>([])
+const deptList = ref([])
 const getDeptList = async () => {
   getDeptTreeList().then((res) => {
-    deptList.value = res.data
+    deptList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
@@ -126,6 +128,7 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   searchQuery.staffNo = ''
@@ -133,6 +136,7 @@
   searchQuery.deptId = ''
   searchQuery.major = ''
   searchQuery.verifierCertificateNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -160,10 +164,9 @@
     loading.close()
   })
 }
-// 打印
-const print = () => {
-
-}
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传图片
@@ -216,14 +219,18 @@
           <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+          <!-- <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
             <el-option
               v-for="item in deptList"
               :key="item.id"
               :label="item.name"
               :value="item.id"
             />
-          </el-select>
+          </el-select> -->
+          <com-tree-select
+            ref="selectTreeRef" v-model="searchQuery.deptId" :options="deptList"
+            placeholder="工作部门" :tree-props="deptProps"
+          />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.major" placeholder="计量专业" clearable class="w-50 m-2" />
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index af0a29d..2e0e7af 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -1,12 +1,15 @@
 <script lang="ts" setup name="ListSourceAdd">
-import { reactive, ref } from 'vue'
+/**
+ * 添加/编辑/详情溯源供方
+ */
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions, IformInline } from './list_interface'
+import type { IOptions, IformInline, traceSupplierPerson } from './list_interface'
 import { exportFile } from '@/utils/exportUtils'
 import { UploadFile } from '@/api/measure/file'
 import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+import { validatePhone } from '@/utils/validate'
 const props = defineProps({
   infoId: {
     type: String,
@@ -19,43 +22,45 @@
 })
 const emit = defineEmits(['close'])
 const formInline: Ref<IformInline> = ref({
-  businessContent: null,
-  supplierName: null,
-  supplierNo: null,
-  bankAccount: null,
-  bankAccountNumber: null,
-  bankName: null,
-  briefName: null,
-  businessScope: null,
-  companyAddress: null,
-  companyArea: null,
-  companyCity: null,
-  companyCountry: null,
-  companyProvince: null,
-  createTime: null,
-  director: null,
-  fax: null,
-  invoiceAddress: null,
-  invoiceArea: null,
-  invoiceCity: null,
-  invoiceCountry: null,
-  invoiceProvince: null,
-  mailbox: null,
-  minioFileName: null,
-  mobile: null,
-  phone: null,
-  postalCode: null,
-  remark: null,
-  taxNumber: null,
-  website: null,
+  id: '',
+  businessContent: '',
+  supplierName: '',
+  supplierNo: '',
+  bankAccount: '',
+  bankAccountNumber: '',
+  bankName: '',
+  briefName: '',
+  businessScope: '',
+  companyAddress: '',
+  companyArea: '',
+  companyCity: '',
+  companyCountry: '',
+  companyProvince: '',
+  createTime: '',
+  director: '',
+  fax: '',
+  invoiceAddress: '',
+  invoiceArea: '',
+  invoiceCity: '',
+  invoiceCountry: '',
+  invoiceProvince: '',
+  mailbox: '',
+  minioFileName: '',
+  mobile: '',
+  phone: '',
+  postalCode: '',
+  remark: '',
+  taxNumber: '',
+  website: '',
   traceSupplierPersonList: [],
 })
+const traceSupplierPersonList: Ref<traceSupplierPerson[]> = ref([])
 const columns = ref([
-  { text: '人员编号', value: 'personNo', show: true },
-  { text: '姓名', value: 'name', show: true },
-  { text: '工作部门', value: 'department', show: true },
-  { text: '职务', value: 'job', show: true },
-  { text: '联系方式', value: 'phone', show: true },
+  { text: '人员编号', value: 'personNo', required: false },
+  { text: '姓名', value: 'name', required: true },
+  { text: '工作部门', value: 'department', required: false },
+  { text: '职务', value: 'job', required: false },
+  { text: '联系方式', value: 'phone', required: true, reg: validatePhone },
 ])
 const ruleFormRef = ref<FormInstance>()
 const provinceList = ref<IOptions[]>([])
@@ -66,14 +71,17 @@
 const invoiceCityList = ref<IOptions[]>([])
 const areaInvoiceList = ref<IOptions[]>([])
 const dialogVisible = ref(false)
-const addPersonList = ref({
+// 人员对象
+const addPersonObj: traceSupplierPerson = {
+  id: '',
   personNo: '',
   name: '',
   department: '',
   job: '',
   phone: '',
-})
-const SelectionList = ref([])
+  editable: true,
+}
+const SelectionList: Ref<traceSupplierPerson[]> = ref([])
 const upload = ref<UploadInstance>()
 // 校验规则
 const rules = ref({
@@ -91,7 +99,7 @@
   })
 }
 // 表格选中
-const handleSelectionChange = (e: any) => {
+const handleSelectionChange = (e: traceSupplierPerson[]) => {
   SelectionList.value = e
 }
 // 获取公司地址省级
@@ -142,15 +150,33 @@
   })
 }
 // 点击增加行
-const addRoow = () => {
-  const object = {
-    personNo: '',
-    name: '',
-    department: '',
-    job: '',
-    phone: '',
+const addRow = () => {
+  // 检查上一行必填项
+  if (checkPersonList()) {
+    setAllRowReadable()
+    traceSupplierPersonList.value.push({ ...addPersonObj })
   }
-  formInline.value.traceSupplierPersonList.push(object)
+}
+// 检查人员列表
+function checkPersonList() {
+  for (let index = 0; index < traceSupplierPersonList.value.length; index++) {
+    const item = traceSupplierPersonList.value[index]
+    for (const prop of columns.value) {
+      // 检查必填
+      if (prop.required && !item[prop.value]) {
+        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
+        return false
+      }
+      // 验证正则
+      if (prop.reg && typeof prop.reg === 'function') {
+        if (!prop.reg(item[prop.value])) {
+          ElMessage.warning(`第${index + 1}行中${prop.text}输入不合法`)
+          return false
+        }
+      }
+    }
+  }
+  return true
 }
 // 点击关闭
 const handleClose = () => {
@@ -158,12 +184,12 @@
 }
 // 点击弹窗的完成追加到表格数组中
 const addPushList = () => {
-  formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonList.value)))
+  formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonObj.value)))
   handleClose()
 }
 // 删除行
 const deleteList = () => {
-  formInline.value.traceSupplierPersonList = formInline.value.traceSupplierPersonList.filter((item) => {
+  traceSupplierPersonList.value = traceSupplierPersonList.value.filter((item: traceSupplierPerson) => {
     return !SelectionList.value.includes(item)
   })
 }
@@ -261,10 +287,16 @@
     }
   })
 }
-// 双击表格显示输入框
-const dblclickName = (item: object) => {
-  console.log(item)
-  item.show = false
+// 双击行显示输入框
+const dblclickRow = (row: traceSupplierPerson) => {
+  setAllRowReadable()
+  row.editable = true
+}
+// 将所有人员信息列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of traceSupplierPersonList.value) {
+    item.editable = false
+  }
 }
 if (props.buttonType !== '新建') {
   getInfo()
@@ -273,7 +305,7 @@
 
 <template>
   <app-container>
-    <detail-page :title="`培训计划-${buttonType}`">
+    <detail-page :title="`溯源供方-${buttonType}`">
       <template #btns>
         <el-button
           type="primary"
@@ -617,39 +649,36 @@
       </el-form>
     </detail-page>
     <detail-block title="人员信息">
-      <template #btns>
-        <el-button
-          type="info"
-          :disabled="buttonType === '详情'"
-          @click="deleteList"
-        >
+      <template v-if="buttonType !== '详情'" #btns>
+        <el-button type="info" @click="deleteList">
           删除行
         </el-button>
-        <el-button
-          type="primary"
-          :disabled="buttonType === '详情'"
-          @click="addRoow"
-        >
+        <el-button type="primary" @click="addRow">
           增加行
         </el-button>
       </template>
       <el-table
-        :data="formInline.traceSupplierPersonList"
+        :data="traceSupplierPersonList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
+        @row-dblclick="dblclickRow"
       >
-        <el-table-column type="selection" width="55" />
+        <el-table-column type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column
           v-for="item in columns"
           :key="item.value"
           :prop="item.value"
           :label="item.text"
+          align="center"
         >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
           <template #default="scope">
-            <span v-show="item.show" style="color: gray;" @dblclick="dblclickName(item)">{{ scope.row[item.value] || `双击编辑${item.text}` }}</span>
-            <el-input v-show="!item.show" v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" @blur="item.show = true" />
+            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+            <el-input v-else v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index 530bcc4..c057976 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -24,6 +24,18 @@
   areaName: string
 }
 
+// 溯源供方人员
+export interface traceSupplierPerson {
+  id: number | string // id
+  job: string // 职务
+  department: string// 部门
+  name: string// 信命
+  personNo: string// 人员编号
+  phone: string// 联系方式
+  editable?: boolean // 是否可编辑
+  [key: string]: any
+}
+
 export interface IformInline {
   businessContent: string
   supplierName: string
@@ -55,5 +67,6 @@
   remark: string
   taxNumber: string
   website: string
-  traceSupplierPersonList: []
+  traceSupplierPersonList: traceSupplierPerson []
 }
+

diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index bb58885..2959118 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -53,3 +53,64 @@
   }
   return true
 }
+
+/**
+ * 验证小写字母
+ * @param str
+ * @returns
+ */
+export function validateLowerCase(str: string) {
+  const reg = /^[a-z]+$/
+  return reg.test(str)
+}
+
+/* 验证大写字母 */
+export function validateUpperCase(str: string) {
+  const reg = /^[A-Z]+$/
+  return reg.test(str)
+}
+
+/* 验证大小写字母 */
+export function validateAlphabets(str: string) {
+  const reg = /^[A-Za-z]+$/
+  return reg.test(str)
+}
+
+/**
+ * 验证邮箱
+ * @param email
+ * @returns {boolean}
+ */
+export function validateEmail(email: string) {
+  const re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
+  return re.test(email)
+}
+
+/**
+ * 验证手机号
+ * @param phone
+ * @returns {boolean}
+ */
+export function validateMobile(phone: string) {
+  const re = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/
+  return re.test(phone)
+}
+
+/**
+ * 校验身份证号
+ * @param value
+ * @returns
+ */
+export function validateIdCardNo(value: string) {
+  const re = /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/
+  return re.test(value)
+}
+/**
+ *
+ * @param value 验证电话号码
+ * @returns
+ */
+export function validatePhone(value: string) {
+  const re = /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/
+  return re.test(value)
+}
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 1c2405e..bca0958 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,13 +1,46 @@
-<script lang="ts" setup name="borrowHandle">
-// 逻辑代码
+<!-- 设备借用处理 -->
+<script lang="ts" setup name="borrowApply">
+import list from './components/handleList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '待借用', comp: list },
+  { name: '已借用', comp: list },
+  { name: '已归还', comp: list },
+])
+const current = ref('待借用')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用处理
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 03d414b..c5771f7 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,13 +1,50 @@
+<!-- 设备借用申请 -->
 <script lang="ts" setup name="borrowApply">
-// 逻辑代码
+import list from './components/applyList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '全部', comp: list },
+  { name: '草稿箱', comp: list },
+  { name: '待审批', comp: list },
+  { name: '审批中', comp: list },
+  { name: '已通过', comp: list },
+  { name: '未通过', comp: list },
+  { name: '已取消', comp: list },
+])
+const current = ref('全部')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用申请
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
new file mode 100644
index 0000000..052f3ce
--- /dev/null
+++ b/src/views/device/borrow/components/applyList.vue
@@ -0,0 +1,328 @@
+<script lang="ts" setup name="borrowApplyList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '文件号',
+    value: 'fileNo',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '类别',
+    value: 'catergory',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '李四',
+      time: '2020-12-14 00:00:00',
+      status: '未通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const approveRef = ref()
+// 同意
+const agree = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '1',
+  })
+}
+// 驳回
+const reject = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '3',
+  })
+}
+// 拒绝
+const refuse = (row: any) => {
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
+}
+// 取消
+const cancel = (rowrow: any) => {
+  ElMessageBox.confirm(
+    '确认取消吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" @click="addBtn" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="agree(row)">
+                  同意
+                </el-button>
+                <el-button size="small" type="primary" link @click="reject(row)">
+                  驳回
+                </el-button>
+                <el-button size="small" type="primary" link @click="refuse(row)">
+                  拒绝
+                </el-button>
+                <el-button size="small" type="primary" link @click="cancel(row)">
+                  取消
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/components/approvalActionDialog.vue b/src/views/device/borrow/components/approvalActionDialog.vue
new file mode 100644
index 0000000..214876c
--- /dev/null
+++ b/src/views/device/borrow/components/approvalActionDialog.vue
@@ -0,0 +1,104 @@
+<!-- 审批操作弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
+const dialogVisibleApprove = ref(false)
+const form = reactive({
+  radio: '1',
+})
+const ruleFormRef = ref<FormInstance>()
+const rules = reactive<FormRules>({
+})
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const approvetime = ref('') // 审批时间
+const initDialog = (row: any) => {
+  dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
+}
+defineExpose({ initDialog })
+
+// 点击保存
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      dialogVisibleApprove.value = false
+      emits('resetData')
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  formEl.resetFields()
+  dialogVisibleApprove.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
+    <el-form
+      ref="ruleFormRef" :model="form"
+      :rules="rules" label-width="110px"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人">
+            <el-input disabled :value="userInfo.$state.name" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间">
+            <el-input disabled :value="approvetime" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
+        <el-button @click="resetForm(ruleFormRef)">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
new file mode 100644
index 0000000..cfda00a
--- /dev/null
+++ b/src/views/device/borrow/components/handleList.vue
@@ -0,0 +1,281 @@
+<script lang="ts" setup name="borrowHandleList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '申请编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'dept',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      dept: '顶级',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      dept: '徐州分中心',
+      user: '里斯',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+const borrow = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="borrow(row)">
+                  借用
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/addRow.vue b/src/views/device/standingBook/components/addRow.vue
index 1678cdb..07b03d1 100644
--- a/src/views/device/standingBook/components/addRow.vue
+++ b/src/views/device/standingBook/components/addRow.vue
@@ -5,7 +5,7 @@
 import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
+const formLabelWidth = '110px'
 const form = ref({})
 const formTable = ref([
   {
@@ -91,108 +91,188 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`">
+  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
     >
       <div v-if="name === '周检记录'">
-        <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录表编号" />
-        </el-form-item>
-        <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录人" />
-        </el-form-item>
-        <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="检定日期"
-          />
-        </el-form-item>
-        <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="有效日期"
-          />
-        </el-form-item>
-        <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="送检人" />
-        </el-form-item>
-        <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录表编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="检定日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="有效日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="送检人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '状态变更记录'">
-        <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="状态类型" clearable>
-            <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="结束日期"
-          />
-        </el-form-item>
-        <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="申请人" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="状态类型" clearable style="width: 100%;">
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="申请人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '使用记录'">
-        <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用人" />
-        </el-form-item>
-        <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用部门" />
-        </el-form-item>
-        <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="使用类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用结束日期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用部门" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="使用类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '检定证书'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="证书类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书出具日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书有效期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
     </el-form>
     <template #footer>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 5f7b347..9a9f798 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -352,7 +352,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -376,7 +376,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -391,7 +391,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -404,14 +404,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -434,7 +434,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -443,20 +443,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -480,23 +480,23 @@
               <com-tree-select
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -507,10 +507,10 @@
             <el-form-item label="检定部门" prop="mesureDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -520,7 +520,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -529,13 +529,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -544,21 +544,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -578,14 +578,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -594,14 +594,14 @@
         <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-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -669,7 +669,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index fc3fd54..d9d4514 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -199,6 +199,8 @@
     useDeptList.value = toTreeList(res.data, '0', true)
   })
 }
+const selectTreeRef1 = ref()
+const selectTreeRef2 = ref()
 // 重置
 const resetDATA = () => {
   ruleForm.value = {
@@ -254,6 +256,10 @@
     isStandardSupportEquipment: '', //		是否标准配套设备
     id: '',
   }
+  if (title.value !== '详情') {
+    selectTreeRef1.value.clearSelected()
+    selectTreeRef2.value.clearSelected()
+  }
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
@@ -378,7 +384,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -402,7 +408,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -416,8 +422,7 @@
             <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"
+                :placeholder="title === '详情' ? '' : '出厂年月'" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -430,14 +435,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -460,7 +465,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -469,20 +474,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -505,24 +510,26 @@
             <el-form-item label="使用部门" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
+                ref="selectTreeRef2"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -536,10 +543,12 @@
               </el-select> -->
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                ref="selectTreeRef1"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -549,7 +558,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -558,13 +567,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -573,21 +582,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -607,14 +616,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -624,14 +633,14 @@
           <el-col :span="6">
             <el-form-item label="资本来源" prop="capitalSource">
               <!-- <el-input v-model.trim="ruleForm.capitalSource" placeholder="资本来源" :disabled="title === '详情'" /> -->
-              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -699,7 +708,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f653095..f4229a6 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -147,19 +147,17 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
-  setTimeout(() => {
-    list.value = [
-      {
-        equipmentNo: 123,
-        equipmentName: 'test',
-        modelNo: '001',
-        usePersonName: '张三',
-        validDate: '2022-12-12 00:00:00',
-        useDeptName: '顶级',
-      },
-    ]
-    total.value = 1
-  }, 1000)
+  list.value = [
+    {
+      equipmentNo: 123,
+      equipmentName: 'test',
+      modelNo: '001',
+      usePersonName: '张三',
+      validDate: '2022-12-12 00:00:00',
+      useDeptName: '顶级',
+    },
+  ] as any
+  total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -220,9 +218,11 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -300,13 +300,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.mesureType" class="m-2 normal-select" placeholder="检定方式" clearable>
+          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable>
             <el-option
               v-for="item in mesureTypeList"
               :key="item.id"
@@ -316,7 +316,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.managerState" class="m-2 normal-select" placeholder="管理状态" clearable>
+          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable>
             <el-option
               v-for="item in managerStateList"
               :key="item.id"
@@ -327,8 +327,9 @@
         </search-item>
         <search-item>
           <com-tree-select
+            ref="selectTreeRef"
             v-model="searchQuery.useDept" :options="useDeptList" placeholder="使用部门"
-            :tree-props="deptProps" style="width: 150px;"
+            :tree-props="deptProps"
           />
         </search-item>
         <search-item>
@@ -336,11 +337,10 @@
             v-model="searchQuery.validDate" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="有效日期"
             class="normal-date"
-            style="width: 150px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.abc" class="m-2 normal-select" placeholder="ABC" clearable>
+          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable>
             <el-option
               v-for="item in abcList"
               :key="item.id"
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 78a3800..4c31a94 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -2,9 +2,10 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/fixedAssetsAdd.vue'
-import type { fixedAssetsType } from './standingBook-interface'
+import type { fixedAssetsType, selectType } from './standingBook-interface'
 import { exportFile } from '@/utils/exportUtils'
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
+import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   assetNo: '', // 固定编号
@@ -50,7 +51,7 @@
   },
   {
     text: '设备类型',
-    value: 'assetTypeName',
+    value: 'equipmentTypeName',
     width: '150',
     align: 'center',
   },
@@ -102,6 +103,7 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+const equipmentCategoryList = ref<selectType[]>([]) // 设备类别
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
@@ -242,6 +244,10 @@
 }
 onMounted(() => {
   getList()
+  // 获取设备类别
+  getDictByCode('equipmentCategory').then((response) => {
+    equipmentCategoryList.value = response.data
+  })
 })
 </script>
 
@@ -265,7 +271,10 @@
           <el-input v-model="searchQuery.equipmentSpecifications" placeholder="设备规格" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-select v-model="searchQuery.equipmentCategory" placeholder="设备类别" clearable>
+            <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+          </el-select>
         </search-item>
       </search-area>
       <table-container>
diff --git a/src/views/device/stateManage/components/addRow.vue b/src/views/device/stateManage/components/addRow.vue
new file mode 100644
index 0000000..3ba82d6
--- /dev/null
+++ b/src/views/device/stateManage/components/addRow.vue
@@ -0,0 +1,160 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { listPageApi } from '@/api/device/standingBook'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  limit: 10,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '出厂编号',
+    value: 'manufacturingNo',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+  },
+])
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listPageApi(listQuery.value as any).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map(item => ({ ...item, checked: '' }))
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    equipmentName: '', // 姓名
+    equipmentNo: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const checkedArr = list.value.filter(item => item.checked !== '')
+  if (checkedArr.length) {
+    console.log(checkedArr, '选中的设备')
+    emits('add', checkedArr)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择设备')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns as any" :query="listQuery"
+        :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-checkbox v-model="scope.row.checked" :label="scope.$index" size="large" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-checkbox__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index 56417d6..214876c 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -47,38 +47,45 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="30%">
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
-      :rules="rules"
+      :rules="rules" label-width="110px"
     >
-      <el-form-item label="审批意见">
-        <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
-        <el-radio-group v-model="form.radio">
-          <el-radio label="1">
-            同意
-          </el-radio>
-          <el-radio label="2">
-            拒绝
-          </el-radio>
-          <el-radio label="3">
-            驳回
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="审批结论">
-        <el-input
-          :rows="4"
-          type="textarea"
-        />
-      </el-form-item>
       <el-row :gutter="24">
-        <el-col :span="10">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="审批人">
             <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
-        <el-col :span="14">
+        <el-col :span="12">
           <el-form-item label="审批时间">
             <el-input disabled :value="approvetime" />
           </el-form-item>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index e74d70e..2003e31 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -1,7 +1,8 @@
 <!-- 新增或详情弹窗 -->
-<script lang="ts" setup name="addNotice">
+<script lang="ts" setup name="add">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
+import addRow from './addRow.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
@@ -16,6 +17,7 @@
 const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const name = ref('')
+const borrowList = ref([])
 const ruleForm = ref({
   assetNo: '', // 资产编号
   assetType: '', // 资产类型
@@ -357,10 +359,86 @@
     isShowCalibration.value = true
   }
 })
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerLevelName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+  },
+])
+const addRowRef = ref()
+// 添加行
+const addRowBtn = () => {
+  addRowRef.value.initDialog({ title: '添加' })
+}
+// 删除行
+const removeRowBtn = () => {
+  const removeArr = borrowList.value.filter(item => item.remove !== '')
+  if (removeArr.length) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      borrowList.value = borrowList.value.filter(item => item.remove === '')
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 借用设备列表添加
+const addRowMethods = (row) => {
+  row.forEach((element) => {
+    borrowList.value.push({ ...element, remove: '' })
+  })
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
     <detail-page :title="`${name}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
@@ -378,15 +456,16 @@
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder="">
+              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -430,7 +509,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -454,28 +533,56 @@
         </el-row>
       </el-form>
     </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>
+    <div>
+      <detail-block title="借用设备列表">
+        <template #btns>
+          <el-button type="primary" @click="addRowBtn">
+            添加行
+          </el-button>
+          <el-button type="info" @click="removeRowBtn">
+            删除行
+          </el-button>
+        </template>
+        <normal-table
+          :data="borrowList" :total="1" :columns="columns as any"
+        >
+          <template #preColumns>
+            <el-table-column label="选择" width="55" align="center">
+              <template #default="scope">
+                <el-checkbox v-model="scope.row.remove" :label="scope.$index" size="large" />
+              </template>
+            </el-table-column>
+            <el-table-column label="序号" width="60" align="center">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </detail-block>
+      <detail-block 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>
+    </div>
   </app-container>
 </template>
 
@@ -484,6 +591,10 @@
   background-color: #fff;
 }
 
+:deep(.el-checkbox__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,
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index aaaaf61..d588b8d 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,6 +1,7 @@
 <script lang="ts" setup name="bench">
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
+import type { trainLogStatistic } from './bench-interface'
 import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
 import { getPlanList } from '@/api/system/plan'
 import { listPageApi } from '@/api/measure/file'
@@ -132,15 +133,19 @@
     account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
+    const result: trainLogStatistic = res.data
+    const notQualified: number = Number(result.trainCount) - result.qualifiedCount
+    const qualifiedRate = ((result.qualifiedCount / result.trainCount) * 100).toFixed(2) // 合格率
+    const notQualifiedRate = ((notQualified / result.trainCount) * 100).toFixed(2) // 不合格率
     TrainLogSList.value = [
-      { name: `合格     ${res.data.qualified}-${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
-      { name: `不合格   ${res.data.notQualified}- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+      { name: `合   格   ${result.qualifiedCount}-${qualifiedRate}%`, value: result.qualifiedCount },
+      { name: `不合格   ${notQualified}- ${notQualifiedRate}%`, value: notQualified },
     ]
     TrainLogTitle.value = res.data.trainCount
   }).catch((_) => {
     // 处理异常
     TrainLogSList.value = [
-      { name: '合格     0 - 50%', value: 0 },
+      { name: '合   格   0 - 50%', value: 0 },
       { name: '不合格   0 - 50%', value: 0 },
     ]
     TrainLogTitle.value = 0
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 9ef0b93..1ad577b 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -270,7 +270,7 @@
               <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="6">
             <el-form-item label="名称" prop="fileName">
               <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
             </el-form-item>
@@ -279,13 +279,14 @@
         <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" class="fill-input" disabled>
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled style="width: 100%;">
                 <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="请选择发布单位"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -295,6 +296,7 @@
                 v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -311,12 +313,13 @@
                 v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人" prop="createUserId">
-              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index b45fbc3..542b284 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -26,7 +26,7 @@
   createUser: '', // 创建人
   createTime: '', // 创建
   approvalStatus: props.value, // 审批状态
-  limit: 10,
+  limit: 20,
   offset: 1,
   fileType: '', // 类型
   formId: '',
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 7d4724b..e54ddf5 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -26,7 +26,7 @@
   fileCode: '', // 文件号
   effectiveTime: '', // 实施时间
   effectiveStatus: '', // 实施状态
-  limit: 10,
+  limit: 20,
   offset: 1,
   fileType: '', // 类型
 }) // 查询参数
@@ -75,13 +75,19 @@
 const getStatus = () => {
   getDictByCode('effectiveStatus').then((res) => {
     if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
+      effectiveStatusSelect.value = [...res.data, { name: '全部', value: '', id: 'quanbu' }]
     }
   })
 }
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.publishTime) {
+    searchQuery.publishTime = ''
+  }
+  if (!searchQuery.effectiveTime) {
+    searchQuery.effectiveTime = ''
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -252,13 +258,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" />
         </search-item>
         <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
@@ -274,20 +280,16 @@
           <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: 185px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
             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: 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" placeholder="实施状态" clearable>
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index 5ca3275..a95c665 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -505,21 +505,21 @@
         <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] === '详情'" @change="directorChange">
+              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;" @change="directorChange">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.name" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
-              <el-select v-model="ruleForm.technologyJob" :placeholder="title.split('-')[2] === '详情' ? '' : '技术职务'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.technologyJob" :placeholder="title.split('-')[2] === '详情' ? '' : '技术职务'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;">
                 <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="administrationJob">
-              <el-select v-model="ruleForm.administrationJob" :placeholder="title.split('-')[2] === '详情' ? '' : '行政职务'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.administrationJob" :placeholder="title.split('-')[2] === '详情' ? '' : '行政职务'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index aac1ef2..11d6d0a 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -22,7 +22,7 @@
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
-  limit: 10,
+  limit: 20,
   offset: 1,
   organizeType: '', // 类型
   createTime: '', // 创建时间
@@ -118,6 +118,9 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.createTime) {
+    searchQuery.createTime = ''
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows.map(item => ({ ...item, createTime: item.createTime.split(' ')[0] }))
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 3f472eb..bc5d9d4 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -7,7 +7,9 @@
 // import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
-import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+// import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const props = defineProps({
   isRemind: {
     type: Boolean,
@@ -78,11 +80,14 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 // 获取所有部门
-const deptList = ref<DeptTreeNode[]>([])
+const deptList = ref([])
 const getDeptList = async () => {
   getDeptTreeList().then((res) => {
-    deptList.value = res.data
+    deptList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
@@ -177,6 +182,7 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   searchQuery.staffNo = ''
@@ -184,6 +190,7 @@
   searchQuery.deptId = ''
   searchQuery.certificateStatus = ''
   searchQuery.verifierCertificateNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -212,10 +219,6 @@
     loading.close()
   })
 }
-// 打印
-const print = () => {
-
-}
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传图片
@@ -268,20 +271,24 @@
           <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+          <!-- <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
             <el-option
               v-for="item in deptList"
               :key="item.id"
               :label="item.name"
               :value="item.id"
             />
-          </el-select>
+          </el-select> -->
+          <com-tree-select
+            ref="selectTreeRef" v-model="searchQuery.deptId" :options="deptList"
+            placeholder="工作部门" :tree-props="deptProps"
+          />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况">
+          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况" clearable>
             <el-option
               v-for="item in certificateStatusList"
               :key="item.id"
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 4352604..5a5f036 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -389,10 +389,10 @@
           关闭
         </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">
-            <el-form-item prop="minioFileName" label-width="70px">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item prop="minioFileName">
               <el-upload
                 class="avatar-uploader"
                 :show-file-list="false"
@@ -423,23 +423,24 @@
               <el-date-picker
                 v-model="ruleForm.birthday" type="date" format="YYYY-MM" value-format="YYYY-MM"
                 placeholder="出生年月" :disabled="title === '详情'"
+                style="width: 100%;"
               />
             </el-form-item>
             <el-form-item label="工作部门" prop="deptId" class="marg-item">
-              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled>
+              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled style="width: 100%;">
                 <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="ruleForm.deptId" :options="PubListTree"
-                placeholder="选择组织机构" :tree-props="deptProps"
+                placeholder="选择组织机构" :tree-props="deptProps" style="width: 100%;"
               />
             </el-form-item>
             <el-form-item label="计量专业" prop="major" class="marg-item">
               <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
             </el-form-item>
             <el-form-item label="是否特操人" prop="specialOperator" class="marg-item">
-              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -449,23 +450,23 @@
               <el-input v-model.trim="ruleForm.staffNo" placeholder="系统自动生成" disabled />
             </el-form-item>
             <el-form-item label="性别" prop="sex" class="marg-item">
-              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="技术职务" prop="technologyJob" class="marg-item">
-              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="从事日期" prop="workDate" class="marg-item">
               <el-date-picker
                 v-model="ruleForm.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-                placeholder="请选择从事日期"
+                placeholder="请选择从事日期" style="width: 100%;"
               />
             </el-form-item>
-            <el-form-item label="是否技术考核" prop="technologyExam" class="marg-item">
-              <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'">
+            <el-form-item label="是否技术考核" prop="technologyExam" class="marg-item" style="width: 100%;">
+              <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -475,17 +476,17 @@
               <el-input ref="cardRef" v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" @blur="getBirthday" />
             </el-form-item>
             <el-form-item label="文化程度" prop="education" class="marg-item">
-              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="行政职务" prop="administrationJob" class="marg-item">
-              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="是否主考人" prop="mainExaminer" class="marg-item">
-              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index 042636e..660f2b0 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -264,7 +264,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="性别" prop="meterStaff.sex">
-              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -273,21 +273,21 @@
         <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-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -296,7 +296,7 @@
         <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-select v-if="title === '详情'" v-model="meterStaff.deptId" disabled style="width: 100%;">
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
               <com-tree-select
@@ -304,6 +304,7 @@
                 ref="selectTreeRef" v-model="meterStaff.deptId" :options="PubListTree"
                 placeholder="选择组织机构"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -316,7 +317,7 @@
             <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="请选择从事日期"
+                placeholder="请选择从事日期" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -347,7 +348,7 @@
             <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="请选择发证日期"
+                placeholder="请选择发证日期" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -355,7 +356,7 @@
             <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="请选择有效日期"
+                placeholder="请选择有效日期" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 178fc12..d0116f3 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -3,7 +3,7 @@
 import type { FormInstance, FormRules } from 'element-plus'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
+const formLabelWidth = '110px'
 const form = reactive({
   certificateNo: '', // 证书号
   certificateName: '', // 证书名称
@@ -71,32 +71,52 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`" width="40%">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
     >
-      <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
-        <el-input v-model="form.certificateNo" placeholder="证书号" />
-      </el-form-item>
-      <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
-        <el-input v-model="form.certificateName" placeholder="证书名称" />
-      </el-form-item>
-      <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
-        <el-input v-model="form.certificateCompany" placeholder="发证单位" />
-      </el-form-item>
-      <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
-        <el-date-picker
-          v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择发证日期"
-        />
-      </el-form-item>
-      <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-        <el-date-picker
-          v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择有效日期"
-        />
-      </el-form-item>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
+            <el-input v-model="form.certificateNo" placeholder="证书号" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
+            <el-input v-model="form.certificateName" placeholder="证书名称" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
+            <el-input v-model="form.certificateCompany" placeholder="发证单位" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
+            <el-date-picker
+              v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择发证日期" style="width: 100%;"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+            <el-date-picker
+              v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择有效日期" style="width: 100%;"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <template #footer>
       <span class="dialog-footer">
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
index 5e20d1b..10b0deb 100644
--- a/src/views/measure/person/components/personListDialog.vue
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -1,8 +1,11 @@
 <!-- 计量人员列表弹窗 -->
 <script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
 import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import { getDeptTreeList } from '@/api/system/dept'
-import type { TreeStructure } from '@/views/system/user/user-interface'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -10,7 +13,7 @@
   staffNo: '', // 人员编号
   name: '', // 姓名
   deptId: '', // 所在部门
-  limit: 5,
+  limit: 10,
   offset: 1,
 })
 const loadingTable = ref<boolean>(false)
@@ -32,20 +35,22 @@
   },
 ])
 // 获取部门
-const deptIdList = ref<TreeStructure[]>([])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const deptIdList = ref([])
 const getDeptList = () => {
   getDeptTreeList().then((res) => {
-    deptIdList.value = res.data
+    deptIdList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
 const fetchData = () => {
-  select.value = ''
+  select.value = -1
   getStaffList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.records
       total.value = Number(res.data.total)
-      console.log(list.value, 'list')
     }
   })
 }
@@ -53,6 +58,7 @@
 const search = () => {
   fetchData()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   listQuery.value = {
@@ -62,6 +68,7 @@
     limit: 10,
     offset: 1,
   }
+  selectTreeRef.value.clearSelected()
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -76,18 +83,24 @@
 }
 // 点击保存
 const submitForm = () => {
-  const person = list.value.filter((item, index) => index == select.value)[0]
-  console.log(person, 'person')
-  getStaffDetail(person).then((res) => {
-    if (res.code === 200) {
-      emits('add', res.data)
-      dialogFormVisible.value = false
-    }
-  })
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    getStaffDetail(person).then((res) => {
+      if (res.code === 200) {
+        emits('add', res.data)
+        dialogFormVisible.value = false
+        reset()
+      }
+    })
+  }
+  else {
+    ElMessage.warning('请先选择人员')
+  }
 }
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
+  reset()
 }
 // 初始化
 const initDialog = () => {
@@ -99,39 +112,45 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员" width="50%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable style="width: 150px;" />
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable style="width: 150px;" />
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
+        <!-- <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
           <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
+        </el-select> -->
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
-    <normal-table
-      :data="list" :total="total" :columns="columns" :query="listQuery"
-      :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>
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :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">
             {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
           </template>
         </el-table-column> -->
-      </template>
-    </normal-table>
+        </template>
+      </normal-table>
+    </div>
     <template #footer>
       <span class="dialog-footer">
         <el-button type="primary" @click="submitForm">确认</el-button>
diff --git a/src/views/measure/person/components/userListDialog.vue b/src/views/measure/person/components/userListDialog.vue
index dcd05b5..cd62a73 100644
--- a/src/views/measure/person/components/userListDialog.vue
+++ b/src/views/measure/person/components/userListDialog.vue
@@ -3,14 +3,16 @@
 import { ElMessage } from 'element-plus'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
-import type { TreeStructure } from '@/views/system/user/user-interface'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
 const listQuery = ref({
   keywords: '', // 姓名
   deptId: '', // 所在部门
-  limit: 5,
+  limit: 10,
   offset: 1,
 })
 const loadingTable = ref<boolean>(false)
@@ -31,11 +33,14 @@
     value: 'deptName',
   },
 ])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 // 获取部门
-const deptIdList = ref<TreeStructure[]>([])
+const deptIdList = ref([])
 const getDeptList = () => {
   getDeptTreeList().then((res) => {
-    deptIdList.value = res.data
+    deptIdList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
@@ -52,6 +57,7 @@
 const search = () => {
   fetchData()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   listQuery.value = {
@@ -60,6 +66,7 @@
     limit: 10,
     offset: 1,
   }
+  selectTreeRef.value.clearSelected()
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -74,11 +81,11 @@
 }
 // 点击保存
 const submitForm = () => {
-  console.log(select.value)
   if (select.value >= 0) {
     const person = list.value.filter((item, index) => index == select.value)[0]
     emits('add', person)
     dialogFormVisible.value = false
+    reset()
   }
   else {
     ElMessage.warning('请先选择人员')
@@ -87,9 +94,11 @@
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
+  reset()
 }
 // 初始化
 const initDialog = () => {
+  // reset()
   dialogFormVisible.value = true
   getDeptList()
   fetchData()
@@ -98,16 +107,20 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+  <el-dialog v-model="dialogFormVisible" title="选择人员" width="50%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
         <el-input v-model.trim="listQuery.keywords" placeholder="真实姓名" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable>
+        <!-- <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable>
           <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
+        </el-select> -->
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 9c6f65d..355473a 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -7,7 +7,9 @@
 // import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
-import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+// import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
@@ -16,7 +18,7 @@
   major: '', // 计量专业
   verifierCertificateNo: '', // 证书号
   certificateStatus: '', // 证书状态
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -52,10 +54,10 @@
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取所有部门
-const deptList = ref<DeptTreeNode[]>([])
+const deptList = ref([])
 const getDeptList = async () => {
   getDeptTreeList().then((res) => {
-    deptList.value = res.data
+    deptList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
@@ -126,6 +128,7 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   searchQuery.staffNo = ''
@@ -133,6 +136,7 @@
   searchQuery.deptId = ''
   searchQuery.major = ''
   searchQuery.verifierCertificateNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -160,10 +164,9 @@
     loading.close()
   })
 }
-// 打印
-const print = () => {
-
-}
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传图片
@@ -216,14 +219,18 @@
           <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+          <!-- <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
             <el-option
               v-for="item in deptList"
               :key="item.id"
               :label="item.name"
               :value="item.id"
             />
-          </el-select>
+          </el-select> -->
+          <com-tree-select
+            ref="selectTreeRef" v-model="searchQuery.deptId" :options="deptList"
+            placeholder="工作部门" :tree-props="deptProps"
+          />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.major" placeholder="计量专业" clearable class="w-50 m-2" />
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index af0a29d..2e0e7af 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -1,12 +1,15 @@
 <script lang="ts" setup name="ListSourceAdd">
-import { reactive, ref } from 'vue'
+/**
+ * 添加/编辑/详情溯源供方
+ */
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions, IformInline } from './list_interface'
+import type { IOptions, IformInline, traceSupplierPerson } from './list_interface'
 import { exportFile } from '@/utils/exportUtils'
 import { UploadFile } from '@/api/measure/file'
 import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+import { validatePhone } from '@/utils/validate'
 const props = defineProps({
   infoId: {
     type: String,
@@ -19,43 +22,45 @@
 })
 const emit = defineEmits(['close'])
 const formInline: Ref<IformInline> = ref({
-  businessContent: null,
-  supplierName: null,
-  supplierNo: null,
-  bankAccount: null,
-  bankAccountNumber: null,
-  bankName: null,
-  briefName: null,
-  businessScope: null,
-  companyAddress: null,
-  companyArea: null,
-  companyCity: null,
-  companyCountry: null,
-  companyProvince: null,
-  createTime: null,
-  director: null,
-  fax: null,
-  invoiceAddress: null,
-  invoiceArea: null,
-  invoiceCity: null,
-  invoiceCountry: null,
-  invoiceProvince: null,
-  mailbox: null,
-  minioFileName: null,
-  mobile: null,
-  phone: null,
-  postalCode: null,
-  remark: null,
-  taxNumber: null,
-  website: null,
+  id: '',
+  businessContent: '',
+  supplierName: '',
+  supplierNo: '',
+  bankAccount: '',
+  bankAccountNumber: '',
+  bankName: '',
+  briefName: '',
+  businessScope: '',
+  companyAddress: '',
+  companyArea: '',
+  companyCity: '',
+  companyCountry: '',
+  companyProvince: '',
+  createTime: '',
+  director: '',
+  fax: '',
+  invoiceAddress: '',
+  invoiceArea: '',
+  invoiceCity: '',
+  invoiceCountry: '',
+  invoiceProvince: '',
+  mailbox: '',
+  minioFileName: '',
+  mobile: '',
+  phone: '',
+  postalCode: '',
+  remark: '',
+  taxNumber: '',
+  website: '',
   traceSupplierPersonList: [],
 })
+const traceSupplierPersonList: Ref<traceSupplierPerson[]> = ref([])
 const columns = ref([
-  { text: '人员编号', value: 'personNo', show: true },
-  { text: '姓名', value: 'name', show: true },
-  { text: '工作部门', value: 'department', show: true },
-  { text: '职务', value: 'job', show: true },
-  { text: '联系方式', value: 'phone', show: true },
+  { text: '人员编号', value: 'personNo', required: false },
+  { text: '姓名', value: 'name', required: true },
+  { text: '工作部门', value: 'department', required: false },
+  { text: '职务', value: 'job', required: false },
+  { text: '联系方式', value: 'phone', required: true, reg: validatePhone },
 ])
 const ruleFormRef = ref<FormInstance>()
 const provinceList = ref<IOptions[]>([])
@@ -66,14 +71,17 @@
 const invoiceCityList = ref<IOptions[]>([])
 const areaInvoiceList = ref<IOptions[]>([])
 const dialogVisible = ref(false)
-const addPersonList = ref({
+// 人员对象
+const addPersonObj: traceSupplierPerson = {
+  id: '',
   personNo: '',
   name: '',
   department: '',
   job: '',
   phone: '',
-})
-const SelectionList = ref([])
+  editable: true,
+}
+const SelectionList: Ref<traceSupplierPerson[]> = ref([])
 const upload = ref<UploadInstance>()
 // 校验规则
 const rules = ref({
@@ -91,7 +99,7 @@
   })
 }
 // 表格选中
-const handleSelectionChange = (e: any) => {
+const handleSelectionChange = (e: traceSupplierPerson[]) => {
   SelectionList.value = e
 }
 // 获取公司地址省级
@@ -142,15 +150,33 @@
   })
 }
 // 点击增加行
-const addRoow = () => {
-  const object = {
-    personNo: '',
-    name: '',
-    department: '',
-    job: '',
-    phone: '',
+const addRow = () => {
+  // 检查上一行必填项
+  if (checkPersonList()) {
+    setAllRowReadable()
+    traceSupplierPersonList.value.push({ ...addPersonObj })
   }
-  formInline.value.traceSupplierPersonList.push(object)
+}
+// 检查人员列表
+function checkPersonList() {
+  for (let index = 0; index < traceSupplierPersonList.value.length; index++) {
+    const item = traceSupplierPersonList.value[index]
+    for (const prop of columns.value) {
+      // 检查必填
+      if (prop.required && !item[prop.value]) {
+        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
+        return false
+      }
+      // 验证正则
+      if (prop.reg && typeof prop.reg === 'function') {
+        if (!prop.reg(item[prop.value])) {
+          ElMessage.warning(`第${index + 1}行中${prop.text}输入不合法`)
+          return false
+        }
+      }
+    }
+  }
+  return true
 }
 // 点击关闭
 const handleClose = () => {
@@ -158,12 +184,12 @@
 }
 // 点击弹窗的完成追加到表格数组中
 const addPushList = () => {
-  formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonList.value)))
+  formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonObj.value)))
   handleClose()
 }
 // 删除行
 const deleteList = () => {
-  formInline.value.traceSupplierPersonList = formInline.value.traceSupplierPersonList.filter((item) => {
+  traceSupplierPersonList.value = traceSupplierPersonList.value.filter((item: traceSupplierPerson) => {
     return !SelectionList.value.includes(item)
   })
 }
@@ -261,10 +287,16 @@
     }
   })
 }
-// 双击表格显示输入框
-const dblclickName = (item: object) => {
-  console.log(item)
-  item.show = false
+// 双击行显示输入框
+const dblclickRow = (row: traceSupplierPerson) => {
+  setAllRowReadable()
+  row.editable = true
+}
+// 将所有人员信息列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of traceSupplierPersonList.value) {
+    item.editable = false
+  }
 }
 if (props.buttonType !== '新建') {
   getInfo()
@@ -273,7 +305,7 @@
 
 <template>
   <app-container>
-    <detail-page :title="`培训计划-${buttonType}`">
+    <detail-page :title="`溯源供方-${buttonType}`">
       <template #btns>
         <el-button
           type="primary"
@@ -617,39 +649,36 @@
       </el-form>
     </detail-page>
     <detail-block title="人员信息">
-      <template #btns>
-        <el-button
-          type="info"
-          :disabled="buttonType === '详情'"
-          @click="deleteList"
-        >
+      <template v-if="buttonType !== '详情'" #btns>
+        <el-button type="info" @click="deleteList">
           删除行
         </el-button>
-        <el-button
-          type="primary"
-          :disabled="buttonType === '详情'"
-          @click="addRoow"
-        >
+        <el-button type="primary" @click="addRow">
           增加行
         </el-button>
       </template>
       <el-table
-        :data="formInline.traceSupplierPersonList"
+        :data="traceSupplierPersonList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
+        @row-dblclick="dblclickRow"
       >
-        <el-table-column type="selection" width="55" />
+        <el-table-column type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column
           v-for="item in columns"
           :key="item.value"
           :prop="item.value"
           :label="item.text"
+          align="center"
         >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
           <template #default="scope">
-            <span v-show="item.show" style="color: gray;" @dblclick="dblclickName(item)">{{ scope.row[item.value] || `双击编辑${item.text}` }}</span>
-            <el-input v-show="!item.show" v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" @blur="item.show = true" />
+            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+            <el-input v-else v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index 530bcc4..c057976 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -24,6 +24,18 @@
   areaName: string
 }
 
+// 溯源供方人员
+export interface traceSupplierPerson {
+  id: number | string // id
+  job: string // 职务
+  department: string// 部门
+  name: string// 信命
+  personNo: string// 人员编号
+  phone: string// 联系方式
+  editable?: boolean // 是否可编辑
+  [key: string]: any
+}
+
 export interface IformInline {
   businessContent: string
   supplierName: string
@@ -55,5 +67,6 @@
   remark: string
   taxNumber: string
   website: string
-  traceSupplierPersonList: []
+  traceSupplierPersonList: traceSupplierPerson []
 }
+
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index e44001a..600eda1 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -32,11 +32,20 @@
   dialogVisible.value = true
   ruleForm.noticePublisher = userInfo.$state.name
   ruleForm.noticeCompany = userInfo.$state.deptName
-  ruleForm.noticeTime = dayjs().format('YYYY-MM-DD')
+  ruleForm.noticeTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
 }
 defineExpose({ initDialog })
+// 重置
+const resetDialog = () => {
+  ruleForm.noticeTime = ''
+  ruleForm.noticeSketch = ''
+  ruleForm.noticeContent = ''
+  ruleForm.minioFileName = ''
+  ruleForm.noticeTitle = ''
+}
 // 关闭弹窗
 const close = () => {
+  resetDialog()
   dialogVisible.value = false
   emits('resetData')
 }
@@ -63,6 +72,7 @@
 const resetForm = (formEl: FormInstance | undefined) => {
   // if (!formEl) { return }
   formEl?.resetFields()
+  resetDialog()
   dialogVisible.value = false
   emits('resetData')
 }
@@ -105,7 +115,7 @@
     uploadImage: {
       server: 'http://111.198.10.15:21409/minio/file/upload', // 配置图片上传地址
       maxFileSize: 2 * 1024 * 1024, // 10M  图片大小限制
-      fieldName: 'img', // 上传类型
+      fieldName: 'multipartFile', // 上传名字
       allowedFileTypes: [], // 选择文件时的类型限制，默认为 ['image/*'] 。如不想限制，则设置为 []
       // 自定义上传参数，传递图片时需要带一些参数过去写在这。参数会被添加到 formData 中，一起上传到服务端。
       // meta: {
@@ -154,9 +164,9 @@
     uploadVideo: {
       server: 'http://111.198.10.15:21409/minio/file/upload', // 配置视频上传地址
       maxFileSize: 5 * 1024 * 1024, // 5M  视频大小限制
-      fieldName: 'your-custom-name', // 上传类型
+      fieldName: 'multipartFile', // 上传名字
       // 最多可上传几个文件，默认为 5
-      maxNumberOfFiles: 3,
+      // maxNumberOfFiles: 1,
       allowedFileTypes: [], // 选择文件时的类型限制，默认为 ['video/*'] 。如不想限制，则设置为 []
       // 自定义上传参数，传递图片时需要带一些参数过去写在这。参数会被添加到 formData 中，一起上传到服务端。
       // meta: {
@@ -167,8 +177,8 @@
       //     Accept: 'text/x-json',
       //     otherKey: 'xxx'
       // },
-      metaWithUrl: false, // 将 meta 拼接到 url 参数中，默认 false
-      withCredentials: true, // 跨域是否传递 cookie ，默认为 false
+      // metaWithUrl: false, // 将 meta 拼接到 url 参数中，默认 false
+      // withCredentials: true, // 跨域是否传递 cookie ，默认为 false
       // 上传之前触发
       onBeforeUpload(file: any) {
         // file 选中的文件，格式如 { key: file }
@@ -222,9 +232,6 @@
     editorRef.value = editor // 一定要用 Object.seal() ，否则会报错
   })
 }
-const look = () => {
-  console.log(ruleForm.noticeContent)
-}
 const minioFileUrl = ref('')
 watch(() => ruleForm.minioFileName, (newVal) => {
   if (newVal) {
@@ -278,7 +285,7 @@
           />
           <editor
             v-model="ruleForm.noticeContent"
-            style="height: 150px; overflow-y: hidden;"
+            style="height: 300px; overflow-y: hidden;"
             :default-config="editorConfig"
             mode="default"
             @onCreated="onCreated"

diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index bb58885..2959118 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -53,3 +53,64 @@
   }
   return true
 }
+
+/**
+ * 验证小写字母
+ * @param str
+ * @returns
+ */
+export function validateLowerCase(str: string) {
+  const reg = /^[a-z]+$/
+  return reg.test(str)
+}
+
+/* 验证大写字母 */
+export function validateUpperCase(str: string) {
+  const reg = /^[A-Z]+$/
+  return reg.test(str)
+}
+
+/* 验证大小写字母 */
+export function validateAlphabets(str: string) {
+  const reg = /^[A-Za-z]+$/
+  return reg.test(str)
+}
+
+/**
+ * 验证邮箱
+ * @param email
+ * @returns {boolean}
+ */
+export function validateEmail(email: string) {
+  const re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
+  return re.test(email)
+}
+
+/**
+ * 验证手机号
+ * @param phone
+ * @returns {boolean}
+ */
+export function validateMobile(phone: string) {
+  const re = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/
+  return re.test(phone)
+}
+
+/**
+ * 校验身份证号
+ * @param value
+ * @returns
+ */
+export function validateIdCardNo(value: string) {
+  const re = /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/
+  return re.test(value)
+}
+/**
+ *
+ * @param value 验证电话号码
+ * @returns
+ */
+export function validatePhone(value: string) {
+  const re = /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/
+  return re.test(value)
+}
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 1c2405e..bca0958 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,13 +1,46 @@
-<script lang="ts" setup name="borrowHandle">
-// 逻辑代码
+<!-- 设备借用处理 -->
+<script lang="ts" setup name="borrowApply">
+import list from './components/handleList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '待借用', comp: list },
+  { name: '已借用', comp: list },
+  { name: '已归还', comp: list },
+])
+const current = ref('待借用')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用处理
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 03d414b..c5771f7 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,13 +1,50 @@
+<!-- 设备借用申请 -->
 <script lang="ts" setup name="borrowApply">
-// 逻辑代码
+import list from './components/applyList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '全部', comp: list },
+  { name: '草稿箱', comp: list },
+  { name: '待审批', comp: list },
+  { name: '审批中', comp: list },
+  { name: '已通过', comp: list },
+  { name: '未通过', comp: list },
+  { name: '已取消', comp: list },
+])
+const current = ref('全部')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用申请
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
new file mode 100644
index 0000000..052f3ce
--- /dev/null
+++ b/src/views/device/borrow/components/applyList.vue
@@ -0,0 +1,328 @@
+<script lang="ts" setup name="borrowApplyList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '文件号',
+    value: 'fileNo',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '类别',
+    value: 'catergory',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '李四',
+      time: '2020-12-14 00:00:00',
+      status: '未通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const approveRef = ref()
+// 同意
+const agree = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '1',
+  })
+}
+// 驳回
+const reject = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '3',
+  })
+}
+// 拒绝
+const refuse = (row: any) => {
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
+}
+// 取消
+const cancel = (rowrow: any) => {
+  ElMessageBox.confirm(
+    '确认取消吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" @click="addBtn" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="agree(row)">
+                  同意
+                </el-button>
+                <el-button size="small" type="primary" link @click="reject(row)">
+                  驳回
+                </el-button>
+                <el-button size="small" type="primary" link @click="refuse(row)">
+                  拒绝
+                </el-button>
+                <el-button size="small" type="primary" link @click="cancel(row)">
+                  取消
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/components/approvalActionDialog.vue b/src/views/device/borrow/components/approvalActionDialog.vue
new file mode 100644
index 0000000..214876c
--- /dev/null
+++ b/src/views/device/borrow/components/approvalActionDialog.vue
@@ -0,0 +1,104 @@
+<!-- 审批操作弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
+const dialogVisibleApprove = ref(false)
+const form = reactive({
+  radio: '1',
+})
+const ruleFormRef = ref<FormInstance>()
+const rules = reactive<FormRules>({
+})
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const approvetime = ref('') // 审批时间
+const initDialog = (row: any) => {
+  dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
+}
+defineExpose({ initDialog })
+
+// 点击保存
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      dialogVisibleApprove.value = false
+      emits('resetData')
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  formEl.resetFields()
+  dialogVisibleApprove.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
+    <el-form
+      ref="ruleFormRef" :model="form"
+      :rules="rules" label-width="110px"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人">
+            <el-input disabled :value="userInfo.$state.name" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间">
+            <el-input disabled :value="approvetime" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
+        <el-button @click="resetForm(ruleFormRef)">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
new file mode 100644
index 0000000..cfda00a
--- /dev/null
+++ b/src/views/device/borrow/components/handleList.vue
@@ -0,0 +1,281 @@
+<script lang="ts" setup name="borrowHandleList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '申请编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'dept',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      dept: '顶级',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      dept: '徐州分中心',
+      user: '里斯',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+const borrow = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="borrow(row)">
+                  借用
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/addRow.vue b/src/views/device/standingBook/components/addRow.vue
index 1678cdb..07b03d1 100644
--- a/src/views/device/standingBook/components/addRow.vue
+++ b/src/views/device/standingBook/components/addRow.vue
@@ -5,7 +5,7 @@
 import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
+const formLabelWidth = '110px'
 const form = ref({})
 const formTable = ref([
   {
@@ -91,108 +91,188 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`">
+  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
     >
       <div v-if="name === '周检记录'">
-        <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录表编号" />
-        </el-form-item>
-        <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录人" />
-        </el-form-item>
-        <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="检定日期"
-          />
-        </el-form-item>
-        <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="有效日期"
-          />
-        </el-form-item>
-        <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="送检人" />
-        </el-form-item>
-        <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录表编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="检定日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="有效日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="送检人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '状态变更记录'">
-        <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="状态类型" clearable>
-            <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="结束日期"
-          />
-        </el-form-item>
-        <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="申请人" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="状态类型" clearable style="width: 100%;">
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="申请人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '使用记录'">
-        <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用人" />
-        </el-form-item>
-        <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用部门" />
-        </el-form-item>
-        <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="使用类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用结束日期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用部门" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="使用类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '检定证书'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="证书类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书出具日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书有效期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
     </el-form>
     <template #footer>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 5f7b347..9a9f798 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -352,7 +352,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -376,7 +376,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -391,7 +391,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -404,14 +404,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -434,7 +434,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -443,20 +443,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -480,23 +480,23 @@
               <com-tree-select
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -507,10 +507,10 @@
             <el-form-item label="检定部门" prop="mesureDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -520,7 +520,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -529,13 +529,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -544,21 +544,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -578,14 +578,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -594,14 +594,14 @@
         <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-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -669,7 +669,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index fc3fd54..d9d4514 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -199,6 +199,8 @@
     useDeptList.value = toTreeList(res.data, '0', true)
   })
 }
+const selectTreeRef1 = ref()
+const selectTreeRef2 = ref()
 // 重置
 const resetDATA = () => {
   ruleForm.value = {
@@ -254,6 +256,10 @@
     isStandardSupportEquipment: '', //		是否标准配套设备
     id: '',
   }
+  if (title.value !== '详情') {
+    selectTreeRef1.value.clearSelected()
+    selectTreeRef2.value.clearSelected()
+  }
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
@@ -378,7 +384,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -402,7 +408,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -416,8 +422,7 @@
             <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"
+                :placeholder="title === '详情' ? '' : '出厂年月'" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -430,14 +435,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -460,7 +465,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -469,20 +474,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -505,24 +510,26 @@
             <el-form-item label="使用部门" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
+                ref="selectTreeRef2"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -536,10 +543,12 @@
               </el-select> -->
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                ref="selectTreeRef1"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -549,7 +558,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -558,13 +567,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -573,21 +582,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -607,14 +616,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -624,14 +633,14 @@
           <el-col :span="6">
             <el-form-item label="资本来源" prop="capitalSource">
               <!-- <el-input v-model.trim="ruleForm.capitalSource" placeholder="资本来源" :disabled="title === '详情'" /> -->
-              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -699,7 +708,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f653095..f4229a6 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -147,19 +147,17 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
-  setTimeout(() => {
-    list.value = [
-      {
-        equipmentNo: 123,
-        equipmentName: 'test',
-        modelNo: '001',
-        usePersonName: '张三',
-        validDate: '2022-12-12 00:00:00',
-        useDeptName: '顶级',
-      },
-    ]
-    total.value = 1
-  }, 1000)
+  list.value = [
+    {
+      equipmentNo: 123,
+      equipmentName: 'test',
+      modelNo: '001',
+      usePersonName: '张三',
+      validDate: '2022-12-12 00:00:00',
+      useDeptName: '顶级',
+    },
+  ] as any
+  total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -220,9 +218,11 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -300,13 +300,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.mesureType" class="m-2 normal-select" placeholder="检定方式" clearable>
+          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable>
             <el-option
               v-for="item in mesureTypeList"
               :key="item.id"
@@ -316,7 +316,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.managerState" class="m-2 normal-select" placeholder="管理状态" clearable>
+          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable>
             <el-option
               v-for="item in managerStateList"
               :key="item.id"
@@ -327,8 +327,9 @@
         </search-item>
         <search-item>
           <com-tree-select
+            ref="selectTreeRef"
             v-model="searchQuery.useDept" :options="useDeptList" placeholder="使用部门"
-            :tree-props="deptProps" style="width: 150px;"
+            :tree-props="deptProps"
           />
         </search-item>
         <search-item>
@@ -336,11 +337,10 @@
             v-model="searchQuery.validDate" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="有效日期"
             class="normal-date"
-            style="width: 150px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.abc" class="m-2 normal-select" placeholder="ABC" clearable>
+          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable>
             <el-option
               v-for="item in abcList"
               :key="item.id"
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 78a3800..4c31a94 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -2,9 +2,10 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/fixedAssetsAdd.vue'
-import type { fixedAssetsType } from './standingBook-interface'
+import type { fixedAssetsType, selectType } from './standingBook-interface'
 import { exportFile } from '@/utils/exportUtils'
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
+import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   assetNo: '', // 固定编号
@@ -50,7 +51,7 @@
   },
   {
     text: '设备类型',
-    value: 'assetTypeName',
+    value: 'equipmentTypeName',
     width: '150',
     align: 'center',
   },
@@ -102,6 +103,7 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+const equipmentCategoryList = ref<selectType[]>([]) // 设备类别
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
@@ -242,6 +244,10 @@
 }
 onMounted(() => {
   getList()
+  // 获取设备类别
+  getDictByCode('equipmentCategory').then((response) => {
+    equipmentCategoryList.value = response.data
+  })
 })
 </script>
 
@@ -265,7 +271,10 @@
           <el-input v-model="searchQuery.equipmentSpecifications" placeholder="设备规格" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-select v-model="searchQuery.equipmentCategory" placeholder="设备类别" clearable>
+            <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+          </el-select>
         </search-item>
       </search-area>
       <table-container>
diff --git a/src/views/device/stateManage/components/addRow.vue b/src/views/device/stateManage/components/addRow.vue
new file mode 100644
index 0000000..3ba82d6
--- /dev/null
+++ b/src/views/device/stateManage/components/addRow.vue
@@ -0,0 +1,160 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { listPageApi } from '@/api/device/standingBook'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  limit: 10,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '出厂编号',
+    value: 'manufacturingNo',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+  },
+])
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listPageApi(listQuery.value as any).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map(item => ({ ...item, checked: '' }))
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    equipmentName: '', // 姓名
+    equipmentNo: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const checkedArr = list.value.filter(item => item.checked !== '')
+  if (checkedArr.length) {
+    console.log(checkedArr, '选中的设备')
+    emits('add', checkedArr)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择设备')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns as any" :query="listQuery"
+        :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-checkbox v-model="scope.row.checked" :label="scope.$index" size="large" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-checkbox__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index 56417d6..214876c 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -47,38 +47,45 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="30%">
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
-      :rules="rules"
+      :rules="rules" label-width="110px"
     >
-      <el-form-item label="审批意见">
-        <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
-        <el-radio-group v-model="form.radio">
-          <el-radio label="1">
-            同意
-          </el-radio>
-          <el-radio label="2">
-            拒绝
-          </el-radio>
-          <el-radio label="3">
-            驳回
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="审批结论">
-        <el-input
-          :rows="4"
-          type="textarea"
-        />
-      </el-form-item>
       <el-row :gutter="24">
-        <el-col :span="10">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="审批人">
             <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
-        <el-col :span="14">
+        <el-col :span="12">
           <el-form-item label="审批时间">
             <el-input disabled :value="approvetime" />
           </el-form-item>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index e74d70e..2003e31 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -1,7 +1,8 @@
 <!-- 新增或详情弹窗 -->
-<script lang="ts" setup name="addNotice">
+<script lang="ts" setup name="add">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
+import addRow from './addRow.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
@@ -16,6 +17,7 @@
 const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const name = ref('')
+const borrowList = ref([])
 const ruleForm = ref({
   assetNo: '', // 资产编号
   assetType: '', // 资产类型
@@ -357,10 +359,86 @@
     isShowCalibration.value = true
   }
 })
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerLevelName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+  },
+])
+const addRowRef = ref()
+// 添加行
+const addRowBtn = () => {
+  addRowRef.value.initDialog({ title: '添加' })
+}
+// 删除行
+const removeRowBtn = () => {
+  const removeArr = borrowList.value.filter(item => item.remove !== '')
+  if (removeArr.length) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      borrowList.value = borrowList.value.filter(item => item.remove === '')
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 借用设备列表添加
+const addRowMethods = (row) => {
+  row.forEach((element) => {
+    borrowList.value.push({ ...element, remove: '' })
+  })
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
     <detail-page :title="`${name}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
@@ -378,15 +456,16 @@
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder="">
+              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -430,7 +509,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -454,28 +533,56 @@
         </el-row>
       </el-form>
     </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>
+    <div>
+      <detail-block title="借用设备列表">
+        <template #btns>
+          <el-button type="primary" @click="addRowBtn">
+            添加行
+          </el-button>
+          <el-button type="info" @click="removeRowBtn">
+            删除行
+          </el-button>
+        </template>
+        <normal-table
+          :data="borrowList" :total="1" :columns="columns as any"
+        >
+          <template #preColumns>
+            <el-table-column label="选择" width="55" align="center">
+              <template #default="scope">
+                <el-checkbox v-model="scope.row.remove" :label="scope.$index" size="large" />
+              </template>
+            </el-table-column>
+            <el-table-column label="序号" width="60" align="center">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </detail-block>
+      <detail-block 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>
+    </div>
   </app-container>
 </template>
 
@@ -484,6 +591,10 @@
   background-color: #fff;
 }
 
+:deep(.el-checkbox__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,
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index aaaaf61..d588b8d 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,6 +1,7 @@
 <script lang="ts" setup name="bench">
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
+import type { trainLogStatistic } from './bench-interface'
 import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
 import { getPlanList } from '@/api/system/plan'
 import { listPageApi } from '@/api/measure/file'
@@ -132,15 +133,19 @@
     account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
+    const result: trainLogStatistic = res.data
+    const notQualified: number = Number(result.trainCount) - result.qualifiedCount
+    const qualifiedRate = ((result.qualifiedCount / result.trainCount) * 100).toFixed(2) // 合格率
+    const notQualifiedRate = ((notQualified / result.trainCount) * 100).toFixed(2) // 不合格率
     TrainLogSList.value = [
-      { name: `合格     ${res.data.qualified}-${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
-      { name: `不合格   ${res.data.notQualified}- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+      { name: `合   格   ${result.qualifiedCount}-${qualifiedRate}%`, value: result.qualifiedCount },
+      { name: `不合格   ${notQualified}- ${notQualifiedRate}%`, value: notQualified },
     ]
     TrainLogTitle.value = res.data.trainCount
   }).catch((_) => {
     // 处理异常
     TrainLogSList.value = [
-      { name: '合格     0 - 50%', value: 0 },
+      { name: '合   格   0 - 50%', value: 0 },
       { name: '不合格   0 - 50%', value: 0 },
     ]
     TrainLogTitle.value = 0
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 9ef0b93..1ad577b 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -270,7 +270,7 @@
               <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="6">
             <el-form-item label="名称" prop="fileName">
               <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
             </el-form-item>
@@ -279,13 +279,14 @@
         <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" class="fill-input" disabled>
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled style="width: 100%;">
                 <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="请选择发布单位"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -295,6 +296,7 @@
                 v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -311,12 +313,13 @@
                 v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人" prop="createUserId">
-              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index b45fbc3..542b284 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -26,7 +26,7 @@
   createUser: '', // 创建人
   createTime: '', // 创建
   approvalStatus: props.value, // 审批状态
-  limit: 10,
+  limit: 20,
   offset: 1,
   fileType: '', // 类型
   formId: '',
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 7d4724b..e54ddf5 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -26,7 +26,7 @@
   fileCode: '', // 文件号
   effectiveTime: '', // 实施时间
   effectiveStatus: '', // 实施状态
-  limit: 10,
+  limit: 20,
   offset: 1,
   fileType: '', // 类型
 }) // 查询参数
@@ -75,13 +75,19 @@
 const getStatus = () => {
   getDictByCode('effectiveStatus').then((res) => {
     if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
+      effectiveStatusSelect.value = [...res.data, { name: '全部', value: '', id: 'quanbu' }]
     }
   })
 }
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.publishTime) {
+    searchQuery.publishTime = ''
+  }
+  if (!searchQuery.effectiveTime) {
+    searchQuery.effectiveTime = ''
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -252,13 +258,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" />
         </search-item>
         <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
@@ -274,20 +280,16 @@
           <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: 185px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
             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: 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" placeholder="实施状态" clearable>
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index 5ca3275..a95c665 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -505,21 +505,21 @@
         <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] === '详情'" @change="directorChange">
+              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;" @change="directorChange">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.name" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
-              <el-select v-model="ruleForm.technologyJob" :placeholder="title.split('-')[2] === '详情' ? '' : '技术职务'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.technologyJob" :placeholder="title.split('-')[2] === '详情' ? '' : '技术职务'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;">
                 <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="administrationJob">
-              <el-select v-model="ruleForm.administrationJob" :placeholder="title.split('-')[2] === '详情' ? '' : '行政职务'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.administrationJob" :placeholder="title.split('-')[2] === '详情' ? '' : '行政职务'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index aac1ef2..11d6d0a 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -22,7 +22,7 @@
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
-  limit: 10,
+  limit: 20,
   offset: 1,
   organizeType: '', // 类型
   createTime: '', // 创建时间
@@ -118,6 +118,9 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.createTime) {
+    searchQuery.createTime = ''
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows.map(item => ({ ...item, createTime: item.createTime.split(' ')[0] }))
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 3f472eb..bc5d9d4 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -7,7 +7,9 @@
 // import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
-import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+// import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const props = defineProps({
   isRemind: {
     type: Boolean,
@@ -78,11 +80,14 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 // 获取所有部门
-const deptList = ref<DeptTreeNode[]>([])
+const deptList = ref([])
 const getDeptList = async () => {
   getDeptTreeList().then((res) => {
-    deptList.value = res.data
+    deptList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
@@ -177,6 +182,7 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   searchQuery.staffNo = ''
@@ -184,6 +190,7 @@
   searchQuery.deptId = ''
   searchQuery.certificateStatus = ''
   searchQuery.verifierCertificateNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -212,10 +219,6 @@
     loading.close()
   })
 }
-// 打印
-const print = () => {
-
-}
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传图片
@@ -268,20 +271,24 @@
           <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+          <!-- <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
             <el-option
               v-for="item in deptList"
               :key="item.id"
               :label="item.name"
               :value="item.id"
             />
-          </el-select>
+          </el-select> -->
+          <com-tree-select
+            ref="selectTreeRef" v-model="searchQuery.deptId" :options="deptList"
+            placeholder="工作部门" :tree-props="deptProps"
+          />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况">
+          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况" clearable>
             <el-option
               v-for="item in certificateStatusList"
               :key="item.id"
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 4352604..5a5f036 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -389,10 +389,10 @@
           关闭
         </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">
-            <el-form-item prop="minioFileName" label-width="70px">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item prop="minioFileName">
               <el-upload
                 class="avatar-uploader"
                 :show-file-list="false"
@@ -423,23 +423,24 @@
               <el-date-picker
                 v-model="ruleForm.birthday" type="date" format="YYYY-MM" value-format="YYYY-MM"
                 placeholder="出生年月" :disabled="title === '详情'"
+                style="width: 100%;"
               />
             </el-form-item>
             <el-form-item label="工作部门" prop="deptId" class="marg-item">
-              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled>
+              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled style="width: 100%;">
                 <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="ruleForm.deptId" :options="PubListTree"
-                placeholder="选择组织机构" :tree-props="deptProps"
+                placeholder="选择组织机构" :tree-props="deptProps" style="width: 100%;"
               />
             </el-form-item>
             <el-form-item label="计量专业" prop="major" class="marg-item">
               <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
             </el-form-item>
             <el-form-item label="是否特操人" prop="specialOperator" class="marg-item">
-              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -449,23 +450,23 @@
               <el-input v-model.trim="ruleForm.staffNo" placeholder="系统自动生成" disabled />
             </el-form-item>
             <el-form-item label="性别" prop="sex" class="marg-item">
-              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="技术职务" prop="technologyJob" class="marg-item">
-              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="从事日期" prop="workDate" class="marg-item">
               <el-date-picker
                 v-model="ruleForm.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-                placeholder="请选择从事日期"
+                placeholder="请选择从事日期" style="width: 100%;"
               />
             </el-form-item>
-            <el-form-item label="是否技术考核" prop="technologyExam" class="marg-item">
-              <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'">
+            <el-form-item label="是否技术考核" prop="technologyExam" class="marg-item" style="width: 100%;">
+              <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -475,17 +476,17 @@
               <el-input ref="cardRef" v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" @blur="getBirthday" />
             </el-form-item>
             <el-form-item label="文化程度" prop="education" class="marg-item">
-              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="行政职务" prop="administrationJob" class="marg-item">
-              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="是否主考人" prop="mainExaminer" class="marg-item">
-              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index 042636e..660f2b0 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -264,7 +264,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="性别" prop="meterStaff.sex">
-              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -273,21 +273,21 @@
         <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-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -296,7 +296,7 @@
         <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-select v-if="title === '详情'" v-model="meterStaff.deptId" disabled style="width: 100%;">
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
               <com-tree-select
@@ -304,6 +304,7 @@
                 ref="selectTreeRef" v-model="meterStaff.deptId" :options="PubListTree"
                 placeholder="选择组织机构"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -316,7 +317,7 @@
             <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="请选择从事日期"
+                placeholder="请选择从事日期" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -347,7 +348,7 @@
             <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="请选择发证日期"
+                placeholder="请选择发证日期" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -355,7 +356,7 @@
             <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="请选择有效日期"
+                placeholder="请选择有效日期" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 178fc12..d0116f3 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -3,7 +3,7 @@
 import type { FormInstance, FormRules } from 'element-plus'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
+const formLabelWidth = '110px'
 const form = reactive({
   certificateNo: '', // 证书号
   certificateName: '', // 证书名称
@@ -71,32 +71,52 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`" width="40%">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
     >
-      <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
-        <el-input v-model="form.certificateNo" placeholder="证书号" />
-      </el-form-item>
-      <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
-        <el-input v-model="form.certificateName" placeholder="证书名称" />
-      </el-form-item>
-      <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
-        <el-input v-model="form.certificateCompany" placeholder="发证单位" />
-      </el-form-item>
-      <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
-        <el-date-picker
-          v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择发证日期"
-        />
-      </el-form-item>
-      <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-        <el-date-picker
-          v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择有效日期"
-        />
-      </el-form-item>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
+            <el-input v-model="form.certificateNo" placeholder="证书号" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
+            <el-input v-model="form.certificateName" placeholder="证书名称" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
+            <el-input v-model="form.certificateCompany" placeholder="发证单位" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
+            <el-date-picker
+              v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择发证日期" style="width: 100%;"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+            <el-date-picker
+              v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择有效日期" style="width: 100%;"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <template #footer>
       <span class="dialog-footer">
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
index 5e20d1b..10b0deb 100644
--- a/src/views/measure/person/components/personListDialog.vue
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -1,8 +1,11 @@
 <!-- 计量人员列表弹窗 -->
 <script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
 import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import { getDeptTreeList } from '@/api/system/dept'
-import type { TreeStructure } from '@/views/system/user/user-interface'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -10,7 +13,7 @@
   staffNo: '', // 人员编号
   name: '', // 姓名
   deptId: '', // 所在部门
-  limit: 5,
+  limit: 10,
   offset: 1,
 })
 const loadingTable = ref<boolean>(false)
@@ -32,20 +35,22 @@
   },
 ])
 // 获取部门
-const deptIdList = ref<TreeStructure[]>([])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const deptIdList = ref([])
 const getDeptList = () => {
   getDeptTreeList().then((res) => {
-    deptIdList.value = res.data
+    deptIdList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
 const fetchData = () => {
-  select.value = ''
+  select.value = -1
   getStaffList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.records
       total.value = Number(res.data.total)
-      console.log(list.value, 'list')
     }
   })
 }
@@ -53,6 +58,7 @@
 const search = () => {
   fetchData()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   listQuery.value = {
@@ -62,6 +68,7 @@
     limit: 10,
     offset: 1,
   }
+  selectTreeRef.value.clearSelected()
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -76,18 +83,24 @@
 }
 // 点击保存
 const submitForm = () => {
-  const person = list.value.filter((item, index) => index == select.value)[0]
-  console.log(person, 'person')
-  getStaffDetail(person).then((res) => {
-    if (res.code === 200) {
-      emits('add', res.data)
-      dialogFormVisible.value = false
-    }
-  })
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    getStaffDetail(person).then((res) => {
+      if (res.code === 200) {
+        emits('add', res.data)
+        dialogFormVisible.value = false
+        reset()
+      }
+    })
+  }
+  else {
+    ElMessage.warning('请先选择人员')
+  }
 }
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
+  reset()
 }
 // 初始化
 const initDialog = () => {
@@ -99,39 +112,45 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员" width="50%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable style="width: 150px;" />
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable style="width: 150px;" />
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
+        <!-- <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
           <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
+        </el-select> -->
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
-    <normal-table
-      :data="list" :total="total" :columns="columns" :query="listQuery"
-      :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>
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :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">
             {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
           </template>
         </el-table-column> -->
-      </template>
-    </normal-table>
+        </template>
+      </normal-table>
+    </div>
     <template #footer>
       <span class="dialog-footer">
         <el-button type="primary" @click="submitForm">确认</el-button>
diff --git a/src/views/measure/person/components/userListDialog.vue b/src/views/measure/person/components/userListDialog.vue
index dcd05b5..cd62a73 100644
--- a/src/views/measure/person/components/userListDialog.vue
+++ b/src/views/measure/person/components/userListDialog.vue
@@ -3,14 +3,16 @@
 import { ElMessage } from 'element-plus'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
-import type { TreeStructure } from '@/views/system/user/user-interface'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
 const listQuery = ref({
   keywords: '', // 姓名
   deptId: '', // 所在部门
-  limit: 5,
+  limit: 10,
   offset: 1,
 })
 const loadingTable = ref<boolean>(false)
@@ -31,11 +33,14 @@
     value: 'deptName',
   },
 ])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 // 获取部门
-const deptIdList = ref<TreeStructure[]>([])
+const deptIdList = ref([])
 const getDeptList = () => {
   getDeptTreeList().then((res) => {
-    deptIdList.value = res.data
+    deptIdList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
@@ -52,6 +57,7 @@
 const search = () => {
   fetchData()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   listQuery.value = {
@@ -60,6 +66,7 @@
     limit: 10,
     offset: 1,
   }
+  selectTreeRef.value.clearSelected()
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -74,11 +81,11 @@
 }
 // 点击保存
 const submitForm = () => {
-  console.log(select.value)
   if (select.value >= 0) {
     const person = list.value.filter((item, index) => index == select.value)[0]
     emits('add', person)
     dialogFormVisible.value = false
+    reset()
   }
   else {
     ElMessage.warning('请先选择人员')
@@ -87,9 +94,11 @@
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
+  reset()
 }
 // 初始化
 const initDialog = () => {
+  // reset()
   dialogFormVisible.value = true
   getDeptList()
   fetchData()
@@ -98,16 +107,20 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+  <el-dialog v-model="dialogFormVisible" title="选择人员" width="50%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
         <el-input v-model.trim="listQuery.keywords" placeholder="真实姓名" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable>
+        <!-- <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable>
           <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
+        </el-select> -->
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 9c6f65d..355473a 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -7,7 +7,9 @@
 // import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
-import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+// import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
@@ -16,7 +18,7 @@
   major: '', // 计量专业
   verifierCertificateNo: '', // 证书号
   certificateStatus: '', // 证书状态
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -52,10 +54,10 @@
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取所有部门
-const deptList = ref<DeptTreeNode[]>([])
+const deptList = ref([])
 const getDeptList = async () => {
   getDeptTreeList().then((res) => {
-    deptList.value = res.data
+    deptList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
@@ -126,6 +128,7 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   searchQuery.staffNo = ''
@@ -133,6 +136,7 @@
   searchQuery.deptId = ''
   searchQuery.major = ''
   searchQuery.verifierCertificateNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -160,10 +164,9 @@
     loading.close()
   })
 }
-// 打印
-const print = () => {
-
-}
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传图片
@@ -216,14 +219,18 @@
           <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+          <!-- <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
             <el-option
               v-for="item in deptList"
               :key="item.id"
               :label="item.name"
               :value="item.id"
             />
-          </el-select>
+          </el-select> -->
+          <com-tree-select
+            ref="selectTreeRef" v-model="searchQuery.deptId" :options="deptList"
+            placeholder="工作部门" :tree-props="deptProps"
+          />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.major" placeholder="计量专业" clearable class="w-50 m-2" />
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index af0a29d..2e0e7af 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -1,12 +1,15 @@
 <script lang="ts" setup name="ListSourceAdd">
-import { reactive, ref } from 'vue'
+/**
+ * 添加/编辑/详情溯源供方
+ */
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions, IformInline } from './list_interface'
+import type { IOptions, IformInline, traceSupplierPerson } from './list_interface'
 import { exportFile } from '@/utils/exportUtils'
 import { UploadFile } from '@/api/measure/file'
 import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+import { validatePhone } from '@/utils/validate'
 const props = defineProps({
   infoId: {
     type: String,
@@ -19,43 +22,45 @@
 })
 const emit = defineEmits(['close'])
 const formInline: Ref<IformInline> = ref({
-  businessContent: null,
-  supplierName: null,
-  supplierNo: null,
-  bankAccount: null,
-  bankAccountNumber: null,
-  bankName: null,
-  briefName: null,
-  businessScope: null,
-  companyAddress: null,
-  companyArea: null,
-  companyCity: null,
-  companyCountry: null,
-  companyProvince: null,
-  createTime: null,
-  director: null,
-  fax: null,
-  invoiceAddress: null,
-  invoiceArea: null,
-  invoiceCity: null,
-  invoiceCountry: null,
-  invoiceProvince: null,
-  mailbox: null,
-  minioFileName: null,
-  mobile: null,
-  phone: null,
-  postalCode: null,
-  remark: null,
-  taxNumber: null,
-  website: null,
+  id: '',
+  businessContent: '',
+  supplierName: '',
+  supplierNo: '',
+  bankAccount: '',
+  bankAccountNumber: '',
+  bankName: '',
+  briefName: '',
+  businessScope: '',
+  companyAddress: '',
+  companyArea: '',
+  companyCity: '',
+  companyCountry: '',
+  companyProvince: '',
+  createTime: '',
+  director: '',
+  fax: '',
+  invoiceAddress: '',
+  invoiceArea: '',
+  invoiceCity: '',
+  invoiceCountry: '',
+  invoiceProvince: '',
+  mailbox: '',
+  minioFileName: '',
+  mobile: '',
+  phone: '',
+  postalCode: '',
+  remark: '',
+  taxNumber: '',
+  website: '',
   traceSupplierPersonList: [],
 })
+const traceSupplierPersonList: Ref<traceSupplierPerson[]> = ref([])
 const columns = ref([
-  { text: '人员编号', value: 'personNo', show: true },
-  { text: '姓名', value: 'name', show: true },
-  { text: '工作部门', value: 'department', show: true },
-  { text: '职务', value: 'job', show: true },
-  { text: '联系方式', value: 'phone', show: true },
+  { text: '人员编号', value: 'personNo', required: false },
+  { text: '姓名', value: 'name', required: true },
+  { text: '工作部门', value: 'department', required: false },
+  { text: '职务', value: 'job', required: false },
+  { text: '联系方式', value: 'phone', required: true, reg: validatePhone },
 ])
 const ruleFormRef = ref<FormInstance>()
 const provinceList = ref<IOptions[]>([])
@@ -66,14 +71,17 @@
 const invoiceCityList = ref<IOptions[]>([])
 const areaInvoiceList = ref<IOptions[]>([])
 const dialogVisible = ref(false)
-const addPersonList = ref({
+// 人员对象
+const addPersonObj: traceSupplierPerson = {
+  id: '',
   personNo: '',
   name: '',
   department: '',
   job: '',
   phone: '',
-})
-const SelectionList = ref([])
+  editable: true,
+}
+const SelectionList: Ref<traceSupplierPerson[]> = ref([])
 const upload = ref<UploadInstance>()
 // 校验规则
 const rules = ref({
@@ -91,7 +99,7 @@
   })
 }
 // 表格选中
-const handleSelectionChange = (e: any) => {
+const handleSelectionChange = (e: traceSupplierPerson[]) => {
   SelectionList.value = e
 }
 // 获取公司地址省级
@@ -142,15 +150,33 @@
   })
 }
 // 点击增加行
-const addRoow = () => {
-  const object = {
-    personNo: '',
-    name: '',
-    department: '',
-    job: '',
-    phone: '',
+const addRow = () => {
+  // 检查上一行必填项
+  if (checkPersonList()) {
+    setAllRowReadable()
+    traceSupplierPersonList.value.push({ ...addPersonObj })
   }
-  formInline.value.traceSupplierPersonList.push(object)
+}
+// 检查人员列表
+function checkPersonList() {
+  for (let index = 0; index < traceSupplierPersonList.value.length; index++) {
+    const item = traceSupplierPersonList.value[index]
+    for (const prop of columns.value) {
+      // 检查必填
+      if (prop.required && !item[prop.value]) {
+        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
+        return false
+      }
+      // 验证正则
+      if (prop.reg && typeof prop.reg === 'function') {
+        if (!prop.reg(item[prop.value])) {
+          ElMessage.warning(`第${index + 1}行中${prop.text}输入不合法`)
+          return false
+        }
+      }
+    }
+  }
+  return true
 }
 // 点击关闭
 const handleClose = () => {
@@ -158,12 +184,12 @@
 }
 // 点击弹窗的完成追加到表格数组中
 const addPushList = () => {
-  formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonList.value)))
+  formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonObj.value)))
   handleClose()
 }
 // 删除行
 const deleteList = () => {
-  formInline.value.traceSupplierPersonList = formInline.value.traceSupplierPersonList.filter((item) => {
+  traceSupplierPersonList.value = traceSupplierPersonList.value.filter((item: traceSupplierPerson) => {
     return !SelectionList.value.includes(item)
   })
 }
@@ -261,10 +287,16 @@
     }
   })
 }
-// 双击表格显示输入框
-const dblclickName = (item: object) => {
-  console.log(item)
-  item.show = false
+// 双击行显示输入框
+const dblclickRow = (row: traceSupplierPerson) => {
+  setAllRowReadable()
+  row.editable = true
+}
+// 将所有人员信息列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of traceSupplierPersonList.value) {
+    item.editable = false
+  }
 }
 if (props.buttonType !== '新建') {
   getInfo()
@@ -273,7 +305,7 @@
 
 <template>
   <app-container>
-    <detail-page :title="`培训计划-${buttonType}`">
+    <detail-page :title="`溯源供方-${buttonType}`">
       <template #btns>
         <el-button
           type="primary"
@@ -617,39 +649,36 @@
       </el-form>
     </detail-page>
     <detail-block title="人员信息">
-      <template #btns>
-        <el-button
-          type="info"
-          :disabled="buttonType === '详情'"
-          @click="deleteList"
-        >
+      <template v-if="buttonType !== '详情'" #btns>
+        <el-button type="info" @click="deleteList">
           删除行
         </el-button>
-        <el-button
-          type="primary"
-          :disabled="buttonType === '详情'"
-          @click="addRoow"
-        >
+        <el-button type="primary" @click="addRow">
           增加行
         </el-button>
       </template>
       <el-table
-        :data="formInline.traceSupplierPersonList"
+        :data="traceSupplierPersonList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
+        @row-dblclick="dblclickRow"
       >
-        <el-table-column type="selection" width="55" />
+        <el-table-column type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column
           v-for="item in columns"
           :key="item.value"
           :prop="item.value"
           :label="item.text"
+          align="center"
         >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
           <template #default="scope">
-            <span v-show="item.show" style="color: gray;" @dblclick="dblclickName(item)">{{ scope.row[item.value] || `双击编辑${item.text}` }}</span>
-            <el-input v-show="!item.show" v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" @blur="item.show = true" />
+            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+            <el-input v-else v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index 530bcc4..c057976 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -24,6 +24,18 @@
   areaName: string
 }
 
+// 溯源供方人员
+export interface traceSupplierPerson {
+  id: number | string // id
+  job: string // 职务
+  department: string// 部门
+  name: string// 信命
+  personNo: string// 人员编号
+  phone: string// 联系方式
+  editable?: boolean // 是否可编辑
+  [key: string]: any
+}
+
 export interface IformInline {
   businessContent: string
   supplierName: string
@@ -55,5 +67,6 @@
   remark: string
   taxNumber: string
   website: string
-  traceSupplierPersonList: []
+  traceSupplierPersonList: traceSupplierPerson []
 }
+
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index e44001a..600eda1 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -32,11 +32,20 @@
   dialogVisible.value = true
   ruleForm.noticePublisher = userInfo.$state.name
   ruleForm.noticeCompany = userInfo.$state.deptName
-  ruleForm.noticeTime = dayjs().format('YYYY-MM-DD')
+  ruleForm.noticeTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
 }
 defineExpose({ initDialog })
+// 重置
+const resetDialog = () => {
+  ruleForm.noticeTime = ''
+  ruleForm.noticeSketch = ''
+  ruleForm.noticeContent = ''
+  ruleForm.minioFileName = ''
+  ruleForm.noticeTitle = ''
+}
 // 关闭弹窗
 const close = () => {
+  resetDialog()
   dialogVisible.value = false
   emits('resetData')
 }
@@ -63,6 +72,7 @@
 const resetForm = (formEl: FormInstance | undefined) => {
   // if (!formEl) { return }
   formEl?.resetFields()
+  resetDialog()
   dialogVisible.value = false
   emits('resetData')
 }
@@ -105,7 +115,7 @@
     uploadImage: {
       server: 'http://111.198.10.15:21409/minio/file/upload', // 配置图片上传地址
       maxFileSize: 2 * 1024 * 1024, // 10M  图片大小限制
-      fieldName: 'img', // 上传类型
+      fieldName: 'multipartFile', // 上传名字
       allowedFileTypes: [], // 选择文件时的类型限制，默认为 ['image/*'] 。如不想限制，则设置为 []
       // 自定义上传参数，传递图片时需要带一些参数过去写在这。参数会被添加到 formData 中，一起上传到服务端。
       // meta: {
@@ -154,9 +164,9 @@
     uploadVideo: {
       server: 'http://111.198.10.15:21409/minio/file/upload', // 配置视频上传地址
       maxFileSize: 5 * 1024 * 1024, // 5M  视频大小限制
-      fieldName: 'your-custom-name', // 上传类型
+      fieldName: 'multipartFile', // 上传名字
       // 最多可上传几个文件，默认为 5
-      maxNumberOfFiles: 3,
+      // maxNumberOfFiles: 1,
       allowedFileTypes: [], // 选择文件时的类型限制，默认为 ['video/*'] 。如不想限制，则设置为 []
       // 自定义上传参数，传递图片时需要带一些参数过去写在这。参数会被添加到 formData 中，一起上传到服务端。
       // meta: {
@@ -167,8 +177,8 @@
       //     Accept: 'text/x-json',
       //     otherKey: 'xxx'
       // },
-      metaWithUrl: false, // 将 meta 拼接到 url 参数中，默认 false
-      withCredentials: true, // 跨域是否传递 cookie ，默认为 false
+      // metaWithUrl: false, // 将 meta 拼接到 url 参数中，默认 false
+      // withCredentials: true, // 跨域是否传递 cookie ，默认为 false
       // 上传之前触发
       onBeforeUpload(file: any) {
         // file 选中的文件，格式如 { key: file }
@@ -222,9 +232,6 @@
     editorRef.value = editor // 一定要用 Object.seal() ，否则会报错
   })
 }
-const look = () => {
-  console.log(ruleForm.noticeContent)
-}
 const minioFileUrl = ref('')
 watch(() => ruleForm.minioFileName, (newVal) => {
   if (newVal) {
@@ -278,7 +285,7 @@
           />
           <editor
             v-model="ruleForm.noticeContent"
-            style="height: 150px; overflow-y: hidden;"
+            style="height: 300px; overflow-y: hidden;"
             :default-config="editorConfig"
             mode="default"
             @onCreated="onCreated"
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index 0926957..a4cdd5e 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -16,7 +16,7 @@
   noticePublisher: '', // 发布人
   noticeTime: '', // 发布时间
   noticeTitle: '', // 标题
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -27,6 +27,7 @@
     text: '编号',
     value: 'noticeNo',
     align: 'center',
+    width: '180',
   },
   {
     text: '标题',
@@ -37,6 +38,7 @@
     text: '发布人',
     value: 'noticePublisher',
     align: 'center',
+    width: '150',
   },
   {
     text: '内容描述',
@@ -47,11 +49,15 @@
     text: '发布时间',
     value: 'noticeTime',
     align: 'center',
+    width: '200',
   },
 ] // 表格
 const list = ref([]) // 表格数据
 // 获取通知公告列表
 const getNoticeList = () => {
+  if (!searchQuery.noticeTime) {
+    searchQuery.noticeTime = ''
+  }
   getNoticeeApi(searchQuery).then((res) => {
     total.value = res.data.total
     list.value = res.data.rows

diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index bb58885..2959118 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -53,3 +53,64 @@
   }
   return true
 }
+
+/**
+ * 验证小写字母
+ * @param str
+ * @returns
+ */
+export function validateLowerCase(str: string) {
+  const reg = /^[a-z]+$/
+  return reg.test(str)
+}
+
+/* 验证大写字母 */
+export function validateUpperCase(str: string) {
+  const reg = /^[A-Z]+$/
+  return reg.test(str)
+}
+
+/* 验证大小写字母 */
+export function validateAlphabets(str: string) {
+  const reg = /^[A-Za-z]+$/
+  return reg.test(str)
+}
+
+/**
+ * 验证邮箱
+ * @param email
+ * @returns {boolean}
+ */
+export function validateEmail(email: string) {
+  const re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
+  return re.test(email)
+}
+
+/**
+ * 验证手机号
+ * @param phone
+ * @returns {boolean}
+ */
+export function validateMobile(phone: string) {
+  const re = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/
+  return re.test(phone)
+}
+
+/**
+ * 校验身份证号
+ * @param value
+ * @returns
+ */
+export function validateIdCardNo(value: string) {
+  const re = /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/
+  return re.test(value)
+}
+/**
+ *
+ * @param value 验证电话号码
+ * @returns
+ */
+export function validatePhone(value: string) {
+  const re = /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/
+  return re.test(value)
+}
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 1c2405e..bca0958 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,13 +1,46 @@
-<script lang="ts" setup name="borrowHandle">
-// 逻辑代码
+<!-- 设备借用处理 -->
+<script lang="ts" setup name="borrowApply">
+import list from './components/handleList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '待借用', comp: list },
+  { name: '已借用', comp: list },
+  { name: '已归还', comp: list },
+])
+const current = ref('待借用')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用处理
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 03d414b..c5771f7 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,13 +1,50 @@
+<!-- 设备借用申请 -->
 <script lang="ts" setup name="borrowApply">
-// 逻辑代码
+import list from './components/applyList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '全部', comp: list },
+  { name: '草稿箱', comp: list },
+  { name: '待审批', comp: list },
+  { name: '审批中', comp: list },
+  { name: '已通过', comp: list },
+  { name: '未通过', comp: list },
+  { name: '已取消', comp: list },
+])
+const current = ref('全部')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用申请
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
new file mode 100644
index 0000000..052f3ce
--- /dev/null
+++ b/src/views/device/borrow/components/applyList.vue
@@ -0,0 +1,328 @@
+<script lang="ts" setup name="borrowApplyList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '文件号',
+    value: 'fileNo',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '类别',
+    value: 'catergory',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '李四',
+      time: '2020-12-14 00:00:00',
+      status: '未通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const approveRef = ref()
+// 同意
+const agree = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '1',
+  })
+}
+// 驳回
+const reject = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '3',
+  })
+}
+// 拒绝
+const refuse = (row: any) => {
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
+}
+// 取消
+const cancel = (rowrow: any) => {
+  ElMessageBox.confirm(
+    '确认取消吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" @click="addBtn" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="agree(row)">
+                  同意
+                </el-button>
+                <el-button size="small" type="primary" link @click="reject(row)">
+                  驳回
+                </el-button>
+                <el-button size="small" type="primary" link @click="refuse(row)">
+                  拒绝
+                </el-button>
+                <el-button size="small" type="primary" link @click="cancel(row)">
+                  取消
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/components/approvalActionDialog.vue b/src/views/device/borrow/components/approvalActionDialog.vue
new file mode 100644
index 0000000..214876c
--- /dev/null
+++ b/src/views/device/borrow/components/approvalActionDialog.vue
@@ -0,0 +1,104 @@
+<!-- 审批操作弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
+const dialogVisibleApprove = ref(false)
+const form = reactive({
+  radio: '1',
+})
+const ruleFormRef = ref<FormInstance>()
+const rules = reactive<FormRules>({
+})
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const approvetime = ref('') // 审批时间
+const initDialog = (row: any) => {
+  dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
+}
+defineExpose({ initDialog })
+
+// 点击保存
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      dialogVisibleApprove.value = false
+      emits('resetData')
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  formEl.resetFields()
+  dialogVisibleApprove.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
+    <el-form
+      ref="ruleFormRef" :model="form"
+      :rules="rules" label-width="110px"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人">
+            <el-input disabled :value="userInfo.$state.name" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间">
+            <el-input disabled :value="approvetime" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
+        <el-button @click="resetForm(ruleFormRef)">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
new file mode 100644
index 0000000..cfda00a
--- /dev/null
+++ b/src/views/device/borrow/components/handleList.vue
@@ -0,0 +1,281 @@
+<script lang="ts" setup name="borrowHandleList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '申请编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'dept',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      dept: '顶级',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      dept: '徐州分中心',
+      user: '里斯',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+const borrow = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="borrow(row)">
+                  借用
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/addRow.vue b/src/views/device/standingBook/components/addRow.vue
index 1678cdb..07b03d1 100644
--- a/src/views/device/standingBook/components/addRow.vue
+++ b/src/views/device/standingBook/components/addRow.vue
@@ -5,7 +5,7 @@
 import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
+const formLabelWidth = '110px'
 const form = ref({})
 const formTable = ref([
   {
@@ -91,108 +91,188 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`">
+  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
     >
       <div v-if="name === '周检记录'">
-        <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录表编号" />
-        </el-form-item>
-        <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录人" />
-        </el-form-item>
-        <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="检定日期"
-          />
-        </el-form-item>
-        <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="有效日期"
-          />
-        </el-form-item>
-        <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="送检人" />
-        </el-form-item>
-        <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录表编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="检定日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="有效日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="送检人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '状态变更记录'">
-        <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="状态类型" clearable>
-            <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="结束日期"
-          />
-        </el-form-item>
-        <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="申请人" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="状态类型" clearable style="width: 100%;">
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="申请人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '使用记录'">
-        <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用人" />
-        </el-form-item>
-        <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用部门" />
-        </el-form-item>
-        <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="使用类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用结束日期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用部门" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="使用类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '检定证书'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="证书类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书出具日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书有效期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
     </el-form>
     <template #footer>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 5f7b347..9a9f798 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -352,7 +352,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -376,7 +376,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -391,7 +391,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -404,14 +404,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -434,7 +434,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -443,20 +443,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -480,23 +480,23 @@
               <com-tree-select
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -507,10 +507,10 @@
             <el-form-item label="检定部门" prop="mesureDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -520,7 +520,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -529,13 +529,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -544,21 +544,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -578,14 +578,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -594,14 +594,14 @@
         <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-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -669,7 +669,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index fc3fd54..d9d4514 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -199,6 +199,8 @@
     useDeptList.value = toTreeList(res.data, '0', true)
   })
 }
+const selectTreeRef1 = ref()
+const selectTreeRef2 = ref()
 // 重置
 const resetDATA = () => {
   ruleForm.value = {
@@ -254,6 +256,10 @@
     isStandardSupportEquipment: '', //		是否标准配套设备
     id: '',
   }
+  if (title.value !== '详情') {
+    selectTreeRef1.value.clearSelected()
+    selectTreeRef2.value.clearSelected()
+  }
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
@@ -378,7 +384,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -402,7 +408,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -416,8 +422,7 @@
             <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"
+                :placeholder="title === '详情' ? '' : '出厂年月'" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -430,14 +435,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -460,7 +465,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -469,20 +474,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -505,24 +510,26 @@
             <el-form-item label="使用部门" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
+                ref="selectTreeRef2"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -536,10 +543,12 @@
               </el-select> -->
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                ref="selectTreeRef1"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -549,7 +558,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -558,13 +567,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -573,21 +582,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -607,14 +616,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -624,14 +633,14 @@
           <el-col :span="6">
             <el-form-item label="资本来源" prop="capitalSource">
               <!-- <el-input v-model.trim="ruleForm.capitalSource" placeholder="资本来源" :disabled="title === '详情'" /> -->
-              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -699,7 +708,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f653095..f4229a6 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -147,19 +147,17 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
-  setTimeout(() => {
-    list.value = [
-      {
-        equipmentNo: 123,
-        equipmentName: 'test',
-        modelNo: '001',
-        usePersonName: '张三',
-        validDate: '2022-12-12 00:00:00',
-        useDeptName: '顶级',
-      },
-    ]
-    total.value = 1
-  }, 1000)
+  list.value = [
+    {
+      equipmentNo: 123,
+      equipmentName: 'test',
+      modelNo: '001',
+      usePersonName: '张三',
+      validDate: '2022-12-12 00:00:00',
+      useDeptName: '顶级',
+    },
+  ] as any
+  total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -220,9 +218,11 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -300,13 +300,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.mesureType" class="m-2 normal-select" placeholder="检定方式" clearable>
+          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable>
             <el-option
               v-for="item in mesureTypeList"
               :key="item.id"
@@ -316,7 +316,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.managerState" class="m-2 normal-select" placeholder="管理状态" clearable>
+          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable>
             <el-option
               v-for="item in managerStateList"
               :key="item.id"
@@ -327,8 +327,9 @@
         </search-item>
         <search-item>
           <com-tree-select
+            ref="selectTreeRef"
             v-model="searchQuery.useDept" :options="useDeptList" placeholder="使用部门"
-            :tree-props="deptProps" style="width: 150px;"
+            :tree-props="deptProps"
           />
         </search-item>
         <search-item>
@@ -336,11 +337,10 @@
             v-model="searchQuery.validDate" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="有效日期"
             class="normal-date"
-            style="width: 150px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.abc" class="m-2 normal-select" placeholder="ABC" clearable>
+          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable>
             <el-option
               v-for="item in abcList"
               :key="item.id"
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 78a3800..4c31a94 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -2,9 +2,10 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/fixedAssetsAdd.vue'
-import type { fixedAssetsType } from './standingBook-interface'
+import type { fixedAssetsType, selectType } from './standingBook-interface'
 import { exportFile } from '@/utils/exportUtils'
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
+import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   assetNo: '', // 固定编号
@@ -50,7 +51,7 @@
   },
   {
     text: '设备类型',
-    value: 'assetTypeName',
+    value: 'equipmentTypeName',
     width: '150',
     align: 'center',
   },
@@ -102,6 +103,7 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+const equipmentCategoryList = ref<selectType[]>([]) // 设备类别
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
@@ -242,6 +244,10 @@
 }
 onMounted(() => {
   getList()
+  // 获取设备类别
+  getDictByCode('equipmentCategory').then((response) => {
+    equipmentCategoryList.value = response.data
+  })
 })
 </script>
 
@@ -265,7 +271,10 @@
           <el-input v-model="searchQuery.equipmentSpecifications" placeholder="设备规格" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-select v-model="searchQuery.equipmentCategory" placeholder="设备类别" clearable>
+            <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+          </el-select>
         </search-item>
       </search-area>
       <table-container>
diff --git a/src/views/device/stateManage/components/addRow.vue b/src/views/device/stateManage/components/addRow.vue
new file mode 100644
index 0000000..3ba82d6
--- /dev/null
+++ b/src/views/device/stateManage/components/addRow.vue
@@ -0,0 +1,160 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { listPageApi } from '@/api/device/standingBook'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  limit: 10,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '出厂编号',
+    value: 'manufacturingNo',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+  },
+])
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listPageApi(listQuery.value as any).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map(item => ({ ...item, checked: '' }))
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    equipmentName: '', // 姓名
+    equipmentNo: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const checkedArr = list.value.filter(item => item.checked !== '')
+  if (checkedArr.length) {
+    console.log(checkedArr, '选中的设备')
+    emits('add', checkedArr)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择设备')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns as any" :query="listQuery"
+        :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-checkbox v-model="scope.row.checked" :label="scope.$index" size="large" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-checkbox__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index 56417d6..214876c 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -47,38 +47,45 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="30%">
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
-      :rules="rules"
+      :rules="rules" label-width="110px"
     >
-      <el-form-item label="审批意见">
-        <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
-        <el-radio-group v-model="form.radio">
-          <el-radio label="1">
-            同意
-          </el-radio>
-          <el-radio label="2">
-            拒绝
-          </el-radio>
-          <el-radio label="3">
-            驳回
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="审批结论">
-        <el-input
-          :rows="4"
-          type="textarea"
-        />
-      </el-form-item>
       <el-row :gutter="24">
-        <el-col :span="10">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="审批人">
             <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
-        <el-col :span="14">
+        <el-col :span="12">
           <el-form-item label="审批时间">
             <el-input disabled :value="approvetime" />
           </el-form-item>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index e74d70e..2003e31 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -1,7 +1,8 @@
 <!-- 新增或详情弹窗 -->
-<script lang="ts" setup name="addNotice">
+<script lang="ts" setup name="add">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
+import addRow from './addRow.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
@@ -16,6 +17,7 @@
 const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const name = ref('')
+const borrowList = ref([])
 const ruleForm = ref({
   assetNo: '', // 资产编号
   assetType: '', // 资产类型
@@ -357,10 +359,86 @@
     isShowCalibration.value = true
   }
 })
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerLevelName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+  },
+])
+const addRowRef = ref()
+// 添加行
+const addRowBtn = () => {
+  addRowRef.value.initDialog({ title: '添加' })
+}
+// 删除行
+const removeRowBtn = () => {
+  const removeArr = borrowList.value.filter(item => item.remove !== '')
+  if (removeArr.length) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      borrowList.value = borrowList.value.filter(item => item.remove === '')
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 借用设备列表添加
+const addRowMethods = (row) => {
+  row.forEach((element) => {
+    borrowList.value.push({ ...element, remove: '' })
+  })
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
     <detail-page :title="`${name}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
@@ -378,15 +456,16 @@
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder="">
+              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -430,7 +509,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -454,28 +533,56 @@
         </el-row>
       </el-form>
     </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>
+    <div>
+      <detail-block title="借用设备列表">
+        <template #btns>
+          <el-button type="primary" @click="addRowBtn">
+            添加行
+          </el-button>
+          <el-button type="info" @click="removeRowBtn">
+            删除行
+          </el-button>
+        </template>
+        <normal-table
+          :data="borrowList" :total="1" :columns="columns as any"
+        >
+          <template #preColumns>
+            <el-table-column label="选择" width="55" align="center">
+              <template #default="scope">
+                <el-checkbox v-model="scope.row.remove" :label="scope.$index" size="large" />
+              </template>
+            </el-table-column>
+            <el-table-column label="序号" width="60" align="center">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </detail-block>
+      <detail-block 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>
+    </div>
   </app-container>
 </template>
 
@@ -484,6 +591,10 @@
   background-color: #fff;
 }
 
+:deep(.el-checkbox__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,
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index aaaaf61..d588b8d 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,6 +1,7 @@
 <script lang="ts" setup name="bench">
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
+import type { trainLogStatistic } from './bench-interface'
 import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
 import { getPlanList } from '@/api/system/plan'
 import { listPageApi } from '@/api/measure/file'
@@ -132,15 +133,19 @@
     account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
+    const result: trainLogStatistic = res.data
+    const notQualified: number = Number(result.trainCount) - result.qualifiedCount
+    const qualifiedRate = ((result.qualifiedCount / result.trainCount) * 100).toFixed(2) // 合格率
+    const notQualifiedRate = ((notQualified / result.trainCount) * 100).toFixed(2) // 不合格率
     TrainLogSList.value = [
-      { name: `合格     ${res.data.qualified}-${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
-      { name: `不合格   ${res.data.notQualified}- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+      { name: `合   格   ${result.qualifiedCount}-${qualifiedRate}%`, value: result.qualifiedCount },
+      { name: `不合格   ${notQualified}- ${notQualifiedRate}%`, value: notQualified },
     ]
     TrainLogTitle.value = res.data.trainCount
   }).catch((_) => {
     // 处理异常
     TrainLogSList.value = [
-      { name: '合格     0 - 50%', value: 0 },
+      { name: '合   格   0 - 50%', value: 0 },
       { name: '不合格   0 - 50%', value: 0 },
     ]
     TrainLogTitle.value = 0
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 9ef0b93..1ad577b 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -270,7 +270,7 @@
               <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="6">
             <el-form-item label="名称" prop="fileName">
               <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
             </el-form-item>
@@ -279,13 +279,14 @@
         <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" class="fill-input" disabled>
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled style="width: 100%;">
                 <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="请选择发布单位"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -295,6 +296,7 @@
                 v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -311,12 +313,13 @@
                 v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人" prop="createUserId">
-              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index b45fbc3..542b284 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -26,7 +26,7 @@
   createUser: '', // 创建人
   createTime: '', // 创建
   approvalStatus: props.value, // 审批状态
-  limit: 10,
+  limit: 20,
   offset: 1,
   fileType: '', // 类型
   formId: '',
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 7d4724b..e54ddf5 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -26,7 +26,7 @@
   fileCode: '', // 文件号
   effectiveTime: '', // 实施时间
   effectiveStatus: '', // 实施状态
-  limit: 10,
+  limit: 20,
   offset: 1,
   fileType: '', // 类型
 }) // 查询参数
@@ -75,13 +75,19 @@
 const getStatus = () => {
   getDictByCode('effectiveStatus').then((res) => {
     if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
+      effectiveStatusSelect.value = [...res.data, { name: '全部', value: '', id: 'quanbu' }]
     }
   })
 }
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.publishTime) {
+    searchQuery.publishTime = ''
+  }
+  if (!searchQuery.effectiveTime) {
+    searchQuery.effectiveTime = ''
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -252,13 +258,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" />
         </search-item>
         <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
@@ -274,20 +280,16 @@
           <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: 185px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
             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: 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" placeholder="实施状态" clearable>
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index 5ca3275..a95c665 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -505,21 +505,21 @@
         <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] === '详情'" @change="directorChange">
+              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;" @change="directorChange">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.name" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
-              <el-select v-model="ruleForm.technologyJob" :placeholder="title.split('-')[2] === '详情' ? '' : '技术职务'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.technologyJob" :placeholder="title.split('-')[2] === '详情' ? '' : '技术职务'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;">
                 <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="administrationJob">
-              <el-select v-model="ruleForm.administrationJob" :placeholder="title.split('-')[2] === '详情' ? '' : '行政职务'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.administrationJob" :placeholder="title.split('-')[2] === '详情' ? '' : '行政职务'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index aac1ef2..11d6d0a 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -22,7 +22,7 @@
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
-  limit: 10,
+  limit: 20,
   offset: 1,
   organizeType: '', // 类型
   createTime: '', // 创建时间
@@ -118,6 +118,9 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.createTime) {
+    searchQuery.createTime = ''
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows.map(item => ({ ...item, createTime: item.createTime.split(' ')[0] }))
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 3f472eb..bc5d9d4 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -7,7 +7,9 @@
 // import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
-import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+// import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const props = defineProps({
   isRemind: {
     type: Boolean,
@@ -78,11 +80,14 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 // 获取所有部门
-const deptList = ref<DeptTreeNode[]>([])
+const deptList = ref([])
 const getDeptList = async () => {
   getDeptTreeList().then((res) => {
-    deptList.value = res.data
+    deptList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
@@ -177,6 +182,7 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   searchQuery.staffNo = ''
@@ -184,6 +190,7 @@
   searchQuery.deptId = ''
   searchQuery.certificateStatus = ''
   searchQuery.verifierCertificateNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -212,10 +219,6 @@
     loading.close()
   })
 }
-// 打印
-const print = () => {
-
-}
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传图片
@@ -268,20 +271,24 @@
           <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+          <!-- <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
             <el-option
               v-for="item in deptList"
               :key="item.id"
               :label="item.name"
               :value="item.id"
             />
-          </el-select>
+          </el-select> -->
+          <com-tree-select
+            ref="selectTreeRef" v-model="searchQuery.deptId" :options="deptList"
+            placeholder="工作部门" :tree-props="deptProps"
+          />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况">
+          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况" clearable>
             <el-option
               v-for="item in certificateStatusList"
               :key="item.id"
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 4352604..5a5f036 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -389,10 +389,10 @@
           关闭
         </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">
-            <el-form-item prop="minioFileName" label-width="70px">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item prop="minioFileName">
               <el-upload
                 class="avatar-uploader"
                 :show-file-list="false"
@@ -423,23 +423,24 @@
               <el-date-picker
                 v-model="ruleForm.birthday" type="date" format="YYYY-MM" value-format="YYYY-MM"
                 placeholder="出生年月" :disabled="title === '详情'"
+                style="width: 100%;"
               />
             </el-form-item>
             <el-form-item label="工作部门" prop="deptId" class="marg-item">
-              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled>
+              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled style="width: 100%;">
                 <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="ruleForm.deptId" :options="PubListTree"
-                placeholder="选择组织机构" :tree-props="deptProps"
+                placeholder="选择组织机构" :tree-props="deptProps" style="width: 100%;"
               />
             </el-form-item>
             <el-form-item label="计量专业" prop="major" class="marg-item">
               <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
             </el-form-item>
             <el-form-item label="是否特操人" prop="specialOperator" class="marg-item">
-              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -449,23 +450,23 @@
               <el-input v-model.trim="ruleForm.staffNo" placeholder="系统自动生成" disabled />
             </el-form-item>
             <el-form-item label="性别" prop="sex" class="marg-item">
-              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="技术职务" prop="technologyJob" class="marg-item">
-              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="从事日期" prop="workDate" class="marg-item">
               <el-date-picker
                 v-model="ruleForm.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-                placeholder="请选择从事日期"
+                placeholder="请选择从事日期" style="width: 100%;"
               />
             </el-form-item>
-            <el-form-item label="是否技术考核" prop="technologyExam" class="marg-item">
-              <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'">
+            <el-form-item label="是否技术考核" prop="technologyExam" class="marg-item" style="width: 100%;">
+              <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -475,17 +476,17 @@
               <el-input ref="cardRef" v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" @blur="getBirthday" />
             </el-form-item>
             <el-form-item label="文化程度" prop="education" class="marg-item">
-              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="行政职务" prop="administrationJob" class="marg-item">
-              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="是否主考人" prop="mainExaminer" class="marg-item">
-              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index 042636e..660f2b0 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -264,7 +264,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="性别" prop="meterStaff.sex">
-              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -273,21 +273,21 @@
         <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-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -296,7 +296,7 @@
         <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-select v-if="title === '详情'" v-model="meterStaff.deptId" disabled style="width: 100%;">
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
               <com-tree-select
@@ -304,6 +304,7 @@
                 ref="selectTreeRef" v-model="meterStaff.deptId" :options="PubListTree"
                 placeholder="选择组织机构"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -316,7 +317,7 @@
             <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="请选择从事日期"
+                placeholder="请选择从事日期" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -347,7 +348,7 @@
             <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="请选择发证日期"
+                placeholder="请选择发证日期" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -355,7 +356,7 @@
             <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="请选择有效日期"
+                placeholder="请选择有效日期" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 178fc12..d0116f3 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -3,7 +3,7 @@
 import type { FormInstance, FormRules } from 'element-plus'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
+const formLabelWidth = '110px'
 const form = reactive({
   certificateNo: '', // 证书号
   certificateName: '', // 证书名称
@@ -71,32 +71,52 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`" width="40%">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
     >
-      <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
-        <el-input v-model="form.certificateNo" placeholder="证书号" />
-      </el-form-item>
-      <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
-        <el-input v-model="form.certificateName" placeholder="证书名称" />
-      </el-form-item>
-      <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
-        <el-input v-model="form.certificateCompany" placeholder="发证单位" />
-      </el-form-item>
-      <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
-        <el-date-picker
-          v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择发证日期"
-        />
-      </el-form-item>
-      <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-        <el-date-picker
-          v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择有效日期"
-        />
-      </el-form-item>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
+            <el-input v-model="form.certificateNo" placeholder="证书号" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
+            <el-input v-model="form.certificateName" placeholder="证书名称" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
+            <el-input v-model="form.certificateCompany" placeholder="发证单位" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
+            <el-date-picker
+              v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择发证日期" style="width: 100%;"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+            <el-date-picker
+              v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择有效日期" style="width: 100%;"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <template #footer>
       <span class="dialog-footer">
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
index 5e20d1b..10b0deb 100644
--- a/src/views/measure/person/components/personListDialog.vue
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -1,8 +1,11 @@
 <!-- 计量人员列表弹窗 -->
 <script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
 import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import { getDeptTreeList } from '@/api/system/dept'
-import type { TreeStructure } from '@/views/system/user/user-interface'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -10,7 +13,7 @@
   staffNo: '', // 人员编号
   name: '', // 姓名
   deptId: '', // 所在部门
-  limit: 5,
+  limit: 10,
   offset: 1,
 })
 const loadingTable = ref<boolean>(false)
@@ -32,20 +35,22 @@
   },
 ])
 // 获取部门
-const deptIdList = ref<TreeStructure[]>([])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const deptIdList = ref([])
 const getDeptList = () => {
   getDeptTreeList().then((res) => {
-    deptIdList.value = res.data
+    deptIdList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
 const fetchData = () => {
-  select.value = ''
+  select.value = -1
   getStaffList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.records
       total.value = Number(res.data.total)
-      console.log(list.value, 'list')
     }
   })
 }
@@ -53,6 +58,7 @@
 const search = () => {
   fetchData()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   listQuery.value = {
@@ -62,6 +68,7 @@
     limit: 10,
     offset: 1,
   }
+  selectTreeRef.value.clearSelected()
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -76,18 +83,24 @@
 }
 // 点击保存
 const submitForm = () => {
-  const person = list.value.filter((item, index) => index == select.value)[0]
-  console.log(person, 'person')
-  getStaffDetail(person).then((res) => {
-    if (res.code === 200) {
-      emits('add', res.data)
-      dialogFormVisible.value = false
-    }
-  })
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    getStaffDetail(person).then((res) => {
+      if (res.code === 200) {
+        emits('add', res.data)
+        dialogFormVisible.value = false
+        reset()
+      }
+    })
+  }
+  else {
+    ElMessage.warning('请先选择人员')
+  }
 }
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
+  reset()
 }
 // 初始化
 const initDialog = () => {
@@ -99,39 +112,45 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员" width="50%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable style="width: 150px;" />
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable style="width: 150px;" />
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
+        <!-- <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
           <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
+        </el-select> -->
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
-    <normal-table
-      :data="list" :total="total" :columns="columns" :query="listQuery"
-      :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>
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :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">
             {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
           </template>
         </el-table-column> -->
-      </template>
-    </normal-table>
+        </template>
+      </normal-table>
+    </div>
     <template #footer>
       <span class="dialog-footer">
         <el-button type="primary" @click="submitForm">确认</el-button>
diff --git a/src/views/measure/person/components/userListDialog.vue b/src/views/measure/person/components/userListDialog.vue
index dcd05b5..cd62a73 100644
--- a/src/views/measure/person/components/userListDialog.vue
+++ b/src/views/measure/person/components/userListDialog.vue
@@ -3,14 +3,16 @@
 import { ElMessage } from 'element-plus'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
-import type { TreeStructure } from '@/views/system/user/user-interface'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
 const listQuery = ref({
   keywords: '', // 姓名
   deptId: '', // 所在部门
-  limit: 5,
+  limit: 10,
   offset: 1,
 })
 const loadingTable = ref<boolean>(false)
@@ -31,11 +33,14 @@
     value: 'deptName',
   },
 ])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 // 获取部门
-const deptIdList = ref<TreeStructure[]>([])
+const deptIdList = ref([])
 const getDeptList = () => {
   getDeptTreeList().then((res) => {
-    deptIdList.value = res.data
+    deptIdList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
@@ -52,6 +57,7 @@
 const search = () => {
   fetchData()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   listQuery.value = {
@@ -60,6 +66,7 @@
     limit: 10,
     offset: 1,
   }
+  selectTreeRef.value.clearSelected()
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -74,11 +81,11 @@
 }
 // 点击保存
 const submitForm = () => {
-  console.log(select.value)
   if (select.value >= 0) {
     const person = list.value.filter((item, index) => index == select.value)[0]
     emits('add', person)
     dialogFormVisible.value = false
+    reset()
   }
   else {
     ElMessage.warning('请先选择人员')
@@ -87,9 +94,11 @@
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
+  reset()
 }
 // 初始化
 const initDialog = () => {
+  // reset()
   dialogFormVisible.value = true
   getDeptList()
   fetchData()
@@ -98,16 +107,20 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+  <el-dialog v-model="dialogFormVisible" title="选择人员" width="50%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
         <el-input v-model.trim="listQuery.keywords" placeholder="真实姓名" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable>
+        <!-- <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable>
           <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
+        </el-select> -->
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 9c6f65d..355473a 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -7,7 +7,9 @@
 // import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
-import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+// import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
@@ -16,7 +18,7 @@
   major: '', // 计量专业
   verifierCertificateNo: '', // 证书号
   certificateStatus: '', // 证书状态
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -52,10 +54,10 @@
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取所有部门
-const deptList = ref<DeptTreeNode[]>([])
+const deptList = ref([])
 const getDeptList = async () => {
   getDeptTreeList().then((res) => {
-    deptList.value = res.data
+    deptList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
@@ -126,6 +128,7 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   searchQuery.staffNo = ''
@@ -133,6 +136,7 @@
   searchQuery.deptId = ''
   searchQuery.major = ''
   searchQuery.verifierCertificateNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -160,10 +164,9 @@
     loading.close()
   })
 }
-// 打印
-const print = () => {
-
-}
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传图片
@@ -216,14 +219,18 @@
           <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+          <!-- <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
             <el-option
               v-for="item in deptList"
               :key="item.id"
               :label="item.name"
               :value="item.id"
             />
-          </el-select>
+          </el-select> -->
+          <com-tree-select
+            ref="selectTreeRef" v-model="searchQuery.deptId" :options="deptList"
+            placeholder="工作部门" :tree-props="deptProps"
+          />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.major" placeholder="计量专业" clearable class="w-50 m-2" />
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index af0a29d..2e0e7af 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -1,12 +1,15 @@
 <script lang="ts" setup name="ListSourceAdd">
-import { reactive, ref } from 'vue'
+/**
+ * 添加/编辑/详情溯源供方
+ */
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions, IformInline } from './list_interface'
+import type { IOptions, IformInline, traceSupplierPerson } from './list_interface'
 import { exportFile } from '@/utils/exportUtils'
 import { UploadFile } from '@/api/measure/file'
 import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+import { validatePhone } from '@/utils/validate'
 const props = defineProps({
   infoId: {
     type: String,
@@ -19,43 +22,45 @@
 })
 const emit = defineEmits(['close'])
 const formInline: Ref<IformInline> = ref({
-  businessContent: null,
-  supplierName: null,
-  supplierNo: null,
-  bankAccount: null,
-  bankAccountNumber: null,
-  bankName: null,
-  briefName: null,
-  businessScope: null,
-  companyAddress: null,
-  companyArea: null,
-  companyCity: null,
-  companyCountry: null,
-  companyProvince: null,
-  createTime: null,
-  director: null,
-  fax: null,
-  invoiceAddress: null,
-  invoiceArea: null,
-  invoiceCity: null,
-  invoiceCountry: null,
-  invoiceProvince: null,
-  mailbox: null,
-  minioFileName: null,
-  mobile: null,
-  phone: null,
-  postalCode: null,
-  remark: null,
-  taxNumber: null,
-  website: null,
+  id: '',
+  businessContent: '',
+  supplierName: '',
+  supplierNo: '',
+  bankAccount: '',
+  bankAccountNumber: '',
+  bankName: '',
+  briefName: '',
+  businessScope: '',
+  companyAddress: '',
+  companyArea: '',
+  companyCity: '',
+  companyCountry: '',
+  companyProvince: '',
+  createTime: '',
+  director: '',
+  fax: '',
+  invoiceAddress: '',
+  invoiceArea: '',
+  invoiceCity: '',
+  invoiceCountry: '',
+  invoiceProvince: '',
+  mailbox: '',
+  minioFileName: '',
+  mobile: '',
+  phone: '',
+  postalCode: '',
+  remark: '',
+  taxNumber: '',
+  website: '',
   traceSupplierPersonList: [],
 })
+const traceSupplierPersonList: Ref<traceSupplierPerson[]> = ref([])
 const columns = ref([
-  { text: '人员编号', value: 'personNo', show: true },
-  { text: '姓名', value: 'name', show: true },
-  { text: '工作部门', value: 'department', show: true },
-  { text: '职务', value: 'job', show: true },
-  { text: '联系方式', value: 'phone', show: true },
+  { text: '人员编号', value: 'personNo', required: false },
+  { text: '姓名', value: 'name', required: true },
+  { text: '工作部门', value: 'department', required: false },
+  { text: '职务', value: 'job', required: false },
+  { text: '联系方式', value: 'phone', required: true, reg: validatePhone },
 ])
 const ruleFormRef = ref<FormInstance>()
 const provinceList = ref<IOptions[]>([])
@@ -66,14 +71,17 @@
 const invoiceCityList = ref<IOptions[]>([])
 const areaInvoiceList = ref<IOptions[]>([])
 const dialogVisible = ref(false)
-const addPersonList = ref({
+// 人员对象
+const addPersonObj: traceSupplierPerson = {
+  id: '',
   personNo: '',
   name: '',
   department: '',
   job: '',
   phone: '',
-})
-const SelectionList = ref([])
+  editable: true,
+}
+const SelectionList: Ref<traceSupplierPerson[]> = ref([])
 const upload = ref<UploadInstance>()
 // 校验规则
 const rules = ref({
@@ -91,7 +99,7 @@
   })
 }
 // 表格选中
-const handleSelectionChange = (e: any) => {
+const handleSelectionChange = (e: traceSupplierPerson[]) => {
   SelectionList.value = e
 }
 // 获取公司地址省级
@@ -142,15 +150,33 @@
   })
 }
 // 点击增加行
-const addRoow = () => {
-  const object = {
-    personNo: '',
-    name: '',
-    department: '',
-    job: '',
-    phone: '',
+const addRow = () => {
+  // 检查上一行必填项
+  if (checkPersonList()) {
+    setAllRowReadable()
+    traceSupplierPersonList.value.push({ ...addPersonObj })
   }
-  formInline.value.traceSupplierPersonList.push(object)
+}
+// 检查人员列表
+function checkPersonList() {
+  for (let index = 0; index < traceSupplierPersonList.value.length; index++) {
+    const item = traceSupplierPersonList.value[index]
+    for (const prop of columns.value) {
+      // 检查必填
+      if (prop.required && !item[prop.value]) {
+        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
+        return false
+      }
+      // 验证正则
+      if (prop.reg && typeof prop.reg === 'function') {
+        if (!prop.reg(item[prop.value])) {
+          ElMessage.warning(`第${index + 1}行中${prop.text}输入不合法`)
+          return false
+        }
+      }
+    }
+  }
+  return true
 }
 // 点击关闭
 const handleClose = () => {
@@ -158,12 +184,12 @@
 }
 // 点击弹窗的完成追加到表格数组中
 const addPushList = () => {
-  formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonList.value)))
+  formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonObj.value)))
   handleClose()
 }
 // 删除行
 const deleteList = () => {
-  formInline.value.traceSupplierPersonList = formInline.value.traceSupplierPersonList.filter((item) => {
+  traceSupplierPersonList.value = traceSupplierPersonList.value.filter((item: traceSupplierPerson) => {
     return !SelectionList.value.includes(item)
   })
 }
@@ -261,10 +287,16 @@
     }
   })
 }
-// 双击表格显示输入框
-const dblclickName = (item: object) => {
-  console.log(item)
-  item.show = false
+// 双击行显示输入框
+const dblclickRow = (row: traceSupplierPerson) => {
+  setAllRowReadable()
+  row.editable = true
+}
+// 将所有人员信息列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of traceSupplierPersonList.value) {
+    item.editable = false
+  }
 }
 if (props.buttonType !== '新建') {
   getInfo()
@@ -273,7 +305,7 @@
 
 <template>
   <app-container>
-    <detail-page :title="`培训计划-${buttonType}`">
+    <detail-page :title="`溯源供方-${buttonType}`">
       <template #btns>
         <el-button
           type="primary"
@@ -617,39 +649,36 @@
       </el-form>
     </detail-page>
     <detail-block title="人员信息">
-      <template #btns>
-        <el-button
-          type="info"
-          :disabled="buttonType === '详情'"
-          @click="deleteList"
-        >
+      <template v-if="buttonType !== '详情'" #btns>
+        <el-button type="info" @click="deleteList">
           删除行
         </el-button>
-        <el-button
-          type="primary"
-          :disabled="buttonType === '详情'"
-          @click="addRoow"
-        >
+        <el-button type="primary" @click="addRow">
           增加行
         </el-button>
       </template>
       <el-table
-        :data="formInline.traceSupplierPersonList"
+        :data="traceSupplierPersonList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
+        @row-dblclick="dblclickRow"
       >
-        <el-table-column type="selection" width="55" />
+        <el-table-column type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column
           v-for="item in columns"
           :key="item.value"
           :prop="item.value"
           :label="item.text"
+          align="center"
         >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
           <template #default="scope">
-            <span v-show="item.show" style="color: gray;" @dblclick="dblclickName(item)">{{ scope.row[item.value] || `双击编辑${item.text}` }}</span>
-            <el-input v-show="!item.show" v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" @blur="item.show = true" />
+            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+            <el-input v-else v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index 530bcc4..c057976 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -24,6 +24,18 @@
   areaName: string
 }
 
+// 溯源供方人员
+export interface traceSupplierPerson {
+  id: number | string // id
+  job: string // 职务
+  department: string// 部门
+  name: string// 信命
+  personNo: string// 人员编号
+  phone: string// 联系方式
+  editable?: boolean // 是否可编辑
+  [key: string]: any
+}
+
 export interface IformInline {
   businessContent: string
   supplierName: string
@@ -55,5 +67,6 @@
   remark: string
   taxNumber: string
   website: string
-  traceSupplierPersonList: []
+  traceSupplierPersonList: traceSupplierPerson []
 }
+
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index e44001a..600eda1 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -32,11 +32,20 @@
   dialogVisible.value = true
   ruleForm.noticePublisher = userInfo.$state.name
   ruleForm.noticeCompany = userInfo.$state.deptName
-  ruleForm.noticeTime = dayjs().format('YYYY-MM-DD')
+  ruleForm.noticeTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
 }
 defineExpose({ initDialog })
+// 重置
+const resetDialog = () => {
+  ruleForm.noticeTime = ''
+  ruleForm.noticeSketch = ''
+  ruleForm.noticeContent = ''
+  ruleForm.minioFileName = ''
+  ruleForm.noticeTitle = ''
+}
 // 关闭弹窗
 const close = () => {
+  resetDialog()
   dialogVisible.value = false
   emits('resetData')
 }
@@ -63,6 +72,7 @@
 const resetForm = (formEl: FormInstance | undefined) => {
   // if (!formEl) { return }
   formEl?.resetFields()
+  resetDialog()
   dialogVisible.value = false
   emits('resetData')
 }
@@ -105,7 +115,7 @@
     uploadImage: {
       server: 'http://111.198.10.15:21409/minio/file/upload', // 配置图片上传地址
       maxFileSize: 2 * 1024 * 1024, // 10M  图片大小限制
-      fieldName: 'img', // 上传类型
+      fieldName: 'multipartFile', // 上传名字
       allowedFileTypes: [], // 选择文件时的类型限制，默认为 ['image/*'] 。如不想限制，则设置为 []
       // 自定义上传参数，传递图片时需要带一些参数过去写在这。参数会被添加到 formData 中，一起上传到服务端。
       // meta: {
@@ -154,9 +164,9 @@
     uploadVideo: {
       server: 'http://111.198.10.15:21409/minio/file/upload', // 配置视频上传地址
       maxFileSize: 5 * 1024 * 1024, // 5M  视频大小限制
-      fieldName: 'your-custom-name', // 上传类型
+      fieldName: 'multipartFile', // 上传名字
       // 最多可上传几个文件，默认为 5
-      maxNumberOfFiles: 3,
+      // maxNumberOfFiles: 1,
       allowedFileTypes: [], // 选择文件时的类型限制，默认为 ['video/*'] 。如不想限制，则设置为 []
       // 自定义上传参数，传递图片时需要带一些参数过去写在这。参数会被添加到 formData 中，一起上传到服务端。
       // meta: {
@@ -167,8 +177,8 @@
       //     Accept: 'text/x-json',
       //     otherKey: 'xxx'
       // },
-      metaWithUrl: false, // 将 meta 拼接到 url 参数中，默认 false
-      withCredentials: true, // 跨域是否传递 cookie ，默认为 false
+      // metaWithUrl: false, // 将 meta 拼接到 url 参数中，默认 false
+      // withCredentials: true, // 跨域是否传递 cookie ，默认为 false
       // 上传之前触发
       onBeforeUpload(file: any) {
         // file 选中的文件，格式如 { key: file }
@@ -222,9 +232,6 @@
     editorRef.value = editor // 一定要用 Object.seal() ，否则会报错
   })
 }
-const look = () => {
-  console.log(ruleForm.noticeContent)
-}
 const minioFileUrl = ref('')
 watch(() => ruleForm.minioFileName, (newVal) => {
   if (newVal) {
@@ -278,7 +285,7 @@
           />
           <editor
             v-model="ruleForm.noticeContent"
-            style="height: 150px; overflow-y: hidden;"
+            style="height: 300px; overflow-y: hidden;"
             :default-config="editorConfig"
             mode="default"
             @onCreated="onCreated"
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index 0926957..a4cdd5e 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -16,7 +16,7 @@
   noticePublisher: '', // 发布人
   noticeTime: '', // 发布时间
   noticeTitle: '', // 标题
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -27,6 +27,7 @@
     text: '编号',
     value: 'noticeNo',
     align: 'center',
+    width: '180',
   },
   {
     text: '标题',
@@ -37,6 +38,7 @@
     text: '发布人',
     value: 'noticePublisher',
     align: 'center',
+    width: '150',
   },
   {
     text: '内容描述',
@@ -47,11 +49,15 @@
     text: '发布时间',
     value: 'noticeTime',
     align: 'center',
+    width: '200',
   },
 ] // 表格
 const list = ref([]) // 表格数据
 // 获取通知公告列表
 const getNoticeList = () => {
+  if (!searchQuery.noticeTime) {
+    searchQuery.noticeTime = ''
+  }
   getNoticeeApi(searchQuery).then((res) => {
     total.value = res.data.total
     list.value = res.data.rows
diff --git a/src/views/system/notice/noticeDetail.vue b/src/views/system/notice/noticeDetail.vue
index 94468d4..da36bd8 100644
--- a/src/views/system/notice/noticeDetail.vue
+++ b/src/views/system/notice/noticeDetail.vue
@@ -1,5 +1,6 @@
 <!-- 通知公告详情弹窗 -->
 <script lang="ts" setup name="noticeDetail">
+import { Editor } from '@wangeditor/editor-for-vue'
 import type { noticeType } from './notice-interface'
 import { getNoticeDetail } from '@/api/system/notice'
 import { getPhotoUrl } from '@/api/system/tool'
@@ -52,6 +53,18 @@
     })
   }
 })
+// 编辑器配置
+const editorConfig = ref({
+  readOnly: true,
+})
+// 富文本实例对象
+const editorRef = shallowRef()
+const onCreated = (editor: any) => {
+  editorRef.value = editor
+  nextTick(() => {
+    editorRef.value = editor // 一定要用 Object.seal() ，否则会报错
+  })
+}
 </script>
 
 <template>
@@ -89,7 +102,18 @@
       </el-form-item>
       <el-form-item label="发布内容" prop="noticeContent">
         <!-- <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" disabled /> -->
-        <div style="border: 1px solid #dcdfe6;width: 100%;border-radius: 4px;padding: 12px;" v-html="ruleForm.noticeContent" />
+        <!-- <div style="border: 1px solid #dcdfe6;width: 100%;border-radius: 4px;padding: 12px;" v-html="ruleForm.noticeContent" ></div> -->
+        <div style="border: 1px solid #dcdfe6;width: 100%;border-radius: 4px;">
+          <editor
+            ref="editorRef"
+            v-model="ruleForm.noticeContent"
+            style="height: 300px; overflow-y: hidden;"
+            :default-config="editorConfig"
+            mode="default"
+            :disabled="true"
+            @onCreated="onCreated"
+          />
+        </div>
       </el-form-item>
       <el-form-item label="查看附件">
         <el-link v-if="ruleForm.minioFileName" :href="minioFileUrl" type="primary" target="_blank">

diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index bb58885..2959118 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -53,3 +53,64 @@
   }
   return true
 }
+
+/**
+ * 验证小写字母
+ * @param str
+ * @returns
+ */
+export function validateLowerCase(str: string) {
+  const reg = /^[a-z]+$/
+  return reg.test(str)
+}
+
+/* 验证大写字母 */
+export function validateUpperCase(str: string) {
+  const reg = /^[A-Z]+$/
+  return reg.test(str)
+}
+
+/* 验证大小写字母 */
+export function validateAlphabets(str: string) {
+  const reg = /^[A-Za-z]+$/
+  return reg.test(str)
+}
+
+/**
+ * 验证邮箱
+ * @param email
+ * @returns {boolean}
+ */
+export function validateEmail(email: string) {
+  const re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
+  return re.test(email)
+}
+
+/**
+ * 验证手机号
+ * @param phone
+ * @returns {boolean}
+ */
+export function validateMobile(phone: string) {
+  const re = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/
+  return re.test(phone)
+}
+
+/**
+ * 校验身份证号
+ * @param value
+ * @returns
+ */
+export function validateIdCardNo(value: string) {
+  const re = /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/
+  return re.test(value)
+}
+/**
+ *
+ * @param value 验证电话号码
+ * @returns
+ */
+export function validatePhone(value: string) {
+  const re = /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/
+  return re.test(value)
+}
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 1c2405e..bca0958 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,13 +1,46 @@
-<script lang="ts" setup name="borrowHandle">
-// 逻辑代码
+<!-- 设备借用处理 -->
+<script lang="ts" setup name="borrowApply">
+import list from './components/handleList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '待借用', comp: list },
+  { name: '已借用', comp: list },
+  { name: '已归还', comp: list },
+])
+const current = ref('待借用')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用处理
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 03d414b..c5771f7 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,13 +1,50 @@
+<!-- 设备借用申请 -->
 <script lang="ts" setup name="borrowApply">
-// 逻辑代码
+import list from './components/applyList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '全部', comp: list },
+  { name: '草稿箱', comp: list },
+  { name: '待审批', comp: list },
+  { name: '审批中', comp: list },
+  { name: '已通过', comp: list },
+  { name: '未通过', comp: list },
+  { name: '已取消', comp: list },
+])
+const current = ref('全部')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用申请
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
new file mode 100644
index 0000000..052f3ce
--- /dev/null
+++ b/src/views/device/borrow/components/applyList.vue
@@ -0,0 +1,328 @@
+<script lang="ts" setup name="borrowApplyList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '文件号',
+    value: 'fileNo',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '类别',
+    value: 'catergory',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '李四',
+      time: '2020-12-14 00:00:00',
+      status: '未通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const approveRef = ref()
+// 同意
+const agree = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '1',
+  })
+}
+// 驳回
+const reject = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '3',
+  })
+}
+// 拒绝
+const refuse = (row: any) => {
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
+}
+// 取消
+const cancel = (rowrow: any) => {
+  ElMessageBox.confirm(
+    '确认取消吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" @click="addBtn" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="agree(row)">
+                  同意
+                </el-button>
+                <el-button size="small" type="primary" link @click="reject(row)">
+                  驳回
+                </el-button>
+                <el-button size="small" type="primary" link @click="refuse(row)">
+                  拒绝
+                </el-button>
+                <el-button size="small" type="primary" link @click="cancel(row)">
+                  取消
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/components/approvalActionDialog.vue b/src/views/device/borrow/components/approvalActionDialog.vue
new file mode 100644
index 0000000..214876c
--- /dev/null
+++ b/src/views/device/borrow/components/approvalActionDialog.vue
@@ -0,0 +1,104 @@
+<!-- 审批操作弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
+const dialogVisibleApprove = ref(false)
+const form = reactive({
+  radio: '1',
+})
+const ruleFormRef = ref<FormInstance>()
+const rules = reactive<FormRules>({
+})
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const approvetime = ref('') // 审批时间
+const initDialog = (row: any) => {
+  dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
+}
+defineExpose({ initDialog })
+
+// 点击保存
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      dialogVisibleApprove.value = false
+      emits('resetData')
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  formEl.resetFields()
+  dialogVisibleApprove.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
+    <el-form
+      ref="ruleFormRef" :model="form"
+      :rules="rules" label-width="110px"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人">
+            <el-input disabled :value="userInfo.$state.name" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间">
+            <el-input disabled :value="approvetime" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
+        <el-button @click="resetForm(ruleFormRef)">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
new file mode 100644
index 0000000..cfda00a
--- /dev/null
+++ b/src/views/device/borrow/components/handleList.vue
@@ -0,0 +1,281 @@
+<script lang="ts" setup name="borrowHandleList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '申请编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'dept',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      dept: '顶级',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      dept: '徐州分中心',
+      user: '里斯',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+const borrow = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="borrow(row)">
+                  借用
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/addRow.vue b/src/views/device/standingBook/components/addRow.vue
index 1678cdb..07b03d1 100644
--- a/src/views/device/standingBook/components/addRow.vue
+++ b/src/views/device/standingBook/components/addRow.vue
@@ -5,7 +5,7 @@
 import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
+const formLabelWidth = '110px'
 const form = ref({})
 const formTable = ref([
   {
@@ -91,108 +91,188 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`">
+  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
     >
       <div v-if="name === '周检记录'">
-        <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录表编号" />
-        </el-form-item>
-        <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录人" />
-        </el-form-item>
-        <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="检定日期"
-          />
-        </el-form-item>
-        <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="有效日期"
-          />
-        </el-form-item>
-        <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="送检人" />
-        </el-form-item>
-        <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录表编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="检定日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="有效日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="送检人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '状态变更记录'">
-        <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="状态类型" clearable>
-            <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="结束日期"
-          />
-        </el-form-item>
-        <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="申请人" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="状态类型" clearable style="width: 100%;">
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="申请人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '使用记录'">
-        <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用人" />
-        </el-form-item>
-        <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用部门" />
-        </el-form-item>
-        <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="使用类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用结束日期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用部门" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="使用类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '检定证书'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="证书类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书出具日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书有效期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
     </el-form>
     <template #footer>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 5f7b347..9a9f798 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -352,7 +352,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -376,7 +376,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -391,7 +391,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -404,14 +404,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -434,7 +434,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -443,20 +443,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -480,23 +480,23 @@
               <com-tree-select
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -507,10 +507,10 @@
             <el-form-item label="检定部门" prop="mesureDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -520,7 +520,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -529,13 +529,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -544,21 +544,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -578,14 +578,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -594,14 +594,14 @@
         <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-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -669,7 +669,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index fc3fd54..d9d4514 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -199,6 +199,8 @@
     useDeptList.value = toTreeList(res.data, '0', true)
   })
 }
+const selectTreeRef1 = ref()
+const selectTreeRef2 = ref()
 // 重置
 const resetDATA = () => {
   ruleForm.value = {
@@ -254,6 +256,10 @@
     isStandardSupportEquipment: '', //		是否标准配套设备
     id: '',
   }
+  if (title.value !== '详情') {
+    selectTreeRef1.value.clearSelected()
+    selectTreeRef2.value.clearSelected()
+  }
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
@@ -378,7 +384,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -402,7 +408,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -416,8 +422,7 @@
             <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"
+                :placeholder="title === '详情' ? '' : '出厂年月'" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -430,14 +435,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -460,7 +465,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -469,20 +474,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -505,24 +510,26 @@
             <el-form-item label="使用部门" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
+                ref="selectTreeRef2"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -536,10 +543,12 @@
               </el-select> -->
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                ref="selectTreeRef1"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -549,7 +558,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -558,13 +567,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -573,21 +582,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -607,14 +616,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -624,14 +633,14 @@
           <el-col :span="6">
             <el-form-item label="资本来源" prop="capitalSource">
               <!-- <el-input v-model.trim="ruleForm.capitalSource" placeholder="资本来源" :disabled="title === '详情'" /> -->
-              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -699,7 +708,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f653095..f4229a6 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -147,19 +147,17 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
-  setTimeout(() => {
-    list.value = [
-      {
-        equipmentNo: 123,
-        equipmentName: 'test',
-        modelNo: '001',
-        usePersonName: '张三',
-        validDate: '2022-12-12 00:00:00',
-        useDeptName: '顶级',
-      },
-    ]
-    total.value = 1
-  }, 1000)
+  list.value = [
+    {
+      equipmentNo: 123,
+      equipmentName: 'test',
+      modelNo: '001',
+      usePersonName: '张三',
+      validDate: '2022-12-12 00:00:00',
+      useDeptName: '顶级',
+    },
+  ] as any
+  total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -220,9 +218,11 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -300,13 +300,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.mesureType" class="m-2 normal-select" placeholder="检定方式" clearable>
+          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable>
             <el-option
               v-for="item in mesureTypeList"
               :key="item.id"
@@ -316,7 +316,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.managerState" class="m-2 normal-select" placeholder="管理状态" clearable>
+          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable>
             <el-option
               v-for="item in managerStateList"
               :key="item.id"
@@ -327,8 +327,9 @@
         </search-item>
         <search-item>
           <com-tree-select
+            ref="selectTreeRef"
             v-model="searchQuery.useDept" :options="useDeptList" placeholder="使用部门"
-            :tree-props="deptProps" style="width: 150px;"
+            :tree-props="deptProps"
           />
         </search-item>
         <search-item>
@@ -336,11 +337,10 @@
             v-model="searchQuery.validDate" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="有效日期"
             class="normal-date"
-            style="width: 150px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.abc" class="m-2 normal-select" placeholder="ABC" clearable>
+          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable>
             <el-option
               v-for="item in abcList"
               :key="item.id"
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 78a3800..4c31a94 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -2,9 +2,10 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/fixedAssetsAdd.vue'
-import type { fixedAssetsType } from './standingBook-interface'
+import type { fixedAssetsType, selectType } from './standingBook-interface'
 import { exportFile } from '@/utils/exportUtils'
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
+import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   assetNo: '', // 固定编号
@@ -50,7 +51,7 @@
   },
   {
     text: '设备类型',
-    value: 'assetTypeName',
+    value: 'equipmentTypeName',
     width: '150',
     align: 'center',
   },
@@ -102,6 +103,7 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+const equipmentCategoryList = ref<selectType[]>([]) // 设备类别
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
@@ -242,6 +244,10 @@
 }
 onMounted(() => {
   getList()
+  // 获取设备类别
+  getDictByCode('equipmentCategory').then((response) => {
+    equipmentCategoryList.value = response.data
+  })
 })
 </script>
 
@@ -265,7 +271,10 @@
           <el-input v-model="searchQuery.equipmentSpecifications" placeholder="设备规格" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-select v-model="searchQuery.equipmentCategory" placeholder="设备类别" clearable>
+            <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+          </el-select>
         </search-item>
       </search-area>
       <table-container>
diff --git a/src/views/device/stateManage/components/addRow.vue b/src/views/device/stateManage/components/addRow.vue
new file mode 100644
index 0000000..3ba82d6
--- /dev/null
+++ b/src/views/device/stateManage/components/addRow.vue
@@ -0,0 +1,160 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { listPageApi } from '@/api/device/standingBook'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  limit: 10,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '出厂编号',
+    value: 'manufacturingNo',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+  },
+])
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listPageApi(listQuery.value as any).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map(item => ({ ...item, checked: '' }))
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    equipmentName: '', // 姓名
+    equipmentNo: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const checkedArr = list.value.filter(item => item.checked !== '')
+  if (checkedArr.length) {
+    console.log(checkedArr, '选中的设备')
+    emits('add', checkedArr)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择设备')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns as any" :query="listQuery"
+        :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-checkbox v-model="scope.row.checked" :label="scope.$index" size="large" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-checkbox__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index 56417d6..214876c 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -47,38 +47,45 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="30%">
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
-      :rules="rules"
+      :rules="rules" label-width="110px"
     >
-      <el-form-item label="审批意见">
-        <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
-        <el-radio-group v-model="form.radio">
-          <el-radio label="1">
-            同意
-          </el-radio>
-          <el-radio label="2">
-            拒绝
-          </el-radio>
-          <el-radio label="3">
-            驳回
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="审批结论">
-        <el-input
-          :rows="4"
-          type="textarea"
-        />
-      </el-form-item>
       <el-row :gutter="24">
-        <el-col :span="10">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="审批人">
             <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
-        <el-col :span="14">
+        <el-col :span="12">
           <el-form-item label="审批时间">
             <el-input disabled :value="approvetime" />
           </el-form-item>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index e74d70e..2003e31 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -1,7 +1,8 @@
 <!-- 新增或详情弹窗 -->
-<script lang="ts" setup name="addNotice">
+<script lang="ts" setup name="add">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
+import addRow from './addRow.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
@@ -16,6 +17,7 @@
 const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const name = ref('')
+const borrowList = ref([])
 const ruleForm = ref({
   assetNo: '', // 资产编号
   assetType: '', // 资产类型
@@ -357,10 +359,86 @@
     isShowCalibration.value = true
   }
 })
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerLevelName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+  },
+])
+const addRowRef = ref()
+// 添加行
+const addRowBtn = () => {
+  addRowRef.value.initDialog({ title: '添加' })
+}
+// 删除行
+const removeRowBtn = () => {
+  const removeArr = borrowList.value.filter(item => item.remove !== '')
+  if (removeArr.length) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      borrowList.value = borrowList.value.filter(item => item.remove === '')
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 借用设备列表添加
+const addRowMethods = (row) => {
+  row.forEach((element) => {
+    borrowList.value.push({ ...element, remove: '' })
+  })
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
     <detail-page :title="`${name}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
@@ -378,15 +456,16 @@
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder="">
+              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -430,7 +509,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -454,28 +533,56 @@
         </el-row>
       </el-form>
     </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>
+    <div>
+      <detail-block title="借用设备列表">
+        <template #btns>
+          <el-button type="primary" @click="addRowBtn">
+            添加行
+          </el-button>
+          <el-button type="info" @click="removeRowBtn">
+            删除行
+          </el-button>
+        </template>
+        <normal-table
+          :data="borrowList" :total="1" :columns="columns as any"
+        >
+          <template #preColumns>
+            <el-table-column label="选择" width="55" align="center">
+              <template #default="scope">
+                <el-checkbox v-model="scope.row.remove" :label="scope.$index" size="large" />
+              </template>
+            </el-table-column>
+            <el-table-column label="序号" width="60" align="center">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </detail-block>
+      <detail-block 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>
+    </div>
   </app-container>
 </template>
 
@@ -484,6 +591,10 @@
   background-color: #fff;
 }
 
+:deep(.el-checkbox__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,
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index aaaaf61..d588b8d 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,6 +1,7 @@
 <script lang="ts" setup name="bench">
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
+import type { trainLogStatistic } from './bench-interface'
 import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
 import { getPlanList } from '@/api/system/plan'
 import { listPageApi } from '@/api/measure/file'
@@ -132,15 +133,19 @@
     account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
+    const result: trainLogStatistic = res.data
+    const notQualified: number = Number(result.trainCount) - result.qualifiedCount
+    const qualifiedRate = ((result.qualifiedCount / result.trainCount) * 100).toFixed(2) // 合格率
+    const notQualifiedRate = ((notQualified / result.trainCount) * 100).toFixed(2) // 不合格率
     TrainLogSList.value = [
-      { name: `合格     ${res.data.qualified}-${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
-      { name: `不合格   ${res.data.notQualified}- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+      { name: `合   格   ${result.qualifiedCount}-${qualifiedRate}%`, value: result.qualifiedCount },
+      { name: `不合格   ${notQualified}- ${notQualifiedRate}%`, value: notQualified },
     ]
     TrainLogTitle.value = res.data.trainCount
   }).catch((_) => {
     // 处理异常
     TrainLogSList.value = [
-      { name: '合格     0 - 50%', value: 0 },
+      { name: '合   格   0 - 50%', value: 0 },
       { name: '不合格   0 - 50%', value: 0 },
     ]
     TrainLogTitle.value = 0
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 9ef0b93..1ad577b 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -270,7 +270,7 @@
               <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="6">
             <el-form-item label="名称" prop="fileName">
               <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
             </el-form-item>
@@ -279,13 +279,14 @@
         <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" class="fill-input" disabled>
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled style="width: 100%;">
                 <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="请选择发布单位"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -295,6 +296,7 @@
                 v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -311,12 +313,13 @@
                 v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人" prop="createUserId">
-              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index b45fbc3..542b284 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -26,7 +26,7 @@
   createUser: '', // 创建人
   createTime: '', // 创建
   approvalStatus: props.value, // 审批状态
-  limit: 10,
+  limit: 20,
   offset: 1,
   fileType: '', // 类型
   formId: '',
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 7d4724b..e54ddf5 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -26,7 +26,7 @@
   fileCode: '', // 文件号
   effectiveTime: '', // 实施时间
   effectiveStatus: '', // 实施状态
-  limit: 10,
+  limit: 20,
   offset: 1,
   fileType: '', // 类型
 }) // 查询参数
@@ -75,13 +75,19 @@
 const getStatus = () => {
   getDictByCode('effectiveStatus').then((res) => {
     if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
+      effectiveStatusSelect.value = [...res.data, { name: '全部', value: '', id: 'quanbu' }]
     }
   })
 }
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.publishTime) {
+    searchQuery.publishTime = ''
+  }
+  if (!searchQuery.effectiveTime) {
+    searchQuery.effectiveTime = ''
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -252,13 +258,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" />
         </search-item>
         <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
@@ -274,20 +280,16 @@
           <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: 185px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
             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: 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" placeholder="实施状态" clearable>
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index 5ca3275..a95c665 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -505,21 +505,21 @@
         <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] === '详情'" @change="directorChange">
+              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;" @change="directorChange">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.name" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
-              <el-select v-model="ruleForm.technologyJob" :placeholder="title.split('-')[2] === '详情' ? '' : '技术职务'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.technologyJob" :placeholder="title.split('-')[2] === '详情' ? '' : '技术职务'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;">
                 <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="administrationJob">
-              <el-select v-model="ruleForm.administrationJob" :placeholder="title.split('-')[2] === '详情' ? '' : '行政职务'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.administrationJob" :placeholder="title.split('-')[2] === '详情' ? '' : '行政职务'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index aac1ef2..11d6d0a 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -22,7 +22,7 @@
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
-  limit: 10,
+  limit: 20,
   offset: 1,
   organizeType: '', // 类型
   createTime: '', // 创建时间
@@ -118,6 +118,9 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.createTime) {
+    searchQuery.createTime = ''
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows.map(item => ({ ...item, createTime: item.createTime.split(' ')[0] }))
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 3f472eb..bc5d9d4 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -7,7 +7,9 @@
 // import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
-import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+// import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const props = defineProps({
   isRemind: {
     type: Boolean,
@@ -78,11 +80,14 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 // 获取所有部门
-const deptList = ref<DeptTreeNode[]>([])
+const deptList = ref([])
 const getDeptList = async () => {
   getDeptTreeList().then((res) => {
-    deptList.value = res.data
+    deptList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
@@ -177,6 +182,7 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   searchQuery.staffNo = ''
@@ -184,6 +190,7 @@
   searchQuery.deptId = ''
   searchQuery.certificateStatus = ''
   searchQuery.verifierCertificateNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -212,10 +219,6 @@
     loading.close()
   })
 }
-// 打印
-const print = () => {
-
-}
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传图片
@@ -268,20 +271,24 @@
           <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+          <!-- <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
             <el-option
               v-for="item in deptList"
               :key="item.id"
               :label="item.name"
               :value="item.id"
             />
-          </el-select>
+          </el-select> -->
+          <com-tree-select
+            ref="selectTreeRef" v-model="searchQuery.deptId" :options="deptList"
+            placeholder="工作部门" :tree-props="deptProps"
+          />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况">
+          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况" clearable>
             <el-option
               v-for="item in certificateStatusList"
               :key="item.id"
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 4352604..5a5f036 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -389,10 +389,10 @@
           关闭
         </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">
-            <el-form-item prop="minioFileName" label-width="70px">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item prop="minioFileName">
               <el-upload
                 class="avatar-uploader"
                 :show-file-list="false"
@@ -423,23 +423,24 @@
               <el-date-picker
                 v-model="ruleForm.birthday" type="date" format="YYYY-MM" value-format="YYYY-MM"
                 placeholder="出生年月" :disabled="title === '详情'"
+                style="width: 100%;"
               />
             </el-form-item>
             <el-form-item label="工作部门" prop="deptId" class="marg-item">
-              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled>
+              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled style="width: 100%;">
                 <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="ruleForm.deptId" :options="PubListTree"
-                placeholder="选择组织机构" :tree-props="deptProps"
+                placeholder="选择组织机构" :tree-props="deptProps" style="width: 100%;"
               />
             </el-form-item>
             <el-form-item label="计量专业" prop="major" class="marg-item">
               <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
             </el-form-item>
             <el-form-item label="是否特操人" prop="specialOperator" class="marg-item">
-              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -449,23 +450,23 @@
               <el-input v-model.trim="ruleForm.staffNo" placeholder="系统自动生成" disabled />
             </el-form-item>
             <el-form-item label="性别" prop="sex" class="marg-item">
-              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="技术职务" prop="technologyJob" class="marg-item">
-              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="从事日期" prop="workDate" class="marg-item">
               <el-date-picker
                 v-model="ruleForm.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-                placeholder="请选择从事日期"
+                placeholder="请选择从事日期" style="width: 100%;"
               />
             </el-form-item>
-            <el-form-item label="是否技术考核" prop="technologyExam" class="marg-item">
-              <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'">
+            <el-form-item label="是否技术考核" prop="technologyExam" class="marg-item" style="width: 100%;">
+              <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -475,17 +476,17 @@
               <el-input ref="cardRef" v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" @blur="getBirthday" />
             </el-form-item>
             <el-form-item label="文化程度" prop="education" class="marg-item">
-              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="行政职务" prop="administrationJob" class="marg-item">
-              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="是否主考人" prop="mainExaminer" class="marg-item">
-              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index 042636e..660f2b0 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -264,7 +264,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="性别" prop="meterStaff.sex">
-              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -273,21 +273,21 @@
         <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-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -296,7 +296,7 @@
         <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-select v-if="title === '详情'" v-model="meterStaff.deptId" disabled style="width: 100%;">
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
               <com-tree-select
@@ -304,6 +304,7 @@
                 ref="selectTreeRef" v-model="meterStaff.deptId" :options="PubListTree"
                 placeholder="选择组织机构"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -316,7 +317,7 @@
             <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="请选择从事日期"
+                placeholder="请选择从事日期" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -347,7 +348,7 @@
             <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="请选择发证日期"
+                placeholder="请选择发证日期" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -355,7 +356,7 @@
             <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="请选择有效日期"
+                placeholder="请选择有效日期" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 178fc12..d0116f3 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -3,7 +3,7 @@
 import type { FormInstance, FormRules } from 'element-plus'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
+const formLabelWidth = '110px'
 const form = reactive({
   certificateNo: '', // 证书号
   certificateName: '', // 证书名称
@@ -71,32 +71,52 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`" width="40%">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
     >
-      <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
-        <el-input v-model="form.certificateNo" placeholder="证书号" />
-      </el-form-item>
-      <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
-        <el-input v-model="form.certificateName" placeholder="证书名称" />
-      </el-form-item>
-      <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
-        <el-input v-model="form.certificateCompany" placeholder="发证单位" />
-      </el-form-item>
-      <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
-        <el-date-picker
-          v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择发证日期"
-        />
-      </el-form-item>
-      <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-        <el-date-picker
-          v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择有效日期"
-        />
-      </el-form-item>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
+            <el-input v-model="form.certificateNo" placeholder="证书号" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
+            <el-input v-model="form.certificateName" placeholder="证书名称" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
+            <el-input v-model="form.certificateCompany" placeholder="发证单位" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
+            <el-date-picker
+              v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择发证日期" style="width: 100%;"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+            <el-date-picker
+              v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择有效日期" style="width: 100%;"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <template #footer>
       <span class="dialog-footer">
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
index 5e20d1b..10b0deb 100644
--- a/src/views/measure/person/components/personListDialog.vue
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -1,8 +1,11 @@
 <!-- 计量人员列表弹窗 -->
 <script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
 import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import { getDeptTreeList } from '@/api/system/dept'
-import type { TreeStructure } from '@/views/system/user/user-interface'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -10,7 +13,7 @@
   staffNo: '', // 人员编号
   name: '', // 姓名
   deptId: '', // 所在部门
-  limit: 5,
+  limit: 10,
   offset: 1,
 })
 const loadingTable = ref<boolean>(false)
@@ -32,20 +35,22 @@
   },
 ])
 // 获取部门
-const deptIdList = ref<TreeStructure[]>([])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const deptIdList = ref([])
 const getDeptList = () => {
   getDeptTreeList().then((res) => {
-    deptIdList.value = res.data
+    deptIdList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
 const fetchData = () => {
-  select.value = ''
+  select.value = -1
   getStaffList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.records
       total.value = Number(res.data.total)
-      console.log(list.value, 'list')
     }
   })
 }
@@ -53,6 +58,7 @@
 const search = () => {
   fetchData()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   listQuery.value = {
@@ -62,6 +68,7 @@
     limit: 10,
     offset: 1,
   }
+  selectTreeRef.value.clearSelected()
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -76,18 +83,24 @@
 }
 // 点击保存
 const submitForm = () => {
-  const person = list.value.filter((item, index) => index == select.value)[0]
-  console.log(person, 'person')
-  getStaffDetail(person).then((res) => {
-    if (res.code === 200) {
-      emits('add', res.data)
-      dialogFormVisible.value = false
-    }
-  })
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    getStaffDetail(person).then((res) => {
+      if (res.code === 200) {
+        emits('add', res.data)
+        dialogFormVisible.value = false
+        reset()
+      }
+    })
+  }
+  else {
+    ElMessage.warning('请先选择人员')
+  }
 }
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
+  reset()
 }
 // 初始化
 const initDialog = () => {
@@ -99,39 +112,45 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员" width="50%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable style="width: 150px;" />
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable style="width: 150px;" />
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
+        <!-- <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
           <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
+        </el-select> -->
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
-    <normal-table
-      :data="list" :total="total" :columns="columns" :query="listQuery"
-      :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>
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :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">
             {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
           </template>
         </el-table-column> -->
-      </template>
-    </normal-table>
+        </template>
+      </normal-table>
+    </div>
     <template #footer>
       <span class="dialog-footer">
         <el-button type="primary" @click="submitForm">确认</el-button>
diff --git a/src/views/measure/person/components/userListDialog.vue b/src/views/measure/person/components/userListDialog.vue
index dcd05b5..cd62a73 100644
--- a/src/views/measure/person/components/userListDialog.vue
+++ b/src/views/measure/person/components/userListDialog.vue
@@ -3,14 +3,16 @@
 import { ElMessage } from 'element-plus'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
-import type { TreeStructure } from '@/views/system/user/user-interface'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
 const listQuery = ref({
   keywords: '', // 姓名
   deptId: '', // 所在部门
-  limit: 5,
+  limit: 10,
   offset: 1,
 })
 const loadingTable = ref<boolean>(false)
@@ -31,11 +33,14 @@
     value: 'deptName',
   },
 ])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 // 获取部门
-const deptIdList = ref<TreeStructure[]>([])
+const deptIdList = ref([])
 const getDeptList = () => {
   getDeptTreeList().then((res) => {
-    deptIdList.value = res.data
+    deptIdList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
@@ -52,6 +57,7 @@
 const search = () => {
   fetchData()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   listQuery.value = {
@@ -60,6 +66,7 @@
     limit: 10,
     offset: 1,
   }
+  selectTreeRef.value.clearSelected()
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -74,11 +81,11 @@
 }
 // 点击保存
 const submitForm = () => {
-  console.log(select.value)
   if (select.value >= 0) {
     const person = list.value.filter((item, index) => index == select.value)[0]
     emits('add', person)
     dialogFormVisible.value = false
+    reset()
   }
   else {
     ElMessage.warning('请先选择人员')
@@ -87,9 +94,11 @@
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
+  reset()
 }
 // 初始化
 const initDialog = () => {
+  // reset()
   dialogFormVisible.value = true
   getDeptList()
   fetchData()
@@ -98,16 +107,20 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+  <el-dialog v-model="dialogFormVisible" title="选择人员" width="50%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
         <el-input v-model.trim="listQuery.keywords" placeholder="真实姓名" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable>
+        <!-- <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable>
           <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
+        </el-select> -->
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 9c6f65d..355473a 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -7,7 +7,9 @@
 // import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
-import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+// import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
@@ -16,7 +18,7 @@
   major: '', // 计量专业
   verifierCertificateNo: '', // 证书号
   certificateStatus: '', // 证书状态
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -52,10 +54,10 @@
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取所有部门
-const deptList = ref<DeptTreeNode[]>([])
+const deptList = ref([])
 const getDeptList = async () => {
   getDeptTreeList().then((res) => {
-    deptList.value = res.data
+    deptList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
@@ -126,6 +128,7 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   searchQuery.staffNo = ''
@@ -133,6 +136,7 @@
   searchQuery.deptId = ''
   searchQuery.major = ''
   searchQuery.verifierCertificateNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -160,10 +164,9 @@
     loading.close()
   })
 }
-// 打印
-const print = () => {
-
-}
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传图片
@@ -216,14 +219,18 @@
           <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+          <!-- <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
             <el-option
               v-for="item in deptList"
               :key="item.id"
               :label="item.name"
               :value="item.id"
             />
-          </el-select>
+          </el-select> -->
+          <com-tree-select
+            ref="selectTreeRef" v-model="searchQuery.deptId" :options="deptList"
+            placeholder="工作部门" :tree-props="deptProps"
+          />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.major" placeholder="计量专业" clearable class="w-50 m-2" />
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index af0a29d..2e0e7af 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -1,12 +1,15 @@
 <script lang="ts" setup name="ListSourceAdd">
-import { reactive, ref } from 'vue'
+/**
+ * 添加/编辑/详情溯源供方
+ */
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions, IformInline } from './list_interface'
+import type { IOptions, IformInline, traceSupplierPerson } from './list_interface'
 import { exportFile } from '@/utils/exportUtils'
 import { UploadFile } from '@/api/measure/file'
 import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+import { validatePhone } from '@/utils/validate'
 const props = defineProps({
   infoId: {
     type: String,
@@ -19,43 +22,45 @@
 })
 const emit = defineEmits(['close'])
 const formInline: Ref<IformInline> = ref({
-  businessContent: null,
-  supplierName: null,
-  supplierNo: null,
-  bankAccount: null,
-  bankAccountNumber: null,
-  bankName: null,
-  briefName: null,
-  businessScope: null,
-  companyAddress: null,
-  companyArea: null,
-  companyCity: null,
-  companyCountry: null,
-  companyProvince: null,
-  createTime: null,
-  director: null,
-  fax: null,
-  invoiceAddress: null,
-  invoiceArea: null,
-  invoiceCity: null,
-  invoiceCountry: null,
-  invoiceProvince: null,
-  mailbox: null,
-  minioFileName: null,
-  mobile: null,
-  phone: null,
-  postalCode: null,
-  remark: null,
-  taxNumber: null,
-  website: null,
+  id: '',
+  businessContent: '',
+  supplierName: '',
+  supplierNo: '',
+  bankAccount: '',
+  bankAccountNumber: '',
+  bankName: '',
+  briefName: '',
+  businessScope: '',
+  companyAddress: '',
+  companyArea: '',
+  companyCity: '',
+  companyCountry: '',
+  companyProvince: '',
+  createTime: '',
+  director: '',
+  fax: '',
+  invoiceAddress: '',
+  invoiceArea: '',
+  invoiceCity: '',
+  invoiceCountry: '',
+  invoiceProvince: '',
+  mailbox: '',
+  minioFileName: '',
+  mobile: '',
+  phone: '',
+  postalCode: '',
+  remark: '',
+  taxNumber: '',
+  website: '',
   traceSupplierPersonList: [],
 })
+const traceSupplierPersonList: Ref<traceSupplierPerson[]> = ref([])
 const columns = ref([
-  { text: '人员编号', value: 'personNo', show: true },
-  { text: '姓名', value: 'name', show: true },
-  { text: '工作部门', value: 'department', show: true },
-  { text: '职务', value: 'job', show: true },
-  { text: '联系方式', value: 'phone', show: true },
+  { text: '人员编号', value: 'personNo', required: false },
+  { text: '姓名', value: 'name', required: true },
+  { text: '工作部门', value: 'department', required: false },
+  { text: '职务', value: 'job', required: false },
+  { text: '联系方式', value: 'phone', required: true, reg: validatePhone },
 ])
 const ruleFormRef = ref<FormInstance>()
 const provinceList = ref<IOptions[]>([])
@@ -66,14 +71,17 @@
 const invoiceCityList = ref<IOptions[]>([])
 const areaInvoiceList = ref<IOptions[]>([])
 const dialogVisible = ref(false)
-const addPersonList = ref({
+// 人员对象
+const addPersonObj: traceSupplierPerson = {
+  id: '',
   personNo: '',
   name: '',
   department: '',
   job: '',
   phone: '',
-})
-const SelectionList = ref([])
+  editable: true,
+}
+const SelectionList: Ref<traceSupplierPerson[]> = ref([])
 const upload = ref<UploadInstance>()
 // 校验规则
 const rules = ref({
@@ -91,7 +99,7 @@
   })
 }
 // 表格选中
-const handleSelectionChange = (e: any) => {
+const handleSelectionChange = (e: traceSupplierPerson[]) => {
   SelectionList.value = e
 }
 // 获取公司地址省级
@@ -142,15 +150,33 @@
   })
 }
 // 点击增加行
-const addRoow = () => {
-  const object = {
-    personNo: '',
-    name: '',
-    department: '',
-    job: '',
-    phone: '',
+const addRow = () => {
+  // 检查上一行必填项
+  if (checkPersonList()) {
+    setAllRowReadable()
+    traceSupplierPersonList.value.push({ ...addPersonObj })
   }
-  formInline.value.traceSupplierPersonList.push(object)
+}
+// 检查人员列表
+function checkPersonList() {
+  for (let index = 0; index < traceSupplierPersonList.value.length; index++) {
+    const item = traceSupplierPersonList.value[index]
+    for (const prop of columns.value) {
+      // 检查必填
+      if (prop.required && !item[prop.value]) {
+        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
+        return false
+      }
+      // 验证正则
+      if (prop.reg && typeof prop.reg === 'function') {
+        if (!prop.reg(item[prop.value])) {
+          ElMessage.warning(`第${index + 1}行中${prop.text}输入不合法`)
+          return false
+        }
+      }
+    }
+  }
+  return true
 }
 // 点击关闭
 const handleClose = () => {
@@ -158,12 +184,12 @@
 }
 // 点击弹窗的完成追加到表格数组中
 const addPushList = () => {
-  formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonList.value)))
+  formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonObj.value)))
   handleClose()
 }
 // 删除行
 const deleteList = () => {
-  formInline.value.traceSupplierPersonList = formInline.value.traceSupplierPersonList.filter((item) => {
+  traceSupplierPersonList.value = traceSupplierPersonList.value.filter((item: traceSupplierPerson) => {
     return !SelectionList.value.includes(item)
   })
 }
@@ -261,10 +287,16 @@
     }
   })
 }
-// 双击表格显示输入框
-const dblclickName = (item: object) => {
-  console.log(item)
-  item.show = false
+// 双击行显示输入框
+const dblclickRow = (row: traceSupplierPerson) => {
+  setAllRowReadable()
+  row.editable = true
+}
+// 将所有人员信息列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of traceSupplierPersonList.value) {
+    item.editable = false
+  }
 }
 if (props.buttonType !== '新建') {
   getInfo()
@@ -273,7 +305,7 @@
 
 <template>
   <app-container>
-    <detail-page :title="`培训计划-${buttonType}`">
+    <detail-page :title="`溯源供方-${buttonType}`">
       <template #btns>
         <el-button
           type="primary"
@@ -617,39 +649,36 @@
       </el-form>
     </detail-page>
     <detail-block title="人员信息">
-      <template #btns>
-        <el-button
-          type="info"
-          :disabled="buttonType === '详情'"
-          @click="deleteList"
-        >
+      <template v-if="buttonType !== '详情'" #btns>
+        <el-button type="info" @click="deleteList">
           删除行
         </el-button>
-        <el-button
-          type="primary"
-          :disabled="buttonType === '详情'"
-          @click="addRoow"
-        >
+        <el-button type="primary" @click="addRow">
           增加行
         </el-button>
       </template>
       <el-table
-        :data="formInline.traceSupplierPersonList"
+        :data="traceSupplierPersonList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
+        @row-dblclick="dblclickRow"
       >
-        <el-table-column type="selection" width="55" />
+        <el-table-column type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column
           v-for="item in columns"
           :key="item.value"
           :prop="item.value"
           :label="item.text"
+          align="center"
         >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
           <template #default="scope">
-            <span v-show="item.show" style="color: gray;" @dblclick="dblclickName(item)">{{ scope.row[item.value] || `双击编辑${item.text}` }}</span>
-            <el-input v-show="!item.show" v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" @blur="item.show = true" />
+            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+            <el-input v-else v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index 530bcc4..c057976 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -24,6 +24,18 @@
   areaName: string
 }
 
+// 溯源供方人员
+export interface traceSupplierPerson {
+  id: number | string // id
+  job: string // 职务
+  department: string// 部门
+  name: string// 信命
+  personNo: string// 人员编号
+  phone: string// 联系方式
+  editable?: boolean // 是否可编辑
+  [key: string]: any
+}
+
 export interface IformInline {
   businessContent: string
   supplierName: string
@@ -55,5 +67,6 @@
   remark: string
   taxNumber: string
   website: string
-  traceSupplierPersonList: []
+  traceSupplierPersonList: traceSupplierPerson []
 }
+
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index e44001a..600eda1 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -32,11 +32,20 @@
   dialogVisible.value = true
   ruleForm.noticePublisher = userInfo.$state.name
   ruleForm.noticeCompany = userInfo.$state.deptName
-  ruleForm.noticeTime = dayjs().format('YYYY-MM-DD')
+  ruleForm.noticeTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
 }
 defineExpose({ initDialog })
+// 重置
+const resetDialog = () => {
+  ruleForm.noticeTime = ''
+  ruleForm.noticeSketch = ''
+  ruleForm.noticeContent = ''
+  ruleForm.minioFileName = ''
+  ruleForm.noticeTitle = ''
+}
 // 关闭弹窗
 const close = () => {
+  resetDialog()
   dialogVisible.value = false
   emits('resetData')
 }
@@ -63,6 +72,7 @@
 const resetForm = (formEl: FormInstance | undefined) => {
   // if (!formEl) { return }
   formEl?.resetFields()
+  resetDialog()
   dialogVisible.value = false
   emits('resetData')
 }
@@ -105,7 +115,7 @@
     uploadImage: {
       server: 'http://111.198.10.15:21409/minio/file/upload', // 配置图片上传地址
       maxFileSize: 2 * 1024 * 1024, // 10M  图片大小限制
-      fieldName: 'img', // 上传类型
+      fieldName: 'multipartFile', // 上传名字
       allowedFileTypes: [], // 选择文件时的类型限制，默认为 ['image/*'] 。如不想限制，则设置为 []
       // 自定义上传参数，传递图片时需要带一些参数过去写在这。参数会被添加到 formData 中，一起上传到服务端。
       // meta: {
@@ -154,9 +164,9 @@
     uploadVideo: {
       server: 'http://111.198.10.15:21409/minio/file/upload', // 配置视频上传地址
       maxFileSize: 5 * 1024 * 1024, // 5M  视频大小限制
-      fieldName: 'your-custom-name', // 上传类型
+      fieldName: 'multipartFile', // 上传名字
       // 最多可上传几个文件，默认为 5
-      maxNumberOfFiles: 3,
+      // maxNumberOfFiles: 1,
       allowedFileTypes: [], // 选择文件时的类型限制，默认为 ['video/*'] 。如不想限制，则设置为 []
       // 自定义上传参数，传递图片时需要带一些参数过去写在这。参数会被添加到 formData 中，一起上传到服务端。
       // meta: {
@@ -167,8 +177,8 @@
       //     Accept: 'text/x-json',
       //     otherKey: 'xxx'
       // },
-      metaWithUrl: false, // 将 meta 拼接到 url 参数中，默认 false
-      withCredentials: true, // 跨域是否传递 cookie ，默认为 false
+      // metaWithUrl: false, // 将 meta 拼接到 url 参数中，默认 false
+      // withCredentials: true, // 跨域是否传递 cookie ，默认为 false
       // 上传之前触发
       onBeforeUpload(file: any) {
         // file 选中的文件，格式如 { key: file }
@@ -222,9 +232,6 @@
     editorRef.value = editor // 一定要用 Object.seal() ，否则会报错
   })
 }
-const look = () => {
-  console.log(ruleForm.noticeContent)
-}
 const minioFileUrl = ref('')
 watch(() => ruleForm.minioFileName, (newVal) => {
   if (newVal) {
@@ -278,7 +285,7 @@
           />
           <editor
             v-model="ruleForm.noticeContent"
-            style="height: 150px; overflow-y: hidden;"
+            style="height: 300px; overflow-y: hidden;"
             :default-config="editorConfig"
             mode="default"
             @onCreated="onCreated"
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index 0926957..a4cdd5e 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -16,7 +16,7 @@
   noticePublisher: '', // 发布人
   noticeTime: '', // 发布时间
   noticeTitle: '', // 标题
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -27,6 +27,7 @@
     text: '编号',
     value: 'noticeNo',
     align: 'center',
+    width: '180',
   },
   {
     text: '标题',
@@ -37,6 +38,7 @@
     text: '发布人',
     value: 'noticePublisher',
     align: 'center',
+    width: '150',
   },
   {
     text: '内容描述',
@@ -47,11 +49,15 @@
     text: '发布时间',
     value: 'noticeTime',
     align: 'center',
+    width: '200',
   },
 ] // 表格
 const list = ref([]) // 表格数据
 // 获取通知公告列表
 const getNoticeList = () => {
+  if (!searchQuery.noticeTime) {
+    searchQuery.noticeTime = ''
+  }
   getNoticeeApi(searchQuery).then((res) => {
     total.value = res.data.total
     list.value = res.data.rows
diff --git a/src/views/system/notice/noticeDetail.vue b/src/views/system/notice/noticeDetail.vue
index 94468d4..da36bd8 100644
--- a/src/views/system/notice/noticeDetail.vue
+++ b/src/views/system/notice/noticeDetail.vue
@@ -1,5 +1,6 @@
 <!-- 通知公告详情弹窗 -->
 <script lang="ts" setup name="noticeDetail">
+import { Editor } from '@wangeditor/editor-for-vue'
 import type { noticeType } from './notice-interface'
 import { getNoticeDetail } from '@/api/system/notice'
 import { getPhotoUrl } from '@/api/system/tool'
@@ -52,6 +53,18 @@
     })
   }
 })
+// 编辑器配置
+const editorConfig = ref({
+  readOnly: true,
+})
+// 富文本实例对象
+const editorRef = shallowRef()
+const onCreated = (editor: any) => {
+  editorRef.value = editor
+  nextTick(() => {
+    editorRef.value = editor // 一定要用 Object.seal() ，否则会报错
+  })
+}
 </script>
 
 <template>
@@ -89,7 +102,18 @@
       </el-form-item>
       <el-form-item label="发布内容" prop="noticeContent">
         <!-- <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" disabled /> -->
-        <div style="border: 1px solid #dcdfe6;width: 100%;border-radius: 4px;padding: 12px;" v-html="ruleForm.noticeContent" />
+        <!-- <div style="border: 1px solid #dcdfe6;width: 100%;border-radius: 4px;padding: 12px;" v-html="ruleForm.noticeContent" ></div> -->
+        <div style="border: 1px solid #dcdfe6;width: 100%;border-radius: 4px;">
+          <editor
+            ref="editorRef"
+            v-model="ruleForm.noticeContent"
+            style="height: 300px; overflow-y: hidden;"
+            :default-config="editorConfig"
+            mode="default"
+            :disabled="true"
+            @onCreated="onCreated"
+          />
+        </div>
       </el-form-item>
       <el-form-item label="查看附件">
         <el-link v-if="ruleForm.minioFileName" :href="minioFileUrl" type="primary" target="_blank">
diff --git a/src/views/system/tool/autograph/addDDialog.vue b/src/views/system/tool/autograph/addDDialog.vue
index e39b706..daadd9b 100644
--- a/src/views/system/tool/autograph/addDDialog.vue
+++ b/src/views/system/tool/autograph/addDDialog.vue
@@ -186,7 +186,7 @@
         <el-input v-model.trim="ruleForm.signDesc" placeholder="签名描述" :disabled="title === '详情'" />
       </el-form-item>
       <el-form-item label="可使用人" prop="userIdList">
-        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'">
+        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'" style="width: 100%;">
           <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </el-form-item>
@@ -198,7 +198,7 @@
         <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px', 'margin-top': ruleForm.minioFileName === '' ? '0px' : '56px' }" @click="upload">
           {{ ruleForm.minioFileName === '' ? '上传' : '更换图片' }}
         </el-button>
-        <input v-show="title === '123'" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <input v-show="title === '123'" ref="fileRef" type="file" accept="image/*" @change="onFileChange">
       </el-form-item>
     </el-form>
     <template #footer>

diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index bb58885..2959118 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -53,3 +53,64 @@
   }
   return true
 }
+
+/**
+ * 验证小写字母
+ * @param str
+ * @returns
+ */
+export function validateLowerCase(str: string) {
+  const reg = /^[a-z]+$/
+  return reg.test(str)
+}
+
+/* 验证大写字母 */
+export function validateUpperCase(str: string) {
+  const reg = /^[A-Z]+$/
+  return reg.test(str)
+}
+
+/* 验证大小写字母 */
+export function validateAlphabets(str: string) {
+  const reg = /^[A-Za-z]+$/
+  return reg.test(str)
+}
+
+/**
+ * 验证邮箱
+ * @param email
+ * @returns {boolean}
+ */
+export function validateEmail(email: string) {
+  const re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
+  return re.test(email)
+}
+
+/**
+ * 验证手机号
+ * @param phone
+ * @returns {boolean}
+ */
+export function validateMobile(phone: string) {
+  const re = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/
+  return re.test(phone)
+}
+
+/**
+ * 校验身份证号
+ * @param value
+ * @returns
+ */
+export function validateIdCardNo(value: string) {
+  const re = /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/
+  return re.test(value)
+}
+/**
+ *
+ * @param value 验证电话号码
+ * @returns
+ */
+export function validatePhone(value: string) {
+  const re = /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/
+  return re.test(value)
+}
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 1c2405e..bca0958 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,13 +1,46 @@
-<script lang="ts" setup name="borrowHandle">
-// 逻辑代码
+<!-- 设备借用处理 -->
+<script lang="ts" setup name="borrowApply">
+import list from './components/handleList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '待借用', comp: list },
+  { name: '已借用', comp: list },
+  { name: '已归还', comp: list },
+])
+const current = ref('待借用')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用处理
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 03d414b..c5771f7 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,13 +1,50 @@
+<!-- 设备借用申请 -->
 <script lang="ts" setup name="borrowApply">
-// 逻辑代码
+import list from './components/applyList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '全部', comp: list },
+  { name: '草稿箱', comp: list },
+  { name: '待审批', comp: list },
+  { name: '审批中', comp: list },
+  { name: '已通过', comp: list },
+  { name: '未通过', comp: list },
+  { name: '已取消', comp: list },
+])
+const current = ref('全部')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用申请
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
new file mode 100644
index 0000000..052f3ce
--- /dev/null
+++ b/src/views/device/borrow/components/applyList.vue
@@ -0,0 +1,328 @@
+<script lang="ts" setup name="borrowApplyList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '文件号',
+    value: 'fileNo',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '类别',
+    value: 'catergory',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '李四',
+      time: '2020-12-14 00:00:00',
+      status: '未通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const approveRef = ref()
+// 同意
+const agree = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '1',
+  })
+}
+// 驳回
+const reject = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '3',
+  })
+}
+// 拒绝
+const refuse = (row: any) => {
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
+}
+// 取消
+const cancel = (rowrow: any) => {
+  ElMessageBox.confirm(
+    '确认取消吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" @click="addBtn" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="agree(row)">
+                  同意
+                </el-button>
+                <el-button size="small" type="primary" link @click="reject(row)">
+                  驳回
+                </el-button>
+                <el-button size="small" type="primary" link @click="refuse(row)">
+                  拒绝
+                </el-button>
+                <el-button size="small" type="primary" link @click="cancel(row)">
+                  取消
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/components/approvalActionDialog.vue b/src/views/device/borrow/components/approvalActionDialog.vue
new file mode 100644
index 0000000..214876c
--- /dev/null
+++ b/src/views/device/borrow/components/approvalActionDialog.vue
@@ -0,0 +1,104 @@
+<!-- 审批操作弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
+const dialogVisibleApprove = ref(false)
+const form = reactive({
+  radio: '1',
+})
+const ruleFormRef = ref<FormInstance>()
+const rules = reactive<FormRules>({
+})
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const approvetime = ref('') // 审批时间
+const initDialog = (row: any) => {
+  dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
+}
+defineExpose({ initDialog })
+
+// 点击保存
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      dialogVisibleApprove.value = false
+      emits('resetData')
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  formEl.resetFields()
+  dialogVisibleApprove.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
+    <el-form
+      ref="ruleFormRef" :model="form"
+      :rules="rules" label-width="110px"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人">
+            <el-input disabled :value="userInfo.$state.name" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间">
+            <el-input disabled :value="approvetime" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
+        <el-button @click="resetForm(ruleFormRef)">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
new file mode 100644
index 0000000..cfda00a
--- /dev/null
+++ b/src/views/device/borrow/components/handleList.vue
@@ -0,0 +1,281 @@
+<script lang="ts" setup name="borrowHandleList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '申请编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'dept',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      dept: '顶级',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      dept: '徐州分中心',
+      user: '里斯',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+const borrow = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="borrow(row)">
+                  借用
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/addRow.vue b/src/views/device/standingBook/components/addRow.vue
index 1678cdb..07b03d1 100644
--- a/src/views/device/standingBook/components/addRow.vue
+++ b/src/views/device/standingBook/components/addRow.vue
@@ -5,7 +5,7 @@
 import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
+const formLabelWidth = '110px'
 const form = ref({})
 const formTable = ref([
   {
@@ -91,108 +91,188 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`">
+  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
     >
       <div v-if="name === '周检记录'">
-        <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录表编号" />
-        </el-form-item>
-        <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录人" />
-        </el-form-item>
-        <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="检定日期"
-          />
-        </el-form-item>
-        <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="有效日期"
-          />
-        </el-form-item>
-        <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="送检人" />
-        </el-form-item>
-        <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录表编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="检定日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="有效日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="送检人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '状态变更记录'">
-        <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="状态类型" clearable>
-            <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="结束日期"
-          />
-        </el-form-item>
-        <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="申请人" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="状态类型" clearable style="width: 100%;">
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="申请人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '使用记录'">
-        <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用人" />
-        </el-form-item>
-        <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用部门" />
-        </el-form-item>
-        <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="使用类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用结束日期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用部门" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="使用类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '检定证书'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="证书类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书出具日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书有效期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
     </el-form>
     <template #footer>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 5f7b347..9a9f798 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -352,7 +352,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -376,7 +376,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -391,7 +391,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -404,14 +404,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -434,7 +434,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -443,20 +443,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -480,23 +480,23 @@
               <com-tree-select
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -507,10 +507,10 @@
             <el-form-item label="检定部门" prop="mesureDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -520,7 +520,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -529,13 +529,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -544,21 +544,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -578,14 +578,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -594,14 +594,14 @@
         <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-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -669,7 +669,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index fc3fd54..d9d4514 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -199,6 +199,8 @@
     useDeptList.value = toTreeList(res.data, '0', true)
   })
 }
+const selectTreeRef1 = ref()
+const selectTreeRef2 = ref()
 // 重置
 const resetDATA = () => {
   ruleForm.value = {
@@ -254,6 +256,10 @@
     isStandardSupportEquipment: '', //		是否标准配套设备
     id: '',
   }
+  if (title.value !== '详情') {
+    selectTreeRef1.value.clearSelected()
+    selectTreeRef2.value.clearSelected()
+  }
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
@@ -378,7 +384,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -402,7 +408,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -416,8 +422,7 @@
             <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"
+                :placeholder="title === '详情' ? '' : '出厂年月'" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -430,14 +435,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -460,7 +465,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -469,20 +474,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -505,24 +510,26 @@
             <el-form-item label="使用部门" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
+                ref="selectTreeRef2"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -536,10 +543,12 @@
               </el-select> -->
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                ref="selectTreeRef1"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -549,7 +558,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -558,13 +567,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -573,21 +582,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -607,14 +616,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -624,14 +633,14 @@
           <el-col :span="6">
             <el-form-item label="资本来源" prop="capitalSource">
               <!-- <el-input v-model.trim="ruleForm.capitalSource" placeholder="资本来源" :disabled="title === '详情'" /> -->
-              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -699,7 +708,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f653095..f4229a6 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -147,19 +147,17 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
-  setTimeout(() => {
-    list.value = [
-      {
-        equipmentNo: 123,
-        equipmentName: 'test',
-        modelNo: '001',
-        usePersonName: '张三',
-        validDate: '2022-12-12 00:00:00',
-        useDeptName: '顶级',
-      },
-    ]
-    total.value = 1
-  }, 1000)
+  list.value = [
+    {
+      equipmentNo: 123,
+      equipmentName: 'test',
+      modelNo: '001',
+      usePersonName: '张三',
+      validDate: '2022-12-12 00:00:00',
+      useDeptName: '顶级',
+    },
+  ] as any
+  total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -220,9 +218,11 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -300,13 +300,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.mesureType" class="m-2 normal-select" placeholder="检定方式" clearable>
+          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable>
             <el-option
               v-for="item in mesureTypeList"
               :key="item.id"
@@ -316,7 +316,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.managerState" class="m-2 normal-select" placeholder="管理状态" clearable>
+          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable>
             <el-option
               v-for="item in managerStateList"
               :key="item.id"
@@ -327,8 +327,9 @@
         </search-item>
         <search-item>
           <com-tree-select
+            ref="selectTreeRef"
             v-model="searchQuery.useDept" :options="useDeptList" placeholder="使用部门"
-            :tree-props="deptProps" style="width: 150px;"
+            :tree-props="deptProps"
           />
         </search-item>
         <search-item>
@@ -336,11 +337,10 @@
             v-model="searchQuery.validDate" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="有效日期"
             class="normal-date"
-            style="width: 150px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.abc" class="m-2 normal-select" placeholder="ABC" clearable>
+          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable>
             <el-option
               v-for="item in abcList"
               :key="item.id"
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 78a3800..4c31a94 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -2,9 +2,10 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/fixedAssetsAdd.vue'
-import type { fixedAssetsType } from './standingBook-interface'
+import type { fixedAssetsType, selectType } from './standingBook-interface'
 import { exportFile } from '@/utils/exportUtils'
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
+import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   assetNo: '', // 固定编号
@@ -50,7 +51,7 @@
   },
   {
     text: '设备类型',
-    value: 'assetTypeName',
+    value: 'equipmentTypeName',
     width: '150',
     align: 'center',
   },
@@ -102,6 +103,7 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+const equipmentCategoryList = ref<selectType[]>([]) // 设备类别
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
@@ -242,6 +244,10 @@
 }
 onMounted(() => {
   getList()
+  // 获取设备类别
+  getDictByCode('equipmentCategory').then((response) => {
+    equipmentCategoryList.value = response.data
+  })
 })
 </script>
 
@@ -265,7 +271,10 @@
           <el-input v-model="searchQuery.equipmentSpecifications" placeholder="设备规格" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-select v-model="searchQuery.equipmentCategory" placeholder="设备类别" clearable>
+            <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+          </el-select>
         </search-item>
       </search-area>
       <table-container>
diff --git a/src/views/device/stateManage/components/addRow.vue b/src/views/device/stateManage/components/addRow.vue
new file mode 100644
index 0000000..3ba82d6
--- /dev/null
+++ b/src/views/device/stateManage/components/addRow.vue
@@ -0,0 +1,160 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { listPageApi } from '@/api/device/standingBook'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  limit: 10,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '出厂编号',
+    value: 'manufacturingNo',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+  },
+])
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listPageApi(listQuery.value as any).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map(item => ({ ...item, checked: '' }))
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    equipmentName: '', // 姓名
+    equipmentNo: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const checkedArr = list.value.filter(item => item.checked !== '')
+  if (checkedArr.length) {
+    console.log(checkedArr, '选中的设备')
+    emits('add', checkedArr)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择设备')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns as any" :query="listQuery"
+        :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-checkbox v-model="scope.row.checked" :label="scope.$index" size="large" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-checkbox__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index 56417d6..214876c 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -47,38 +47,45 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="30%">
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
-      :rules="rules"
+      :rules="rules" label-width="110px"
     >
-      <el-form-item label="审批意见">
-        <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
-        <el-radio-group v-model="form.radio">
-          <el-radio label="1">
-            同意
-          </el-radio>
-          <el-radio label="2">
-            拒绝
-          </el-radio>
-          <el-radio label="3">
-            驳回
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="审批结论">
-        <el-input
-          :rows="4"
-          type="textarea"
-        />
-      </el-form-item>
       <el-row :gutter="24">
-        <el-col :span="10">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="审批人">
             <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
-        <el-col :span="14">
+        <el-col :span="12">
           <el-form-item label="审批时间">
             <el-input disabled :value="approvetime" />
           </el-form-item>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index e74d70e..2003e31 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -1,7 +1,8 @@
 <!-- 新增或详情弹窗 -->
-<script lang="ts" setup name="addNotice">
+<script lang="ts" setup name="add">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
+import addRow from './addRow.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
@@ -16,6 +17,7 @@
 const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const name = ref('')
+const borrowList = ref([])
 const ruleForm = ref({
   assetNo: '', // 资产编号
   assetType: '', // 资产类型
@@ -357,10 +359,86 @@
     isShowCalibration.value = true
   }
 })
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerLevelName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+  },
+])
+const addRowRef = ref()
+// 添加行
+const addRowBtn = () => {
+  addRowRef.value.initDialog({ title: '添加' })
+}
+// 删除行
+const removeRowBtn = () => {
+  const removeArr = borrowList.value.filter(item => item.remove !== '')
+  if (removeArr.length) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      borrowList.value = borrowList.value.filter(item => item.remove === '')
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 借用设备列表添加
+const addRowMethods = (row) => {
+  row.forEach((element) => {
+    borrowList.value.push({ ...element, remove: '' })
+  })
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
     <detail-page :title="`${name}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
@@ -378,15 +456,16 @@
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder="">
+              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -430,7 +509,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -454,28 +533,56 @@
         </el-row>
       </el-form>
     </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>
+    <div>
+      <detail-block title="借用设备列表">
+        <template #btns>
+          <el-button type="primary" @click="addRowBtn">
+            添加行
+          </el-button>
+          <el-button type="info" @click="removeRowBtn">
+            删除行
+          </el-button>
+        </template>
+        <normal-table
+          :data="borrowList" :total="1" :columns="columns as any"
+        >
+          <template #preColumns>
+            <el-table-column label="选择" width="55" align="center">
+              <template #default="scope">
+                <el-checkbox v-model="scope.row.remove" :label="scope.$index" size="large" />
+              </template>
+            </el-table-column>
+            <el-table-column label="序号" width="60" align="center">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </detail-block>
+      <detail-block 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>
+    </div>
   </app-container>
 </template>
 
@@ -484,6 +591,10 @@
   background-color: #fff;
 }
 
+:deep(.el-checkbox__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,
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index aaaaf61..d588b8d 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,6 +1,7 @@
 <script lang="ts" setup name="bench">
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
+import type { trainLogStatistic } from './bench-interface'
 import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
 import { getPlanList } from '@/api/system/plan'
 import { listPageApi } from '@/api/measure/file'
@@ -132,15 +133,19 @@
     account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
+    const result: trainLogStatistic = res.data
+    const notQualified: number = Number(result.trainCount) - result.qualifiedCount
+    const qualifiedRate = ((result.qualifiedCount / result.trainCount) * 100).toFixed(2) // 合格率
+    const notQualifiedRate = ((notQualified / result.trainCount) * 100).toFixed(2) // 不合格率
     TrainLogSList.value = [
-      { name: `合格     ${res.data.qualified}-${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
-      { name: `不合格   ${res.data.notQualified}- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+      { name: `合   格   ${result.qualifiedCount}-${qualifiedRate}%`, value: result.qualifiedCount },
+      { name: `不合格   ${notQualified}- ${notQualifiedRate}%`, value: notQualified },
     ]
     TrainLogTitle.value = res.data.trainCount
   }).catch((_) => {
     // 处理异常
     TrainLogSList.value = [
-      { name: '合格     0 - 50%', value: 0 },
+      { name: '合   格   0 - 50%', value: 0 },
       { name: '不合格   0 - 50%', value: 0 },
     ]
     TrainLogTitle.value = 0
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 9ef0b93..1ad577b 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -270,7 +270,7 @@
               <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="6">
             <el-form-item label="名称" prop="fileName">
               <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
             </el-form-item>
@@ -279,13 +279,14 @@
         <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" class="fill-input" disabled>
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled style="width: 100%;">
                 <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="请选择发布单位"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -295,6 +296,7 @@
                 v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -311,12 +313,13 @@
                 v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人" prop="createUserId">
-              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index b45fbc3..542b284 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -26,7 +26,7 @@
   createUser: '', // 创建人
   createTime: '', // 创建
   approvalStatus: props.value, // 审批状态
-  limit: 10,
+  limit: 20,
   offset: 1,
   fileType: '', // 类型
   formId: '',
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 7d4724b..e54ddf5 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -26,7 +26,7 @@
   fileCode: '', // 文件号
   effectiveTime: '', // 实施时间
   effectiveStatus: '', // 实施状态
-  limit: 10,
+  limit: 20,
   offset: 1,
   fileType: '', // 类型
 }) // 查询参数
@@ -75,13 +75,19 @@
 const getStatus = () => {
   getDictByCode('effectiveStatus').then((res) => {
     if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
+      effectiveStatusSelect.value = [...res.data, { name: '全部', value: '', id: 'quanbu' }]
     }
   })
 }
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.publishTime) {
+    searchQuery.publishTime = ''
+  }
+  if (!searchQuery.effectiveTime) {
+    searchQuery.effectiveTime = ''
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -252,13 +258,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" />
         </search-item>
         <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
@@ -274,20 +280,16 @@
           <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: 185px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
             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: 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" placeholder="实施状态" clearable>
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index 5ca3275..a95c665 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -505,21 +505,21 @@
         <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] === '详情'" @change="directorChange">
+              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;" @change="directorChange">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.name" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
-              <el-select v-model="ruleForm.technologyJob" :placeholder="title.split('-')[2] === '详情' ? '' : '技术职务'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.technologyJob" :placeholder="title.split('-')[2] === '详情' ? '' : '技术职务'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;">
                 <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="administrationJob">
-              <el-select v-model="ruleForm.administrationJob" :placeholder="title.split('-')[2] === '详情' ? '' : '行政职务'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.administrationJob" :placeholder="title.split('-')[2] === '详情' ? '' : '行政职务'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index aac1ef2..11d6d0a 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -22,7 +22,7 @@
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
-  limit: 10,
+  limit: 20,
   offset: 1,
   organizeType: '', // 类型
   createTime: '', // 创建时间
@@ -118,6 +118,9 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.createTime) {
+    searchQuery.createTime = ''
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows.map(item => ({ ...item, createTime: item.createTime.split(' ')[0] }))
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 3f472eb..bc5d9d4 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -7,7 +7,9 @@
 // import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
-import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+// import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const props = defineProps({
   isRemind: {
     type: Boolean,
@@ -78,11 +80,14 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 // 获取所有部门
-const deptList = ref<DeptTreeNode[]>([])
+const deptList = ref([])
 const getDeptList = async () => {
   getDeptTreeList().then((res) => {
-    deptList.value = res.data
+    deptList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
@@ -177,6 +182,7 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   searchQuery.staffNo = ''
@@ -184,6 +190,7 @@
   searchQuery.deptId = ''
   searchQuery.certificateStatus = ''
   searchQuery.verifierCertificateNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -212,10 +219,6 @@
     loading.close()
   })
 }
-// 打印
-const print = () => {
-
-}
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传图片
@@ -268,20 +271,24 @@
           <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+          <!-- <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
             <el-option
               v-for="item in deptList"
               :key="item.id"
               :label="item.name"
               :value="item.id"
             />
-          </el-select>
+          </el-select> -->
+          <com-tree-select
+            ref="selectTreeRef" v-model="searchQuery.deptId" :options="deptList"
+            placeholder="工作部门" :tree-props="deptProps"
+          />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况">
+          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况" clearable>
             <el-option
               v-for="item in certificateStatusList"
               :key="item.id"
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 4352604..5a5f036 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -389,10 +389,10 @@
           关闭
         </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">
-            <el-form-item prop="minioFileName" label-width="70px">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item prop="minioFileName">
               <el-upload
                 class="avatar-uploader"
                 :show-file-list="false"
@@ -423,23 +423,24 @@
               <el-date-picker
                 v-model="ruleForm.birthday" type="date" format="YYYY-MM" value-format="YYYY-MM"
                 placeholder="出生年月" :disabled="title === '详情'"
+                style="width: 100%;"
               />
             </el-form-item>
             <el-form-item label="工作部门" prop="deptId" class="marg-item">
-              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled>
+              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled style="width: 100%;">
                 <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="ruleForm.deptId" :options="PubListTree"
-                placeholder="选择组织机构" :tree-props="deptProps"
+                placeholder="选择组织机构" :tree-props="deptProps" style="width: 100%;"
               />
             </el-form-item>
             <el-form-item label="计量专业" prop="major" class="marg-item">
               <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
             </el-form-item>
             <el-form-item label="是否特操人" prop="specialOperator" class="marg-item">
-              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -449,23 +450,23 @@
               <el-input v-model.trim="ruleForm.staffNo" placeholder="系统自动生成" disabled />
             </el-form-item>
             <el-form-item label="性别" prop="sex" class="marg-item">
-              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="技术职务" prop="technologyJob" class="marg-item">
-              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="从事日期" prop="workDate" class="marg-item">
               <el-date-picker
                 v-model="ruleForm.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-                placeholder="请选择从事日期"
+                placeholder="请选择从事日期" style="width: 100%;"
               />
             </el-form-item>
-            <el-form-item label="是否技术考核" prop="technologyExam" class="marg-item">
-              <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'">
+            <el-form-item label="是否技术考核" prop="technologyExam" class="marg-item" style="width: 100%;">
+              <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -475,17 +476,17 @@
               <el-input ref="cardRef" v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" @blur="getBirthday" />
             </el-form-item>
             <el-form-item label="文化程度" prop="education" class="marg-item">
-              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="行政职务" prop="administrationJob" class="marg-item">
-              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="是否主考人" prop="mainExaminer" class="marg-item">
-              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index 042636e..660f2b0 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -264,7 +264,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="性别" prop="meterStaff.sex">
-              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -273,21 +273,21 @@
         <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-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -296,7 +296,7 @@
         <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-select v-if="title === '详情'" v-model="meterStaff.deptId" disabled style="width: 100%;">
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
               <com-tree-select
@@ -304,6 +304,7 @@
                 ref="selectTreeRef" v-model="meterStaff.deptId" :options="PubListTree"
                 placeholder="选择组织机构"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -316,7 +317,7 @@
             <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="请选择从事日期"
+                placeholder="请选择从事日期" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -347,7 +348,7 @@
             <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="请选择发证日期"
+                placeholder="请选择发证日期" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -355,7 +356,7 @@
             <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="请选择有效日期"
+                placeholder="请选择有效日期" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 178fc12..d0116f3 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -3,7 +3,7 @@
 import type { FormInstance, FormRules } from 'element-plus'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
+const formLabelWidth = '110px'
 const form = reactive({
   certificateNo: '', // 证书号
   certificateName: '', // 证书名称
@@ -71,32 +71,52 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`" width="40%">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
     >
-      <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
-        <el-input v-model="form.certificateNo" placeholder="证书号" />
-      </el-form-item>
-      <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
-        <el-input v-model="form.certificateName" placeholder="证书名称" />
-      </el-form-item>
-      <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
-        <el-input v-model="form.certificateCompany" placeholder="发证单位" />
-      </el-form-item>
-      <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
-        <el-date-picker
-          v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择发证日期"
-        />
-      </el-form-item>
-      <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-        <el-date-picker
-          v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择有效日期"
-        />
-      </el-form-item>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
+            <el-input v-model="form.certificateNo" placeholder="证书号" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
+            <el-input v-model="form.certificateName" placeholder="证书名称" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
+            <el-input v-model="form.certificateCompany" placeholder="发证单位" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
+            <el-date-picker
+              v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择发证日期" style="width: 100%;"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+            <el-date-picker
+              v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择有效日期" style="width: 100%;"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <template #footer>
       <span class="dialog-footer">
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
index 5e20d1b..10b0deb 100644
--- a/src/views/measure/person/components/personListDialog.vue
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -1,8 +1,11 @@
 <!-- 计量人员列表弹窗 -->
 <script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
 import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import { getDeptTreeList } from '@/api/system/dept'
-import type { TreeStructure } from '@/views/system/user/user-interface'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -10,7 +13,7 @@
   staffNo: '', // 人员编号
   name: '', // 姓名
   deptId: '', // 所在部门
-  limit: 5,
+  limit: 10,
   offset: 1,
 })
 const loadingTable = ref<boolean>(false)
@@ -32,20 +35,22 @@
   },
 ])
 // 获取部门
-const deptIdList = ref<TreeStructure[]>([])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const deptIdList = ref([])
 const getDeptList = () => {
   getDeptTreeList().then((res) => {
-    deptIdList.value = res.data
+    deptIdList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
 const fetchData = () => {
-  select.value = ''
+  select.value = -1
   getStaffList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.records
       total.value = Number(res.data.total)
-      console.log(list.value, 'list')
     }
   })
 }
@@ -53,6 +58,7 @@
 const search = () => {
   fetchData()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   listQuery.value = {
@@ -62,6 +68,7 @@
     limit: 10,
     offset: 1,
   }
+  selectTreeRef.value.clearSelected()
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -76,18 +83,24 @@
 }
 // 点击保存
 const submitForm = () => {
-  const person = list.value.filter((item, index) => index == select.value)[0]
-  console.log(person, 'person')
-  getStaffDetail(person).then((res) => {
-    if (res.code === 200) {
-      emits('add', res.data)
-      dialogFormVisible.value = false
-    }
-  })
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    getStaffDetail(person).then((res) => {
+      if (res.code === 200) {
+        emits('add', res.data)
+        dialogFormVisible.value = false
+        reset()
+      }
+    })
+  }
+  else {
+    ElMessage.warning('请先选择人员')
+  }
 }
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
+  reset()
 }
 // 初始化
 const initDialog = () => {
@@ -99,39 +112,45 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员" width="50%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable style="width: 150px;" />
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable style="width: 150px;" />
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
+        <!-- <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
           <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
+        </el-select> -->
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
-    <normal-table
-      :data="list" :total="total" :columns="columns" :query="listQuery"
-      :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>
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :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">
             {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
           </template>
         </el-table-column> -->
-      </template>
-    </normal-table>
+        </template>
+      </normal-table>
+    </div>
     <template #footer>
       <span class="dialog-footer">
         <el-button type="primary" @click="submitForm">确认</el-button>
diff --git a/src/views/measure/person/components/userListDialog.vue b/src/views/measure/person/components/userListDialog.vue
index dcd05b5..cd62a73 100644
--- a/src/views/measure/person/components/userListDialog.vue
+++ b/src/views/measure/person/components/userListDialog.vue
@@ -3,14 +3,16 @@
 import { ElMessage } from 'element-plus'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
-import type { TreeStructure } from '@/views/system/user/user-interface'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
 const listQuery = ref({
   keywords: '', // 姓名
   deptId: '', // 所在部门
-  limit: 5,
+  limit: 10,
   offset: 1,
 })
 const loadingTable = ref<boolean>(false)
@@ -31,11 +33,14 @@
     value: 'deptName',
   },
 ])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 // 获取部门
-const deptIdList = ref<TreeStructure[]>([])
+const deptIdList = ref([])
 const getDeptList = () => {
   getDeptTreeList().then((res) => {
-    deptIdList.value = res.data
+    deptIdList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
@@ -52,6 +57,7 @@
 const search = () => {
   fetchData()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   listQuery.value = {
@@ -60,6 +66,7 @@
     limit: 10,
     offset: 1,
   }
+  selectTreeRef.value.clearSelected()
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -74,11 +81,11 @@
 }
 // 点击保存
 const submitForm = () => {
-  console.log(select.value)
   if (select.value >= 0) {
     const person = list.value.filter((item, index) => index == select.value)[0]
     emits('add', person)
     dialogFormVisible.value = false
+    reset()
   }
   else {
     ElMessage.warning('请先选择人员')
@@ -87,9 +94,11 @@
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
+  reset()
 }
 // 初始化
 const initDialog = () => {
+  // reset()
   dialogFormVisible.value = true
   getDeptList()
   fetchData()
@@ -98,16 +107,20 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+  <el-dialog v-model="dialogFormVisible" title="选择人员" width="50%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
         <el-input v-model.trim="listQuery.keywords" placeholder="真实姓名" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable>
+        <!-- <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable>
           <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
+        </el-select> -->
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 9c6f65d..355473a 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -7,7 +7,9 @@
 // import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
-import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+// import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
@@ -16,7 +18,7 @@
   major: '', // 计量专业
   verifierCertificateNo: '', // 证书号
   certificateStatus: '', // 证书状态
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -52,10 +54,10 @@
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取所有部门
-const deptList = ref<DeptTreeNode[]>([])
+const deptList = ref([])
 const getDeptList = async () => {
   getDeptTreeList().then((res) => {
-    deptList.value = res.data
+    deptList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
@@ -126,6 +128,7 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   searchQuery.staffNo = ''
@@ -133,6 +136,7 @@
   searchQuery.deptId = ''
   searchQuery.major = ''
   searchQuery.verifierCertificateNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -160,10 +164,9 @@
     loading.close()
   })
 }
-// 打印
-const print = () => {
-
-}
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传图片
@@ -216,14 +219,18 @@
           <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+          <!-- <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
             <el-option
               v-for="item in deptList"
               :key="item.id"
               :label="item.name"
               :value="item.id"
             />
-          </el-select>
+          </el-select> -->
+          <com-tree-select
+            ref="selectTreeRef" v-model="searchQuery.deptId" :options="deptList"
+            placeholder="工作部门" :tree-props="deptProps"
+          />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.major" placeholder="计量专业" clearable class="w-50 m-2" />
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index af0a29d..2e0e7af 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -1,12 +1,15 @@
 <script lang="ts" setup name="ListSourceAdd">
-import { reactive, ref } from 'vue'
+/**
+ * 添加/编辑/详情溯源供方
+ */
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions, IformInline } from './list_interface'
+import type { IOptions, IformInline, traceSupplierPerson } from './list_interface'
 import { exportFile } from '@/utils/exportUtils'
 import { UploadFile } from '@/api/measure/file'
 import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+import { validatePhone } from '@/utils/validate'
 const props = defineProps({
   infoId: {
     type: String,
@@ -19,43 +22,45 @@
 })
 const emit = defineEmits(['close'])
 const formInline: Ref<IformInline> = ref({
-  businessContent: null,
-  supplierName: null,
-  supplierNo: null,
-  bankAccount: null,
-  bankAccountNumber: null,
-  bankName: null,
-  briefName: null,
-  businessScope: null,
-  companyAddress: null,
-  companyArea: null,
-  companyCity: null,
-  companyCountry: null,
-  companyProvince: null,
-  createTime: null,
-  director: null,
-  fax: null,
-  invoiceAddress: null,
-  invoiceArea: null,
-  invoiceCity: null,
-  invoiceCountry: null,
-  invoiceProvince: null,
-  mailbox: null,
-  minioFileName: null,
-  mobile: null,
-  phone: null,
-  postalCode: null,
-  remark: null,
-  taxNumber: null,
-  website: null,
+  id: '',
+  businessContent: '',
+  supplierName: '',
+  supplierNo: '',
+  bankAccount: '',
+  bankAccountNumber: '',
+  bankName: '',
+  briefName: '',
+  businessScope: '',
+  companyAddress: '',
+  companyArea: '',
+  companyCity: '',
+  companyCountry: '',
+  companyProvince: '',
+  createTime: '',
+  director: '',
+  fax: '',
+  invoiceAddress: '',
+  invoiceArea: '',
+  invoiceCity: '',
+  invoiceCountry: '',
+  invoiceProvince: '',
+  mailbox: '',
+  minioFileName: '',
+  mobile: '',
+  phone: '',
+  postalCode: '',
+  remark: '',
+  taxNumber: '',
+  website: '',
   traceSupplierPersonList: [],
 })
+const traceSupplierPersonList: Ref<traceSupplierPerson[]> = ref([])
 const columns = ref([
-  { text: '人员编号', value: 'personNo', show: true },
-  { text: '姓名', value: 'name', show: true },
-  { text: '工作部门', value: 'department', show: true },
-  { text: '职务', value: 'job', show: true },
-  { text: '联系方式', value: 'phone', show: true },
+  { text: '人员编号', value: 'personNo', required: false },
+  { text: '姓名', value: 'name', required: true },
+  { text: '工作部门', value: 'department', required: false },
+  { text: '职务', value: 'job', required: false },
+  { text: '联系方式', value: 'phone', required: true, reg: validatePhone },
 ])
 const ruleFormRef = ref<FormInstance>()
 const provinceList = ref<IOptions[]>([])
@@ -66,14 +71,17 @@
 const invoiceCityList = ref<IOptions[]>([])
 const areaInvoiceList = ref<IOptions[]>([])
 const dialogVisible = ref(false)
-const addPersonList = ref({
+// 人员对象
+const addPersonObj: traceSupplierPerson = {
+  id: '',
   personNo: '',
   name: '',
   department: '',
   job: '',
   phone: '',
-})
-const SelectionList = ref([])
+  editable: true,
+}
+const SelectionList: Ref<traceSupplierPerson[]> = ref([])
 const upload = ref<UploadInstance>()
 // 校验规则
 const rules = ref({
@@ -91,7 +99,7 @@
   })
 }
 // 表格选中
-const handleSelectionChange = (e: any) => {
+const handleSelectionChange = (e: traceSupplierPerson[]) => {
   SelectionList.value = e
 }
 // 获取公司地址省级
@@ -142,15 +150,33 @@
   })
 }
 // 点击增加行
-const addRoow = () => {
-  const object = {
-    personNo: '',
-    name: '',
-    department: '',
-    job: '',
-    phone: '',
+const addRow = () => {
+  // 检查上一行必填项
+  if (checkPersonList()) {
+    setAllRowReadable()
+    traceSupplierPersonList.value.push({ ...addPersonObj })
   }
-  formInline.value.traceSupplierPersonList.push(object)
+}
+// 检查人员列表
+function checkPersonList() {
+  for (let index = 0; index < traceSupplierPersonList.value.length; index++) {
+    const item = traceSupplierPersonList.value[index]
+    for (const prop of columns.value) {
+      // 检查必填
+      if (prop.required && !item[prop.value]) {
+        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
+        return false
+      }
+      // 验证正则
+      if (prop.reg && typeof prop.reg === 'function') {
+        if (!prop.reg(item[prop.value])) {
+          ElMessage.warning(`第${index + 1}行中${prop.text}输入不合法`)
+          return false
+        }
+      }
+    }
+  }
+  return true
 }
 // 点击关闭
 const handleClose = () => {
@@ -158,12 +184,12 @@
 }
 // 点击弹窗的完成追加到表格数组中
 const addPushList = () => {
-  formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonList.value)))
+  formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonObj.value)))
   handleClose()
 }
 // 删除行
 const deleteList = () => {
-  formInline.value.traceSupplierPersonList = formInline.value.traceSupplierPersonList.filter((item) => {
+  traceSupplierPersonList.value = traceSupplierPersonList.value.filter((item: traceSupplierPerson) => {
     return !SelectionList.value.includes(item)
   })
 }
@@ -261,10 +287,16 @@
     }
   })
 }
-// 双击表格显示输入框
-const dblclickName = (item: object) => {
-  console.log(item)
-  item.show = false
+// 双击行显示输入框
+const dblclickRow = (row: traceSupplierPerson) => {
+  setAllRowReadable()
+  row.editable = true
+}
+// 将所有人员信息列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of traceSupplierPersonList.value) {
+    item.editable = false
+  }
 }
 if (props.buttonType !== '新建') {
   getInfo()
@@ -273,7 +305,7 @@
 
 <template>
   <app-container>
-    <detail-page :title="`培训计划-${buttonType}`">
+    <detail-page :title="`溯源供方-${buttonType}`">
       <template #btns>
         <el-button
           type="primary"
@@ -617,39 +649,36 @@
       </el-form>
     </detail-page>
     <detail-block title="人员信息">
-      <template #btns>
-        <el-button
-          type="info"
-          :disabled="buttonType === '详情'"
-          @click="deleteList"
-        >
+      <template v-if="buttonType !== '详情'" #btns>
+        <el-button type="info" @click="deleteList">
           删除行
         </el-button>
-        <el-button
-          type="primary"
-          :disabled="buttonType === '详情'"
-          @click="addRoow"
-        >
+        <el-button type="primary" @click="addRow">
           增加行
         </el-button>
       </template>
       <el-table
-        :data="formInline.traceSupplierPersonList"
+        :data="traceSupplierPersonList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
+        @row-dblclick="dblclickRow"
       >
-        <el-table-column type="selection" width="55" />
+        <el-table-column type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column
           v-for="item in columns"
           :key="item.value"
           :prop="item.value"
           :label="item.text"
+          align="center"
         >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
           <template #default="scope">
-            <span v-show="item.show" style="color: gray;" @dblclick="dblclickName(item)">{{ scope.row[item.value] || `双击编辑${item.text}` }}</span>
-            <el-input v-show="!item.show" v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" @blur="item.show = true" />
+            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+            <el-input v-else v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index 530bcc4..c057976 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -24,6 +24,18 @@
   areaName: string
 }
 
+// 溯源供方人员
+export interface traceSupplierPerson {
+  id: number | string // id
+  job: string // 职务
+  department: string// 部门
+  name: string// 信命
+  personNo: string// 人员编号
+  phone: string// 联系方式
+  editable?: boolean // 是否可编辑
+  [key: string]: any
+}
+
 export interface IformInline {
   businessContent: string
   supplierName: string
@@ -55,5 +67,6 @@
   remark: string
   taxNumber: string
   website: string
-  traceSupplierPersonList: []
+  traceSupplierPersonList: traceSupplierPerson []
 }
+
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index e44001a..600eda1 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -32,11 +32,20 @@
   dialogVisible.value = true
   ruleForm.noticePublisher = userInfo.$state.name
   ruleForm.noticeCompany = userInfo.$state.deptName
-  ruleForm.noticeTime = dayjs().format('YYYY-MM-DD')
+  ruleForm.noticeTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
 }
 defineExpose({ initDialog })
+// 重置
+const resetDialog = () => {
+  ruleForm.noticeTime = ''
+  ruleForm.noticeSketch = ''
+  ruleForm.noticeContent = ''
+  ruleForm.minioFileName = ''
+  ruleForm.noticeTitle = ''
+}
 // 关闭弹窗
 const close = () => {
+  resetDialog()
   dialogVisible.value = false
   emits('resetData')
 }
@@ -63,6 +72,7 @@
 const resetForm = (formEl: FormInstance | undefined) => {
   // if (!formEl) { return }
   formEl?.resetFields()
+  resetDialog()
   dialogVisible.value = false
   emits('resetData')
 }
@@ -105,7 +115,7 @@
     uploadImage: {
       server: 'http://111.198.10.15:21409/minio/file/upload', // 配置图片上传地址
       maxFileSize: 2 * 1024 * 1024, // 10M  图片大小限制
-      fieldName: 'img', // 上传类型
+      fieldName: 'multipartFile', // 上传名字
       allowedFileTypes: [], // 选择文件时的类型限制，默认为 ['image/*'] 。如不想限制，则设置为 []
       // 自定义上传参数，传递图片时需要带一些参数过去写在这。参数会被添加到 formData 中，一起上传到服务端。
       // meta: {
@@ -154,9 +164,9 @@
     uploadVideo: {
       server: 'http://111.198.10.15:21409/minio/file/upload', // 配置视频上传地址
       maxFileSize: 5 * 1024 * 1024, // 5M  视频大小限制
-      fieldName: 'your-custom-name', // 上传类型
+      fieldName: 'multipartFile', // 上传名字
       // 最多可上传几个文件，默认为 5
-      maxNumberOfFiles: 3,
+      // maxNumberOfFiles: 1,
       allowedFileTypes: [], // 选择文件时的类型限制，默认为 ['video/*'] 。如不想限制，则设置为 []
       // 自定义上传参数，传递图片时需要带一些参数过去写在这。参数会被添加到 formData 中，一起上传到服务端。
       // meta: {
@@ -167,8 +177,8 @@
       //     Accept: 'text/x-json',
       //     otherKey: 'xxx'
       // },
-      metaWithUrl: false, // 将 meta 拼接到 url 参数中，默认 false
-      withCredentials: true, // 跨域是否传递 cookie ，默认为 false
+      // metaWithUrl: false, // 将 meta 拼接到 url 参数中，默认 false
+      // withCredentials: true, // 跨域是否传递 cookie ，默认为 false
       // 上传之前触发
       onBeforeUpload(file: any) {
         // file 选中的文件，格式如 { key: file }
@@ -222,9 +232,6 @@
     editorRef.value = editor // 一定要用 Object.seal() ，否则会报错
   })
 }
-const look = () => {
-  console.log(ruleForm.noticeContent)
-}
 const minioFileUrl = ref('')
 watch(() => ruleForm.minioFileName, (newVal) => {
   if (newVal) {
@@ -278,7 +285,7 @@
           />
           <editor
             v-model="ruleForm.noticeContent"
-            style="height: 150px; overflow-y: hidden;"
+            style="height: 300px; overflow-y: hidden;"
             :default-config="editorConfig"
             mode="default"
             @onCreated="onCreated"
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index 0926957..a4cdd5e 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -16,7 +16,7 @@
   noticePublisher: '', // 发布人
   noticeTime: '', // 发布时间
   noticeTitle: '', // 标题
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -27,6 +27,7 @@
     text: '编号',
     value: 'noticeNo',
     align: 'center',
+    width: '180',
   },
   {
     text: '标题',
@@ -37,6 +38,7 @@
     text: '发布人',
     value: 'noticePublisher',
     align: 'center',
+    width: '150',
   },
   {
     text: '内容描述',
@@ -47,11 +49,15 @@
     text: '发布时间',
     value: 'noticeTime',
     align: 'center',
+    width: '200',
   },
 ] // 表格
 const list = ref([]) // 表格数据
 // 获取通知公告列表
 const getNoticeList = () => {
+  if (!searchQuery.noticeTime) {
+    searchQuery.noticeTime = ''
+  }
   getNoticeeApi(searchQuery).then((res) => {
     total.value = res.data.total
     list.value = res.data.rows
diff --git a/src/views/system/notice/noticeDetail.vue b/src/views/system/notice/noticeDetail.vue
index 94468d4..da36bd8 100644
--- a/src/views/system/notice/noticeDetail.vue
+++ b/src/views/system/notice/noticeDetail.vue
@@ -1,5 +1,6 @@
 <!-- 通知公告详情弹窗 -->
 <script lang="ts" setup name="noticeDetail">
+import { Editor } from '@wangeditor/editor-for-vue'
 import type { noticeType } from './notice-interface'
 import { getNoticeDetail } from '@/api/system/notice'
 import { getPhotoUrl } from '@/api/system/tool'
@@ -52,6 +53,18 @@
     })
   }
 })
+// 编辑器配置
+const editorConfig = ref({
+  readOnly: true,
+})
+// 富文本实例对象
+const editorRef = shallowRef()
+const onCreated = (editor: any) => {
+  editorRef.value = editor
+  nextTick(() => {
+    editorRef.value = editor // 一定要用 Object.seal() ，否则会报错
+  })
+}
 </script>
 
 <template>
@@ -89,7 +102,18 @@
       </el-form-item>
       <el-form-item label="发布内容" prop="noticeContent">
         <!-- <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" disabled /> -->
-        <div style="border: 1px solid #dcdfe6;width: 100%;border-radius: 4px;padding: 12px;" v-html="ruleForm.noticeContent" />
+        <!-- <div style="border: 1px solid #dcdfe6;width: 100%;border-radius: 4px;padding: 12px;" v-html="ruleForm.noticeContent" ></div> -->
+        <div style="border: 1px solid #dcdfe6;width: 100%;border-radius: 4px;">
+          <editor
+            ref="editorRef"
+            v-model="ruleForm.noticeContent"
+            style="height: 300px; overflow-y: hidden;"
+            :default-config="editorConfig"
+            mode="default"
+            :disabled="true"
+            @onCreated="onCreated"
+          />
+        </div>
       </el-form-item>
       <el-form-item label="查看附件">
         <el-link v-if="ruleForm.minioFileName" :href="minioFileUrl" type="primary" target="_blank">
diff --git a/src/views/system/tool/autograph/addDDialog.vue b/src/views/system/tool/autograph/addDDialog.vue
index e39b706..daadd9b 100644
--- a/src/views/system/tool/autograph/addDDialog.vue
+++ b/src/views/system/tool/autograph/addDDialog.vue
@@ -186,7 +186,7 @@
         <el-input v-model.trim="ruleForm.signDesc" placeholder="签名描述" :disabled="title === '详情'" />
       </el-form-item>
       <el-form-item label="可使用人" prop="userIdList">
-        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'">
+        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'" style="width: 100%;">
           <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </el-form-item>
@@ -198,7 +198,7 @@
         <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px', 'margin-top': ruleForm.minioFileName === '' ? '0px' : '56px' }" @click="upload">
           {{ ruleForm.minioFileName === '' ? '上传' : '更换图片' }}
         </el-button>
-        <input v-show="title === '123'" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <input v-show="title === '123'" ref="fileRef" type="file" accept="image/*" @change="onFileChange">
       </el-form-item>
     </el-form>
     <template #footer>
diff --git a/src/views/system/tool/autograph/autograph.vue b/src/views/system/tool/autograph/autograph.vue
index ac9f000..d3c6f81 100644
--- a/src/views/system/tool/autograph/autograph.vue
+++ b/src/views/system/tool/autograph/autograph.vue
@@ -15,7 +15,7 @@
   signName: '', // 名称
   signDirector: '', // 负责人
   createTime: '', // 创建时间
-  limit: 10,
+  limit: 20,
   offset: 1,
   signType: '',
 }) // 查询参数
@@ -38,6 +38,9 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.createTime) {
+    searchQuery.createTime = ''
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -168,10 +171,10 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model="searchQuery.signNo" placeholder="签章编号" clearable class="w-50 m-2 normal-input" />
+        <el-input v-model="searchQuery.signNo" placeholder="签名编号" clearable class="w-50 m-2 normal-input" />
       </search-item>
       <search-item>
-        <el-input v-model="searchQuery.signName" placeholder="签章名称" clearable class="w-50 m-2 normal-input" />
+        <el-input v-model="searchQuery.signName" placeholder="签名名称" clearable class="w-50 m-2 normal-input" />
       </search-item>
       <search-item>
         <el-input v-model="searchQuery.signDirector" placeholder="负责人" clearable class="w-50 m-2 normal-input" />

diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index bb58885..2959118 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -53,3 +53,64 @@
   }
   return true
 }
+
+/**
+ * 验证小写字母
+ * @param str
+ * @returns
+ */
+export function validateLowerCase(str: string) {
+  const reg = /^[a-z]+$/
+  return reg.test(str)
+}
+
+/* 验证大写字母 */
+export function validateUpperCase(str: string) {
+  const reg = /^[A-Z]+$/
+  return reg.test(str)
+}
+
+/* 验证大小写字母 */
+export function validateAlphabets(str: string) {
+  const reg = /^[A-Za-z]+$/
+  return reg.test(str)
+}
+
+/**
+ * 验证邮箱
+ * @param email
+ * @returns {boolean}
+ */
+export function validateEmail(email: string) {
+  const re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
+  return re.test(email)
+}
+
+/**
+ * 验证手机号
+ * @param phone
+ * @returns {boolean}
+ */
+export function validateMobile(phone: string) {
+  const re = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/
+  return re.test(phone)
+}
+
+/**
+ * 校验身份证号
+ * @param value
+ * @returns
+ */
+export function validateIdCardNo(value: string) {
+  const re = /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/
+  return re.test(value)
+}
+/**
+ *
+ * @param value 验证电话号码
+ * @returns
+ */
+export function validatePhone(value: string) {
+  const re = /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/
+  return re.test(value)
+}
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 1c2405e..bca0958 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,13 +1,46 @@
-<script lang="ts" setup name="borrowHandle">
-// 逻辑代码
+<!-- 设备借用处理 -->
+<script lang="ts" setup name="borrowApply">
+import list from './components/handleList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '待借用', comp: list },
+  { name: '已借用', comp: list },
+  { name: '已归还', comp: list },
+])
+const current = ref('待借用')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用处理
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 03d414b..c5771f7 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,13 +1,50 @@
+<!-- 设备借用申请 -->
 <script lang="ts" setup name="borrowApply">
-// 逻辑代码
+import list from './components/applyList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '全部', comp: list },
+  { name: '草稿箱', comp: list },
+  { name: '待审批', comp: list },
+  { name: '审批中', comp: list },
+  { name: '已通过', comp: list },
+  { name: '未通过', comp: list },
+  { name: '已取消', comp: list },
+])
+const current = ref('全部')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用申请
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
new file mode 100644
index 0000000..052f3ce
--- /dev/null
+++ b/src/views/device/borrow/components/applyList.vue
@@ -0,0 +1,328 @@
+<script lang="ts" setup name="borrowApplyList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '文件号',
+    value: 'fileNo',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '类别',
+    value: 'catergory',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '李四',
+      time: '2020-12-14 00:00:00',
+      status: '未通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const approveRef = ref()
+// 同意
+const agree = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '1',
+  })
+}
+// 驳回
+const reject = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '3',
+  })
+}
+// 拒绝
+const refuse = (row: any) => {
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
+}
+// 取消
+const cancel = (rowrow: any) => {
+  ElMessageBox.confirm(
+    '确认取消吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" @click="addBtn" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="agree(row)">
+                  同意
+                </el-button>
+                <el-button size="small" type="primary" link @click="reject(row)">
+                  驳回
+                </el-button>
+                <el-button size="small" type="primary" link @click="refuse(row)">
+                  拒绝
+                </el-button>
+                <el-button size="small" type="primary" link @click="cancel(row)">
+                  取消
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/components/approvalActionDialog.vue b/src/views/device/borrow/components/approvalActionDialog.vue
new file mode 100644
index 0000000..214876c
--- /dev/null
+++ b/src/views/device/borrow/components/approvalActionDialog.vue
@@ -0,0 +1,104 @@
+<!-- 审批操作弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
+const dialogVisibleApprove = ref(false)
+const form = reactive({
+  radio: '1',
+})
+const ruleFormRef = ref<FormInstance>()
+const rules = reactive<FormRules>({
+})
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const approvetime = ref('') // 审批时间
+const initDialog = (row: any) => {
+  dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
+}
+defineExpose({ initDialog })
+
+// 点击保存
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      dialogVisibleApprove.value = false
+      emits('resetData')
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  formEl.resetFields()
+  dialogVisibleApprove.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
+    <el-form
+      ref="ruleFormRef" :model="form"
+      :rules="rules" label-width="110px"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人">
+            <el-input disabled :value="userInfo.$state.name" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间">
+            <el-input disabled :value="approvetime" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
+        <el-button @click="resetForm(ruleFormRef)">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
new file mode 100644
index 0000000..cfda00a
--- /dev/null
+++ b/src/views/device/borrow/components/handleList.vue
@@ -0,0 +1,281 @@
+<script lang="ts" setup name="borrowHandleList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '申请编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'dept',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      dept: '顶级',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      dept: '徐州分中心',
+      user: '里斯',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+const borrow = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="borrow(row)">
+                  借用
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/addRow.vue b/src/views/device/standingBook/components/addRow.vue
index 1678cdb..07b03d1 100644
--- a/src/views/device/standingBook/components/addRow.vue
+++ b/src/views/device/standingBook/components/addRow.vue
@@ -5,7 +5,7 @@
 import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
+const formLabelWidth = '110px'
 const form = ref({})
 const formTable = ref([
   {
@@ -91,108 +91,188 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`">
+  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
     >
       <div v-if="name === '周检记录'">
-        <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录表编号" />
-        </el-form-item>
-        <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录人" />
-        </el-form-item>
-        <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="检定日期"
-          />
-        </el-form-item>
-        <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="有效日期"
-          />
-        </el-form-item>
-        <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="送检人" />
-        </el-form-item>
-        <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录表编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="检定日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="有效日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="送检人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '状态变更记录'">
-        <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="状态类型" clearable>
-            <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="结束日期"
-          />
-        </el-form-item>
-        <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="申请人" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="状态类型" clearable style="width: 100%;">
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="申请人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '使用记录'">
-        <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用人" />
-        </el-form-item>
-        <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用部门" />
-        </el-form-item>
-        <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="使用类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用结束日期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用部门" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="使用类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '检定证书'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="证书类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书出具日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书有效期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
     </el-form>
     <template #footer>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 5f7b347..9a9f798 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -352,7 +352,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -376,7 +376,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -391,7 +391,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -404,14 +404,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -434,7 +434,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -443,20 +443,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -480,23 +480,23 @@
               <com-tree-select
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -507,10 +507,10 @@
             <el-form-item label="检定部门" prop="mesureDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -520,7 +520,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -529,13 +529,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -544,21 +544,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -578,14 +578,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -594,14 +594,14 @@
         <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-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -669,7 +669,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index fc3fd54..d9d4514 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -199,6 +199,8 @@
     useDeptList.value = toTreeList(res.data, '0', true)
   })
 }
+const selectTreeRef1 = ref()
+const selectTreeRef2 = ref()
 // 重置
 const resetDATA = () => {
   ruleForm.value = {
@@ -254,6 +256,10 @@
     isStandardSupportEquipment: '', //		是否标准配套设备
     id: '',
   }
+  if (title.value !== '详情') {
+    selectTreeRef1.value.clearSelected()
+    selectTreeRef2.value.clearSelected()
+  }
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
@@ -378,7 +384,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -402,7 +408,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -416,8 +422,7 @@
             <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"
+                :placeholder="title === '详情' ? '' : '出厂年月'" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -430,14 +435,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -460,7 +465,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -469,20 +474,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -505,24 +510,26 @@
             <el-form-item label="使用部门" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
+                ref="selectTreeRef2"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -536,10 +543,12 @@
               </el-select> -->
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                ref="selectTreeRef1"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -549,7 +558,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -558,13 +567,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -573,21 +582,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -607,14 +616,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -624,14 +633,14 @@
           <el-col :span="6">
             <el-form-item label="资本来源" prop="capitalSource">
               <!-- <el-input v-model.trim="ruleForm.capitalSource" placeholder="资本来源" :disabled="title === '详情'" /> -->
-              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -699,7 +708,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f653095..f4229a6 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -147,19 +147,17 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
-  setTimeout(() => {
-    list.value = [
-      {
-        equipmentNo: 123,
-        equipmentName: 'test',
-        modelNo: '001',
-        usePersonName: '张三',
-        validDate: '2022-12-12 00:00:00',
-        useDeptName: '顶级',
-      },
-    ]
-    total.value = 1
-  }, 1000)
+  list.value = [
+    {
+      equipmentNo: 123,
+      equipmentName: 'test',
+      modelNo: '001',
+      usePersonName: '张三',
+      validDate: '2022-12-12 00:00:00',
+      useDeptName: '顶级',
+    },
+  ] as any
+  total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -220,9 +218,11 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -300,13 +300,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.mesureType" class="m-2 normal-select" placeholder="检定方式" clearable>
+          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable>
             <el-option
               v-for="item in mesureTypeList"
               :key="item.id"
@@ -316,7 +316,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.managerState" class="m-2 normal-select" placeholder="管理状态" clearable>
+          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable>
             <el-option
               v-for="item in managerStateList"
               :key="item.id"
@@ -327,8 +327,9 @@
         </search-item>
         <search-item>
           <com-tree-select
+            ref="selectTreeRef"
             v-model="searchQuery.useDept" :options="useDeptList" placeholder="使用部门"
-            :tree-props="deptProps" style="width: 150px;"
+            :tree-props="deptProps"
           />
         </search-item>
         <search-item>
@@ -336,11 +337,10 @@
             v-model="searchQuery.validDate" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="有效日期"
             class="normal-date"
-            style="width: 150px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.abc" class="m-2 normal-select" placeholder="ABC" clearable>
+          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable>
             <el-option
               v-for="item in abcList"
               :key="item.id"
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 78a3800..4c31a94 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -2,9 +2,10 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/fixedAssetsAdd.vue'
-import type { fixedAssetsType } from './standingBook-interface'
+import type { fixedAssetsType, selectType } from './standingBook-interface'
 import { exportFile } from '@/utils/exportUtils'
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
+import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   assetNo: '', // 固定编号
@@ -50,7 +51,7 @@
   },
   {
     text: '设备类型',
-    value: 'assetTypeName',
+    value: 'equipmentTypeName',
     width: '150',
     align: 'center',
   },
@@ -102,6 +103,7 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+const equipmentCategoryList = ref<selectType[]>([]) // 设备类别
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
@@ -242,6 +244,10 @@
 }
 onMounted(() => {
   getList()
+  // 获取设备类别
+  getDictByCode('equipmentCategory').then((response) => {
+    equipmentCategoryList.value = response.data
+  })
 })
 </script>
 
@@ -265,7 +271,10 @@
           <el-input v-model="searchQuery.equipmentSpecifications" placeholder="设备规格" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-select v-model="searchQuery.equipmentCategory" placeholder="设备类别" clearable>
+            <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+          </el-select>
         </search-item>
       </search-area>
       <table-container>
diff --git a/src/views/device/stateManage/components/addRow.vue b/src/views/device/stateManage/components/addRow.vue
new file mode 100644
index 0000000..3ba82d6
--- /dev/null
+++ b/src/views/device/stateManage/components/addRow.vue
@@ -0,0 +1,160 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { listPageApi } from '@/api/device/standingBook'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  limit: 10,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '出厂编号',
+    value: 'manufacturingNo',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+  },
+])
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listPageApi(listQuery.value as any).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map(item => ({ ...item, checked: '' }))
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    equipmentName: '', // 姓名
+    equipmentNo: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const checkedArr = list.value.filter(item => item.checked !== '')
+  if (checkedArr.length) {
+    console.log(checkedArr, '选中的设备')
+    emits('add', checkedArr)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择设备')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns as any" :query="listQuery"
+        :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-checkbox v-model="scope.row.checked" :label="scope.$index" size="large" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-checkbox__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index 56417d6..214876c 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -47,38 +47,45 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="30%">
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
-      :rules="rules"
+      :rules="rules" label-width="110px"
     >
-      <el-form-item label="审批意见">
-        <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
-        <el-radio-group v-model="form.radio">
-          <el-radio label="1">
-            同意
-          </el-radio>
-          <el-radio label="2">
-            拒绝
-          </el-radio>
-          <el-radio label="3">
-            驳回
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="审批结论">
-        <el-input
-          :rows="4"
-          type="textarea"
-        />
-      </el-form-item>
       <el-row :gutter="24">
-        <el-col :span="10">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="审批人">
             <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
-        <el-col :span="14">
+        <el-col :span="12">
           <el-form-item label="审批时间">
             <el-input disabled :value="approvetime" />
           </el-form-item>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index e74d70e..2003e31 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -1,7 +1,8 @@
 <!-- 新增或详情弹窗 -->
-<script lang="ts" setup name="addNotice">
+<script lang="ts" setup name="add">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
+import addRow from './addRow.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
@@ -16,6 +17,7 @@
 const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const name = ref('')
+const borrowList = ref([])
 const ruleForm = ref({
   assetNo: '', // 资产编号
   assetType: '', // 资产类型
@@ -357,10 +359,86 @@
     isShowCalibration.value = true
   }
 })
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerLevelName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+  },
+])
+const addRowRef = ref()
+// 添加行
+const addRowBtn = () => {
+  addRowRef.value.initDialog({ title: '添加' })
+}
+// 删除行
+const removeRowBtn = () => {
+  const removeArr = borrowList.value.filter(item => item.remove !== '')
+  if (removeArr.length) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      borrowList.value = borrowList.value.filter(item => item.remove === '')
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 借用设备列表添加
+const addRowMethods = (row) => {
+  row.forEach((element) => {
+    borrowList.value.push({ ...element, remove: '' })
+  })
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
     <detail-page :title="`${name}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
@@ -378,15 +456,16 @@
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder="">
+              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -430,7 +509,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -454,28 +533,56 @@
         </el-row>
       </el-form>
     </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>
+    <div>
+      <detail-block title="借用设备列表">
+        <template #btns>
+          <el-button type="primary" @click="addRowBtn">
+            添加行
+          </el-button>
+          <el-button type="info" @click="removeRowBtn">
+            删除行
+          </el-button>
+        </template>
+        <normal-table
+          :data="borrowList" :total="1" :columns="columns as any"
+        >
+          <template #preColumns>
+            <el-table-column label="选择" width="55" align="center">
+              <template #default="scope">
+                <el-checkbox v-model="scope.row.remove" :label="scope.$index" size="large" />
+              </template>
+            </el-table-column>
+            <el-table-column label="序号" width="60" align="center">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </detail-block>
+      <detail-block 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>
+    </div>
   </app-container>
 </template>
 
@@ -484,6 +591,10 @@
   background-color: #fff;
 }
 
+:deep(.el-checkbox__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,
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index aaaaf61..d588b8d 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,6 +1,7 @@
 <script lang="ts" setup name="bench">
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
+import type { trainLogStatistic } from './bench-interface'
 import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
 import { getPlanList } from '@/api/system/plan'
 import { listPageApi } from '@/api/measure/file'
@@ -132,15 +133,19 @@
     account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
+    const result: trainLogStatistic = res.data
+    const notQualified: number = Number(result.trainCount) - result.qualifiedCount
+    const qualifiedRate = ((result.qualifiedCount / result.trainCount) * 100).toFixed(2) // 合格率
+    const notQualifiedRate = ((notQualified / result.trainCount) * 100).toFixed(2) // 不合格率
     TrainLogSList.value = [
-      { name: `合格     ${res.data.qualified}-${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
-      { name: `不合格   ${res.data.notQualified}- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+      { name: `合   格   ${result.qualifiedCount}-${qualifiedRate}%`, value: result.qualifiedCount },
+      { name: `不合格   ${notQualified}- ${notQualifiedRate}%`, value: notQualified },
     ]
     TrainLogTitle.value = res.data.trainCount
   }).catch((_) => {
     // 处理异常
     TrainLogSList.value = [
-      { name: '合格     0 - 50%', value: 0 },
+      { name: '合   格   0 - 50%', value: 0 },
       { name: '不合格   0 - 50%', value: 0 },
     ]
     TrainLogTitle.value = 0
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 9ef0b93..1ad577b 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -270,7 +270,7 @@
               <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="6">
             <el-form-item label="名称" prop="fileName">
               <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
             </el-form-item>
@@ -279,13 +279,14 @@
         <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" class="fill-input" disabled>
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled style="width: 100%;">
                 <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="请选择发布单位"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -295,6 +296,7 @@
                 v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -311,12 +313,13 @@
                 v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人" prop="createUserId">
-              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index b45fbc3..542b284 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -26,7 +26,7 @@
   createUser: '', // 创建人
   createTime: '', // 创建
   approvalStatus: props.value, // 审批状态
-  limit: 10,
+  limit: 20,
   offset: 1,
   fileType: '', // 类型
   formId: '',
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 7d4724b..e54ddf5 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -26,7 +26,7 @@
   fileCode: '', // 文件号
   effectiveTime: '', // 实施时间
   effectiveStatus: '', // 实施状态
-  limit: 10,
+  limit: 20,
   offset: 1,
   fileType: '', // 类型
 }) // 查询参数
@@ -75,13 +75,19 @@
 const getStatus = () => {
   getDictByCode('effectiveStatus').then((res) => {
     if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
+      effectiveStatusSelect.value = [...res.data, { name: '全部', value: '', id: 'quanbu' }]
     }
   })
 }
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.publishTime) {
+    searchQuery.publishTime = ''
+  }
+  if (!searchQuery.effectiveTime) {
+    searchQuery.effectiveTime = ''
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -252,13 +258,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" />
         </search-item>
         <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
@@ -274,20 +280,16 @@
           <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: 185px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
             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: 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" placeholder="实施状态" clearable>
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index 5ca3275..a95c665 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -505,21 +505,21 @@
         <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] === '详情'" @change="directorChange">
+              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;" @change="directorChange">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.name" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
-              <el-select v-model="ruleForm.technologyJob" :placeholder="title.split('-')[2] === '详情' ? '' : '技术职务'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.technologyJob" :placeholder="title.split('-')[2] === '详情' ? '' : '技术职务'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;">
                 <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="administrationJob">
-              <el-select v-model="ruleForm.administrationJob" :placeholder="title.split('-')[2] === '详情' ? '' : '行政职务'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.administrationJob" :placeholder="title.split('-')[2] === '详情' ? '' : '行政职务'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index aac1ef2..11d6d0a 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -22,7 +22,7 @@
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
-  limit: 10,
+  limit: 20,
   offset: 1,
   organizeType: '', // 类型
   createTime: '', // 创建时间
@@ -118,6 +118,9 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.createTime) {
+    searchQuery.createTime = ''
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows.map(item => ({ ...item, createTime: item.createTime.split(' ')[0] }))
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 3f472eb..bc5d9d4 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -7,7 +7,9 @@
 // import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
-import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+// import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const props = defineProps({
   isRemind: {
     type: Boolean,
@@ -78,11 +80,14 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 // 获取所有部门
-const deptList = ref<DeptTreeNode[]>([])
+const deptList = ref([])
 const getDeptList = async () => {
   getDeptTreeList().then((res) => {
-    deptList.value = res.data
+    deptList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
@@ -177,6 +182,7 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   searchQuery.staffNo = ''
@@ -184,6 +190,7 @@
   searchQuery.deptId = ''
   searchQuery.certificateStatus = ''
   searchQuery.verifierCertificateNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -212,10 +219,6 @@
     loading.close()
   })
 }
-// 打印
-const print = () => {
-
-}
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传图片
@@ -268,20 +271,24 @@
           <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+          <!-- <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
             <el-option
               v-for="item in deptList"
               :key="item.id"
               :label="item.name"
               :value="item.id"
             />
-          </el-select>
+          </el-select> -->
+          <com-tree-select
+            ref="selectTreeRef" v-model="searchQuery.deptId" :options="deptList"
+            placeholder="工作部门" :tree-props="deptProps"
+          />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况">
+          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况" clearable>
             <el-option
               v-for="item in certificateStatusList"
               :key="item.id"
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 4352604..5a5f036 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -389,10 +389,10 @@
           关闭
         </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">
-            <el-form-item prop="minioFileName" label-width="70px">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item prop="minioFileName">
               <el-upload
                 class="avatar-uploader"
                 :show-file-list="false"
@@ -423,23 +423,24 @@
               <el-date-picker
                 v-model="ruleForm.birthday" type="date" format="YYYY-MM" value-format="YYYY-MM"
                 placeholder="出生年月" :disabled="title === '详情'"
+                style="width: 100%;"
               />
             </el-form-item>
             <el-form-item label="工作部门" prop="deptId" class="marg-item">
-              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled>
+              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled style="width: 100%;">
                 <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="ruleForm.deptId" :options="PubListTree"
-                placeholder="选择组织机构" :tree-props="deptProps"
+                placeholder="选择组织机构" :tree-props="deptProps" style="width: 100%;"
               />
             </el-form-item>
             <el-form-item label="计量专业" prop="major" class="marg-item">
               <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
             </el-form-item>
             <el-form-item label="是否特操人" prop="specialOperator" class="marg-item">
-              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -449,23 +450,23 @@
               <el-input v-model.trim="ruleForm.staffNo" placeholder="系统自动生成" disabled />
             </el-form-item>
             <el-form-item label="性别" prop="sex" class="marg-item">
-              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="技术职务" prop="technologyJob" class="marg-item">
-              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="从事日期" prop="workDate" class="marg-item">
               <el-date-picker
                 v-model="ruleForm.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-                placeholder="请选择从事日期"
+                placeholder="请选择从事日期" style="width: 100%;"
               />
             </el-form-item>
-            <el-form-item label="是否技术考核" prop="technologyExam" class="marg-item">
-              <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'">
+            <el-form-item label="是否技术考核" prop="technologyExam" class="marg-item" style="width: 100%;">
+              <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -475,17 +476,17 @@
               <el-input ref="cardRef" v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" @blur="getBirthday" />
             </el-form-item>
             <el-form-item label="文化程度" prop="education" class="marg-item">
-              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="行政职务" prop="administrationJob" class="marg-item">
-              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="是否主考人" prop="mainExaminer" class="marg-item">
-              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index 042636e..660f2b0 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -264,7 +264,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="性别" prop="meterStaff.sex">
-              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -273,21 +273,21 @@
         <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-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -296,7 +296,7 @@
         <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-select v-if="title === '详情'" v-model="meterStaff.deptId" disabled style="width: 100%;">
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
               <com-tree-select
@@ -304,6 +304,7 @@
                 ref="selectTreeRef" v-model="meterStaff.deptId" :options="PubListTree"
                 placeholder="选择组织机构"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -316,7 +317,7 @@
             <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="请选择从事日期"
+                placeholder="请选择从事日期" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -347,7 +348,7 @@
             <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="请选择发证日期"
+                placeholder="请选择发证日期" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -355,7 +356,7 @@
             <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="请选择有效日期"
+                placeholder="请选择有效日期" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 178fc12..d0116f3 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -3,7 +3,7 @@
 import type { FormInstance, FormRules } from 'element-plus'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
+const formLabelWidth = '110px'
 const form = reactive({
   certificateNo: '', // 证书号
   certificateName: '', // 证书名称
@@ -71,32 +71,52 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`" width="40%">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
     >
-      <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
-        <el-input v-model="form.certificateNo" placeholder="证书号" />
-      </el-form-item>
-      <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
-        <el-input v-model="form.certificateName" placeholder="证书名称" />
-      </el-form-item>
-      <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
-        <el-input v-model="form.certificateCompany" placeholder="发证单位" />
-      </el-form-item>
-      <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
-        <el-date-picker
-          v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择发证日期"
-        />
-      </el-form-item>
-      <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-        <el-date-picker
-          v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择有效日期"
-        />
-      </el-form-item>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
+            <el-input v-model="form.certificateNo" placeholder="证书号" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
+            <el-input v-model="form.certificateName" placeholder="证书名称" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
+            <el-input v-model="form.certificateCompany" placeholder="发证单位" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
+            <el-date-picker
+              v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择发证日期" style="width: 100%;"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+            <el-date-picker
+              v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择有效日期" style="width: 100%;"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <template #footer>
       <span class="dialog-footer">
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
index 5e20d1b..10b0deb 100644
--- a/src/views/measure/person/components/personListDialog.vue
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -1,8 +1,11 @@
 <!-- 计量人员列表弹窗 -->
 <script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
 import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import { getDeptTreeList } from '@/api/system/dept'
-import type { TreeStructure } from '@/views/system/user/user-interface'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -10,7 +13,7 @@
   staffNo: '', // 人员编号
   name: '', // 姓名
   deptId: '', // 所在部门
-  limit: 5,
+  limit: 10,
   offset: 1,
 })
 const loadingTable = ref<boolean>(false)
@@ -32,20 +35,22 @@
   },
 ])
 // 获取部门
-const deptIdList = ref<TreeStructure[]>([])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const deptIdList = ref([])
 const getDeptList = () => {
   getDeptTreeList().then((res) => {
-    deptIdList.value = res.data
+    deptIdList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
 const fetchData = () => {
-  select.value = ''
+  select.value = -1
   getStaffList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.records
       total.value = Number(res.data.total)
-      console.log(list.value, 'list')
     }
   })
 }
@@ -53,6 +58,7 @@
 const search = () => {
   fetchData()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   listQuery.value = {
@@ -62,6 +68,7 @@
     limit: 10,
     offset: 1,
   }
+  selectTreeRef.value.clearSelected()
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -76,18 +83,24 @@
 }
 // 点击保存
 const submitForm = () => {
-  const person = list.value.filter((item, index) => index == select.value)[0]
-  console.log(person, 'person')
-  getStaffDetail(person).then((res) => {
-    if (res.code === 200) {
-      emits('add', res.data)
-      dialogFormVisible.value = false
-    }
-  })
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    getStaffDetail(person).then((res) => {
+      if (res.code === 200) {
+        emits('add', res.data)
+        dialogFormVisible.value = false
+        reset()
+      }
+    })
+  }
+  else {
+    ElMessage.warning('请先选择人员')
+  }
 }
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
+  reset()
 }
 // 初始化
 const initDialog = () => {
@@ -99,39 +112,45 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员" width="50%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable style="width: 150px;" />
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable style="width: 150px;" />
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
+        <!-- <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
           <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
+        </el-select> -->
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
-    <normal-table
-      :data="list" :total="total" :columns="columns" :query="listQuery"
-      :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>
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :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">
             {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
           </template>
         </el-table-column> -->
-      </template>
-    </normal-table>
+        </template>
+      </normal-table>
+    </div>
     <template #footer>
       <span class="dialog-footer">
         <el-button type="primary" @click="submitForm">确认</el-button>
diff --git a/src/views/measure/person/components/userListDialog.vue b/src/views/measure/person/components/userListDialog.vue
index dcd05b5..cd62a73 100644
--- a/src/views/measure/person/components/userListDialog.vue
+++ b/src/views/measure/person/components/userListDialog.vue
@@ -3,14 +3,16 @@
 import { ElMessage } from 'element-plus'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
-import type { TreeStructure } from '@/views/system/user/user-interface'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
 const listQuery = ref({
   keywords: '', // 姓名
   deptId: '', // 所在部门
-  limit: 5,
+  limit: 10,
   offset: 1,
 })
 const loadingTable = ref<boolean>(false)
@@ -31,11 +33,14 @@
     value: 'deptName',
   },
 ])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 // 获取部门
-const deptIdList = ref<TreeStructure[]>([])
+const deptIdList = ref([])
 const getDeptList = () => {
   getDeptTreeList().then((res) => {
-    deptIdList.value = res.data
+    deptIdList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
@@ -52,6 +57,7 @@
 const search = () => {
   fetchData()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   listQuery.value = {
@@ -60,6 +66,7 @@
     limit: 10,
     offset: 1,
   }
+  selectTreeRef.value.clearSelected()
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -74,11 +81,11 @@
 }
 // 点击保存
 const submitForm = () => {
-  console.log(select.value)
   if (select.value >= 0) {
     const person = list.value.filter((item, index) => index == select.value)[0]
     emits('add', person)
     dialogFormVisible.value = false
+    reset()
   }
   else {
     ElMessage.warning('请先选择人员')
@@ -87,9 +94,11 @@
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
+  reset()
 }
 // 初始化
 const initDialog = () => {
+  // reset()
   dialogFormVisible.value = true
   getDeptList()
   fetchData()
@@ -98,16 +107,20 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+  <el-dialog v-model="dialogFormVisible" title="选择人员" width="50%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
         <el-input v-model.trim="listQuery.keywords" placeholder="真实姓名" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable>
+        <!-- <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable>
           <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
+        </el-select> -->
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 9c6f65d..355473a 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -7,7 +7,9 @@
 // import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
-import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+// import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
@@ -16,7 +18,7 @@
   major: '', // 计量专业
   verifierCertificateNo: '', // 证书号
   certificateStatus: '', // 证书状态
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -52,10 +54,10 @@
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取所有部门
-const deptList = ref<DeptTreeNode[]>([])
+const deptList = ref([])
 const getDeptList = async () => {
   getDeptTreeList().then((res) => {
-    deptList.value = res.data
+    deptList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
@@ -126,6 +128,7 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   searchQuery.staffNo = ''
@@ -133,6 +136,7 @@
   searchQuery.deptId = ''
   searchQuery.major = ''
   searchQuery.verifierCertificateNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -160,10 +164,9 @@
     loading.close()
   })
 }
-// 打印
-const print = () => {
-
-}
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传图片
@@ -216,14 +219,18 @@
           <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+          <!-- <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
             <el-option
               v-for="item in deptList"
               :key="item.id"
               :label="item.name"
               :value="item.id"
             />
-          </el-select>
+          </el-select> -->
+          <com-tree-select
+            ref="selectTreeRef" v-model="searchQuery.deptId" :options="deptList"
+            placeholder="工作部门" :tree-props="deptProps"
+          />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.major" placeholder="计量专业" clearable class="w-50 m-2" />
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index af0a29d..2e0e7af 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -1,12 +1,15 @@
 <script lang="ts" setup name="ListSourceAdd">
-import { reactive, ref } from 'vue'
+/**
+ * 添加/编辑/详情溯源供方
+ */
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions, IformInline } from './list_interface'
+import type { IOptions, IformInline, traceSupplierPerson } from './list_interface'
 import { exportFile } from '@/utils/exportUtils'
 import { UploadFile } from '@/api/measure/file'
 import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+import { validatePhone } from '@/utils/validate'
 const props = defineProps({
   infoId: {
     type: String,
@@ -19,43 +22,45 @@
 })
 const emit = defineEmits(['close'])
 const formInline: Ref<IformInline> = ref({
-  businessContent: null,
-  supplierName: null,
-  supplierNo: null,
-  bankAccount: null,
-  bankAccountNumber: null,
-  bankName: null,
-  briefName: null,
-  businessScope: null,
-  companyAddress: null,
-  companyArea: null,
-  companyCity: null,
-  companyCountry: null,
-  companyProvince: null,
-  createTime: null,
-  director: null,
-  fax: null,
-  invoiceAddress: null,
-  invoiceArea: null,
-  invoiceCity: null,
-  invoiceCountry: null,
-  invoiceProvince: null,
-  mailbox: null,
-  minioFileName: null,
-  mobile: null,
-  phone: null,
-  postalCode: null,
-  remark: null,
-  taxNumber: null,
-  website: null,
+  id: '',
+  businessContent: '',
+  supplierName: '',
+  supplierNo: '',
+  bankAccount: '',
+  bankAccountNumber: '',
+  bankName: '',
+  briefName: '',
+  businessScope: '',
+  companyAddress: '',
+  companyArea: '',
+  companyCity: '',
+  companyCountry: '',
+  companyProvince: '',
+  createTime: '',
+  director: '',
+  fax: '',
+  invoiceAddress: '',
+  invoiceArea: '',
+  invoiceCity: '',
+  invoiceCountry: '',
+  invoiceProvince: '',
+  mailbox: '',
+  minioFileName: '',
+  mobile: '',
+  phone: '',
+  postalCode: '',
+  remark: '',
+  taxNumber: '',
+  website: '',
   traceSupplierPersonList: [],
 })
+const traceSupplierPersonList: Ref<traceSupplierPerson[]> = ref([])
 const columns = ref([
-  { text: '人员编号', value: 'personNo', show: true },
-  { text: '姓名', value: 'name', show: true },
-  { text: '工作部门', value: 'department', show: true },
-  { text: '职务', value: 'job', show: true },
-  { text: '联系方式', value: 'phone', show: true },
+  { text: '人员编号', value: 'personNo', required: false },
+  { text: '姓名', value: 'name', required: true },
+  { text: '工作部门', value: 'department', required: false },
+  { text: '职务', value: 'job', required: false },
+  { text: '联系方式', value: 'phone', required: true, reg: validatePhone },
 ])
 const ruleFormRef = ref<FormInstance>()
 const provinceList = ref<IOptions[]>([])
@@ -66,14 +71,17 @@
 const invoiceCityList = ref<IOptions[]>([])
 const areaInvoiceList = ref<IOptions[]>([])
 const dialogVisible = ref(false)
-const addPersonList = ref({
+// 人员对象
+const addPersonObj: traceSupplierPerson = {
+  id: '',
   personNo: '',
   name: '',
   department: '',
   job: '',
   phone: '',
-})
-const SelectionList = ref([])
+  editable: true,
+}
+const SelectionList: Ref<traceSupplierPerson[]> = ref([])
 const upload = ref<UploadInstance>()
 // 校验规则
 const rules = ref({
@@ -91,7 +99,7 @@
   })
 }
 // 表格选中
-const handleSelectionChange = (e: any) => {
+const handleSelectionChange = (e: traceSupplierPerson[]) => {
   SelectionList.value = e
 }
 // 获取公司地址省级
@@ -142,15 +150,33 @@
   })
 }
 // 点击增加行
-const addRoow = () => {
-  const object = {
-    personNo: '',
-    name: '',
-    department: '',
-    job: '',
-    phone: '',
+const addRow = () => {
+  // 检查上一行必填项
+  if (checkPersonList()) {
+    setAllRowReadable()
+    traceSupplierPersonList.value.push({ ...addPersonObj })
   }
-  formInline.value.traceSupplierPersonList.push(object)
+}
+// 检查人员列表
+function checkPersonList() {
+  for (let index = 0; index < traceSupplierPersonList.value.length; index++) {
+    const item = traceSupplierPersonList.value[index]
+    for (const prop of columns.value) {
+      // 检查必填
+      if (prop.required && !item[prop.value]) {
+        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
+        return false
+      }
+      // 验证正则
+      if (prop.reg && typeof prop.reg === 'function') {
+        if (!prop.reg(item[prop.value])) {
+          ElMessage.warning(`第${index + 1}行中${prop.text}输入不合法`)
+          return false
+        }
+      }
+    }
+  }
+  return true
 }
 // 点击关闭
 const handleClose = () => {
@@ -158,12 +184,12 @@
 }
 // 点击弹窗的完成追加到表格数组中
 const addPushList = () => {
-  formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonList.value)))
+  formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonObj.value)))
   handleClose()
 }
 // 删除行
 const deleteList = () => {
-  formInline.value.traceSupplierPersonList = formInline.value.traceSupplierPersonList.filter((item) => {
+  traceSupplierPersonList.value = traceSupplierPersonList.value.filter((item: traceSupplierPerson) => {
     return !SelectionList.value.includes(item)
   })
 }
@@ -261,10 +287,16 @@
     }
   })
 }
-// 双击表格显示输入框
-const dblclickName = (item: object) => {
-  console.log(item)
-  item.show = false
+// 双击行显示输入框
+const dblclickRow = (row: traceSupplierPerson) => {
+  setAllRowReadable()
+  row.editable = true
+}
+// 将所有人员信息列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of traceSupplierPersonList.value) {
+    item.editable = false
+  }
 }
 if (props.buttonType !== '新建') {
   getInfo()
@@ -273,7 +305,7 @@
 
 <template>
   <app-container>
-    <detail-page :title="`培训计划-${buttonType}`">
+    <detail-page :title="`溯源供方-${buttonType}`">
       <template #btns>
         <el-button
           type="primary"
@@ -617,39 +649,36 @@
       </el-form>
     </detail-page>
     <detail-block title="人员信息">
-      <template #btns>
-        <el-button
-          type="info"
-          :disabled="buttonType === '详情'"
-          @click="deleteList"
-        >
+      <template v-if="buttonType !== '详情'" #btns>
+        <el-button type="info" @click="deleteList">
           删除行
         </el-button>
-        <el-button
-          type="primary"
-          :disabled="buttonType === '详情'"
-          @click="addRoow"
-        >
+        <el-button type="primary" @click="addRow">
           增加行
         </el-button>
       </template>
       <el-table
-        :data="formInline.traceSupplierPersonList"
+        :data="traceSupplierPersonList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
+        @row-dblclick="dblclickRow"
       >
-        <el-table-column type="selection" width="55" />
+        <el-table-column type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column
           v-for="item in columns"
           :key="item.value"
           :prop="item.value"
           :label="item.text"
+          align="center"
         >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
           <template #default="scope">
-            <span v-show="item.show" style="color: gray;" @dblclick="dblclickName(item)">{{ scope.row[item.value] || `双击编辑${item.text}` }}</span>
-            <el-input v-show="!item.show" v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" @blur="item.show = true" />
+            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+            <el-input v-else v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index 530bcc4..c057976 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -24,6 +24,18 @@
   areaName: string
 }
 
+// 溯源供方人员
+export interface traceSupplierPerson {
+  id: number | string // id
+  job: string // 职务
+  department: string// 部门
+  name: string// 信命
+  personNo: string// 人员编号
+  phone: string// 联系方式
+  editable?: boolean // 是否可编辑
+  [key: string]: any
+}
+
 export interface IformInline {
   businessContent: string
   supplierName: string
@@ -55,5 +67,6 @@
   remark: string
   taxNumber: string
   website: string
-  traceSupplierPersonList: []
+  traceSupplierPersonList: traceSupplierPerson []
 }
+
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index e44001a..600eda1 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -32,11 +32,20 @@
   dialogVisible.value = true
   ruleForm.noticePublisher = userInfo.$state.name
   ruleForm.noticeCompany = userInfo.$state.deptName
-  ruleForm.noticeTime = dayjs().format('YYYY-MM-DD')
+  ruleForm.noticeTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
 }
 defineExpose({ initDialog })
+// 重置
+const resetDialog = () => {
+  ruleForm.noticeTime = ''
+  ruleForm.noticeSketch = ''
+  ruleForm.noticeContent = ''
+  ruleForm.minioFileName = ''
+  ruleForm.noticeTitle = ''
+}
 // 关闭弹窗
 const close = () => {
+  resetDialog()
   dialogVisible.value = false
   emits('resetData')
 }
@@ -63,6 +72,7 @@
 const resetForm = (formEl: FormInstance | undefined) => {
   // if (!formEl) { return }
   formEl?.resetFields()
+  resetDialog()
   dialogVisible.value = false
   emits('resetData')
 }
@@ -105,7 +115,7 @@
     uploadImage: {
       server: 'http://111.198.10.15:21409/minio/file/upload', // 配置图片上传地址
       maxFileSize: 2 * 1024 * 1024, // 10M  图片大小限制
-      fieldName: 'img', // 上传类型
+      fieldName: 'multipartFile', // 上传名字
       allowedFileTypes: [], // 选择文件时的类型限制，默认为 ['image/*'] 。如不想限制，则设置为 []
       // 自定义上传参数，传递图片时需要带一些参数过去写在这。参数会被添加到 formData 中，一起上传到服务端。
       // meta: {
@@ -154,9 +164,9 @@
     uploadVideo: {
       server: 'http://111.198.10.15:21409/minio/file/upload', // 配置视频上传地址
       maxFileSize: 5 * 1024 * 1024, // 5M  视频大小限制
-      fieldName: 'your-custom-name', // 上传类型
+      fieldName: 'multipartFile', // 上传名字
       // 最多可上传几个文件，默认为 5
-      maxNumberOfFiles: 3,
+      // maxNumberOfFiles: 1,
       allowedFileTypes: [], // 选择文件时的类型限制，默认为 ['video/*'] 。如不想限制，则设置为 []
       // 自定义上传参数，传递图片时需要带一些参数过去写在这。参数会被添加到 formData 中，一起上传到服务端。
       // meta: {
@@ -167,8 +177,8 @@
       //     Accept: 'text/x-json',
       //     otherKey: 'xxx'
       // },
-      metaWithUrl: false, // 将 meta 拼接到 url 参数中，默认 false
-      withCredentials: true, // 跨域是否传递 cookie ，默认为 false
+      // metaWithUrl: false, // 将 meta 拼接到 url 参数中，默认 false
+      // withCredentials: true, // 跨域是否传递 cookie ，默认为 false
       // 上传之前触发
       onBeforeUpload(file: any) {
         // file 选中的文件，格式如 { key: file }
@@ -222,9 +232,6 @@
     editorRef.value = editor // 一定要用 Object.seal() ，否则会报错
   })
 }
-const look = () => {
-  console.log(ruleForm.noticeContent)
-}
 const minioFileUrl = ref('')
 watch(() => ruleForm.minioFileName, (newVal) => {
   if (newVal) {
@@ -278,7 +285,7 @@
           />
           <editor
             v-model="ruleForm.noticeContent"
-            style="height: 150px; overflow-y: hidden;"
+            style="height: 300px; overflow-y: hidden;"
             :default-config="editorConfig"
             mode="default"
             @onCreated="onCreated"
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index 0926957..a4cdd5e 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -16,7 +16,7 @@
   noticePublisher: '', // 发布人
   noticeTime: '', // 发布时间
   noticeTitle: '', // 标题
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -27,6 +27,7 @@
     text: '编号',
     value: 'noticeNo',
     align: 'center',
+    width: '180',
   },
   {
     text: '标题',
@@ -37,6 +38,7 @@
     text: '发布人',
     value: 'noticePublisher',
     align: 'center',
+    width: '150',
   },
   {
     text: '内容描述',
@@ -47,11 +49,15 @@
     text: '发布时间',
     value: 'noticeTime',
     align: 'center',
+    width: '200',
   },
 ] // 表格
 const list = ref([]) // 表格数据
 // 获取通知公告列表
 const getNoticeList = () => {
+  if (!searchQuery.noticeTime) {
+    searchQuery.noticeTime = ''
+  }
   getNoticeeApi(searchQuery).then((res) => {
     total.value = res.data.total
     list.value = res.data.rows
diff --git a/src/views/system/notice/noticeDetail.vue b/src/views/system/notice/noticeDetail.vue
index 94468d4..da36bd8 100644
--- a/src/views/system/notice/noticeDetail.vue
+++ b/src/views/system/notice/noticeDetail.vue
@@ -1,5 +1,6 @@
 <!-- 通知公告详情弹窗 -->
 <script lang="ts" setup name="noticeDetail">
+import { Editor } from '@wangeditor/editor-for-vue'
 import type { noticeType } from './notice-interface'
 import { getNoticeDetail } from '@/api/system/notice'
 import { getPhotoUrl } from '@/api/system/tool'
@@ -52,6 +53,18 @@
     })
   }
 })
+// 编辑器配置
+const editorConfig = ref({
+  readOnly: true,
+})
+// 富文本实例对象
+const editorRef = shallowRef()
+const onCreated = (editor: any) => {
+  editorRef.value = editor
+  nextTick(() => {
+    editorRef.value = editor // 一定要用 Object.seal() ，否则会报错
+  })
+}
 </script>
 
 <template>
@@ -89,7 +102,18 @@
       </el-form-item>
       <el-form-item label="发布内容" prop="noticeContent">
         <!-- <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" disabled /> -->
-        <div style="border: 1px solid #dcdfe6;width: 100%;border-radius: 4px;padding: 12px;" v-html="ruleForm.noticeContent" />
+        <!-- <div style="border: 1px solid #dcdfe6;width: 100%;border-radius: 4px;padding: 12px;" v-html="ruleForm.noticeContent" ></div> -->
+        <div style="border: 1px solid #dcdfe6;width: 100%;border-radius: 4px;">
+          <editor
+            ref="editorRef"
+            v-model="ruleForm.noticeContent"
+            style="height: 300px; overflow-y: hidden;"
+            :default-config="editorConfig"
+            mode="default"
+            :disabled="true"
+            @onCreated="onCreated"
+          />
+        </div>
       </el-form-item>
       <el-form-item label="查看附件">
         <el-link v-if="ruleForm.minioFileName" :href="minioFileUrl" type="primary" target="_blank">
diff --git a/src/views/system/tool/autograph/addDDialog.vue b/src/views/system/tool/autograph/addDDialog.vue
index e39b706..daadd9b 100644
--- a/src/views/system/tool/autograph/addDDialog.vue
+++ b/src/views/system/tool/autograph/addDDialog.vue
@@ -186,7 +186,7 @@
         <el-input v-model.trim="ruleForm.signDesc" placeholder="签名描述" :disabled="title === '详情'" />
       </el-form-item>
       <el-form-item label="可使用人" prop="userIdList">
-        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'">
+        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'" style="width: 100%;">
           <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </el-form-item>
@@ -198,7 +198,7 @@
         <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px', 'margin-top': ruleForm.minioFileName === '' ? '0px' : '56px' }" @click="upload">
           {{ ruleForm.minioFileName === '' ? '上传' : '更换图片' }}
         </el-button>
-        <input v-show="title === '123'" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <input v-show="title === '123'" ref="fileRef" type="file" accept="image/*" @change="onFileChange">
       </el-form-item>
     </el-form>
     <template #footer>
diff --git a/src/views/system/tool/autograph/autograph.vue b/src/views/system/tool/autograph/autograph.vue
index ac9f000..d3c6f81 100644
--- a/src/views/system/tool/autograph/autograph.vue
+++ b/src/views/system/tool/autograph/autograph.vue
@@ -15,7 +15,7 @@
   signName: '', // 名称
   signDirector: '', // 负责人
   createTime: '', // 创建时间
-  limit: 10,
+  limit: 20,
   offset: 1,
   signType: '',
 }) // 查询参数
@@ -38,6 +38,9 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.createTime) {
+    searchQuery.createTime = ''
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -168,10 +171,10 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model="searchQuery.signNo" placeholder="签章编号" clearable class="w-50 m-2 normal-input" />
+        <el-input v-model="searchQuery.signNo" placeholder="签名编号" clearable class="w-50 m-2 normal-input" />
       </search-item>
       <search-item>
-        <el-input v-model="searchQuery.signName" placeholder="签章名称" clearable class="w-50 m-2 normal-input" />
+        <el-input v-model="searchQuery.signName" placeholder="签名名称" clearable class="w-50 m-2 normal-input" />
       </search-item>
       <search-item>
         <el-input v-model="searchQuery.signDirector" placeholder="负责人" clearable class="w-50 m-2 normal-input" />
diff --git a/src/views/system/tool/certificate/addDDialog.vue b/src/views/system/tool/certificate/addDDialog.vue
index 2721bf8..0fdec28 100644
--- a/src/views/system/tool/certificate/addDDialog.vue
+++ b/src/views/system/tool/certificate/addDDialog.vue
@@ -185,7 +185,7 @@
         <el-input v-model.trim="ruleForm.templateDesc" placeholder="模板描述" :disabled="title === '详情'" />
       </el-form-item>
       <el-form-item label="可使用人" prop="userIdList">
-        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'">
+        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'" style="width: 100%;">
           <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </el-form-item>

diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index bb58885..2959118 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -53,3 +53,64 @@
   }
   return true
 }
+
+/**
+ * 验证小写字母
+ * @param str
+ * @returns
+ */
+export function validateLowerCase(str: string) {
+  const reg = /^[a-z]+$/
+  return reg.test(str)
+}
+
+/* 验证大写字母 */
+export function validateUpperCase(str: string) {
+  const reg = /^[A-Z]+$/
+  return reg.test(str)
+}
+
+/* 验证大小写字母 */
+export function validateAlphabets(str: string) {
+  const reg = /^[A-Za-z]+$/
+  return reg.test(str)
+}
+
+/**
+ * 验证邮箱
+ * @param email
+ * @returns {boolean}
+ */
+export function validateEmail(email: string) {
+  const re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
+  return re.test(email)
+}
+
+/**
+ * 验证手机号
+ * @param phone
+ * @returns {boolean}
+ */
+export function validateMobile(phone: string) {
+  const re = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/
+  return re.test(phone)
+}
+
+/**
+ * 校验身份证号
+ * @param value
+ * @returns
+ */
+export function validateIdCardNo(value: string) {
+  const re = /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/
+  return re.test(value)
+}
+/**
+ *
+ * @param value 验证电话号码
+ * @returns
+ */
+export function validatePhone(value: string) {
+  const re = /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/
+  return re.test(value)
+}
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 1c2405e..bca0958 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,13 +1,46 @@
-<script lang="ts" setup name="borrowHandle">
-// 逻辑代码
+<!-- 设备借用处理 -->
+<script lang="ts" setup name="borrowApply">
+import list from './components/handleList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '待借用', comp: list },
+  { name: '已借用', comp: list },
+  { name: '已归还', comp: list },
+])
+const current = ref('待借用')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用处理
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 03d414b..c5771f7 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,13 +1,50 @@
+<!-- 设备借用申请 -->
 <script lang="ts" setup name="borrowApply">
-// 逻辑代码
+import list from './components/applyList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '全部', comp: list },
+  { name: '草稿箱', comp: list },
+  { name: '待审批', comp: list },
+  { name: '审批中', comp: list },
+  { name: '已通过', comp: list },
+  { name: '未通过', comp: list },
+  { name: '已取消', comp: list },
+])
+const current = ref('全部')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用申请
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
new file mode 100644
index 0000000..052f3ce
--- /dev/null
+++ b/src/views/device/borrow/components/applyList.vue
@@ -0,0 +1,328 @@
+<script lang="ts" setup name="borrowApplyList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '文件号',
+    value: 'fileNo',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '类别',
+    value: 'catergory',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '李四',
+      time: '2020-12-14 00:00:00',
+      status: '未通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const approveRef = ref()
+// 同意
+const agree = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '1',
+  })
+}
+// 驳回
+const reject = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '3',
+  })
+}
+// 拒绝
+const refuse = (row: any) => {
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
+}
+// 取消
+const cancel = (rowrow: any) => {
+  ElMessageBox.confirm(
+    '确认取消吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" @click="addBtn" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="agree(row)">
+                  同意
+                </el-button>
+                <el-button size="small" type="primary" link @click="reject(row)">
+                  驳回
+                </el-button>
+                <el-button size="small" type="primary" link @click="refuse(row)">
+                  拒绝
+                </el-button>
+                <el-button size="small" type="primary" link @click="cancel(row)">
+                  取消
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/components/approvalActionDialog.vue b/src/views/device/borrow/components/approvalActionDialog.vue
new file mode 100644
index 0000000..214876c
--- /dev/null
+++ b/src/views/device/borrow/components/approvalActionDialog.vue
@@ -0,0 +1,104 @@
+<!-- 审批操作弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
+const dialogVisibleApprove = ref(false)
+const form = reactive({
+  radio: '1',
+})
+const ruleFormRef = ref<FormInstance>()
+const rules = reactive<FormRules>({
+})
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const approvetime = ref('') // 审批时间
+const initDialog = (row: any) => {
+  dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
+}
+defineExpose({ initDialog })
+
+// 点击保存
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      dialogVisibleApprove.value = false
+      emits('resetData')
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  formEl.resetFields()
+  dialogVisibleApprove.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
+    <el-form
+      ref="ruleFormRef" :model="form"
+      :rules="rules" label-width="110px"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人">
+            <el-input disabled :value="userInfo.$state.name" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间">
+            <el-input disabled :value="approvetime" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
+        <el-button @click="resetForm(ruleFormRef)">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
new file mode 100644
index 0000000..cfda00a
--- /dev/null
+++ b/src/views/device/borrow/components/handleList.vue
@@ -0,0 +1,281 @@
+<script lang="ts" setup name="borrowHandleList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '申请编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'dept',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      dept: '顶级',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      dept: '徐州分中心',
+      user: '里斯',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+const borrow = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="borrow(row)">
+                  借用
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/addRow.vue b/src/views/device/standingBook/components/addRow.vue
index 1678cdb..07b03d1 100644
--- a/src/views/device/standingBook/components/addRow.vue
+++ b/src/views/device/standingBook/components/addRow.vue
@@ -5,7 +5,7 @@
 import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
+const formLabelWidth = '110px'
 const form = ref({})
 const formTable = ref([
   {
@@ -91,108 +91,188 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`">
+  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
     >
       <div v-if="name === '周检记录'">
-        <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录表编号" />
-        </el-form-item>
-        <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录人" />
-        </el-form-item>
-        <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="检定日期"
-          />
-        </el-form-item>
-        <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="有效日期"
-          />
-        </el-form-item>
-        <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="送检人" />
-        </el-form-item>
-        <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录表编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="检定日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="有效日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="送检人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '状态变更记录'">
-        <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="状态类型" clearable>
-            <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="结束日期"
-          />
-        </el-form-item>
-        <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="申请人" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="状态类型" clearable style="width: 100%;">
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="申请人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '使用记录'">
-        <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用人" />
-        </el-form-item>
-        <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用部门" />
-        </el-form-item>
-        <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="使用类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用结束日期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用部门" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="使用类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '检定证书'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="证书类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书出具日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书有效期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
     </el-form>
     <template #footer>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 5f7b347..9a9f798 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -352,7 +352,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -376,7 +376,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -391,7 +391,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -404,14 +404,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -434,7 +434,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -443,20 +443,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -480,23 +480,23 @@
               <com-tree-select
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -507,10 +507,10 @@
             <el-form-item label="检定部门" prop="mesureDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -520,7 +520,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -529,13 +529,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -544,21 +544,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -578,14 +578,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -594,14 +594,14 @@
         <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-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -669,7 +669,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index fc3fd54..d9d4514 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -199,6 +199,8 @@
     useDeptList.value = toTreeList(res.data, '0', true)
   })
 }
+const selectTreeRef1 = ref()
+const selectTreeRef2 = ref()
 // 重置
 const resetDATA = () => {
   ruleForm.value = {
@@ -254,6 +256,10 @@
     isStandardSupportEquipment: '', //		是否标准配套设备
     id: '',
   }
+  if (title.value !== '详情') {
+    selectTreeRef1.value.clearSelected()
+    selectTreeRef2.value.clearSelected()
+  }
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
@@ -378,7 +384,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -402,7 +408,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -416,8 +422,7 @@
             <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"
+                :placeholder="title === '详情' ? '' : '出厂年月'" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -430,14 +435,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -460,7 +465,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -469,20 +474,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -505,24 +510,26 @@
             <el-form-item label="使用部门" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
+                ref="selectTreeRef2"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -536,10 +543,12 @@
               </el-select> -->
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                ref="selectTreeRef1"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -549,7 +558,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -558,13 +567,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -573,21 +582,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -607,14 +616,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -624,14 +633,14 @@
           <el-col :span="6">
             <el-form-item label="资本来源" prop="capitalSource">
               <!-- <el-input v-model.trim="ruleForm.capitalSource" placeholder="资本来源" :disabled="title === '详情'" /> -->
-              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -699,7 +708,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f653095..f4229a6 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -147,19 +147,17 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
-  setTimeout(() => {
-    list.value = [
-      {
-        equipmentNo: 123,
-        equipmentName: 'test',
-        modelNo: '001',
-        usePersonName: '张三',
-        validDate: '2022-12-12 00:00:00',
-        useDeptName: '顶级',
-      },
-    ]
-    total.value = 1
-  }, 1000)
+  list.value = [
+    {
+      equipmentNo: 123,
+      equipmentName: 'test',
+      modelNo: '001',
+      usePersonName: '张三',
+      validDate: '2022-12-12 00:00:00',
+      useDeptName: '顶级',
+    },
+  ] as any
+  total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -220,9 +218,11 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -300,13 +300,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.mesureType" class="m-2 normal-select" placeholder="检定方式" clearable>
+          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable>
             <el-option
               v-for="item in mesureTypeList"
               :key="item.id"
@@ -316,7 +316,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.managerState" class="m-2 normal-select" placeholder="管理状态" clearable>
+          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable>
             <el-option
               v-for="item in managerStateList"
               :key="item.id"
@@ -327,8 +327,9 @@
         </search-item>
         <search-item>
           <com-tree-select
+            ref="selectTreeRef"
             v-model="searchQuery.useDept" :options="useDeptList" placeholder="使用部门"
-            :tree-props="deptProps" style="width: 150px;"
+            :tree-props="deptProps"
           />
         </search-item>
         <search-item>
@@ -336,11 +337,10 @@
             v-model="searchQuery.validDate" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="有效日期"
             class="normal-date"
-            style="width: 150px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.abc" class="m-2 normal-select" placeholder="ABC" clearable>
+          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable>
             <el-option
               v-for="item in abcList"
               :key="item.id"
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 78a3800..4c31a94 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -2,9 +2,10 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/fixedAssetsAdd.vue'
-import type { fixedAssetsType } from './standingBook-interface'
+import type { fixedAssetsType, selectType } from './standingBook-interface'
 import { exportFile } from '@/utils/exportUtils'
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
+import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   assetNo: '', // 固定编号
@@ -50,7 +51,7 @@
   },
   {
     text: '设备类型',
-    value: 'assetTypeName',
+    value: 'equipmentTypeName',
     width: '150',
     align: 'center',
   },
@@ -102,6 +103,7 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+const equipmentCategoryList = ref<selectType[]>([]) // 设备类别
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
@@ -242,6 +244,10 @@
 }
 onMounted(() => {
   getList()
+  // 获取设备类别
+  getDictByCode('equipmentCategory').then((response) => {
+    equipmentCategoryList.value = response.data
+  })
 })
 </script>
 
@@ -265,7 +271,10 @@
           <el-input v-model="searchQuery.equipmentSpecifications" placeholder="设备规格" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-select v-model="searchQuery.equipmentCategory" placeholder="设备类别" clearable>
+            <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+          </el-select>
         </search-item>
       </search-area>
       <table-container>
diff --git a/src/views/device/stateManage/components/addRow.vue b/src/views/device/stateManage/components/addRow.vue
new file mode 100644
index 0000000..3ba82d6
--- /dev/null
+++ b/src/views/device/stateManage/components/addRow.vue
@@ -0,0 +1,160 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { listPageApi } from '@/api/device/standingBook'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  limit: 10,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '出厂编号',
+    value: 'manufacturingNo',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+  },
+])
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listPageApi(listQuery.value as any).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map(item => ({ ...item, checked: '' }))
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    equipmentName: '', // 姓名
+    equipmentNo: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const checkedArr = list.value.filter(item => item.checked !== '')
+  if (checkedArr.length) {
+    console.log(checkedArr, '选中的设备')
+    emits('add', checkedArr)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择设备')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns as any" :query="listQuery"
+        :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-checkbox v-model="scope.row.checked" :label="scope.$index" size="large" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-checkbox__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index 56417d6..214876c 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -47,38 +47,45 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="30%">
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
-      :rules="rules"
+      :rules="rules" label-width="110px"
     >
-      <el-form-item label="审批意见">
-        <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
-        <el-radio-group v-model="form.radio">
-          <el-radio label="1">
-            同意
-          </el-radio>
-          <el-radio label="2">
-            拒绝
-          </el-radio>
-          <el-radio label="3">
-            驳回
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="审批结论">
-        <el-input
-          :rows="4"
-          type="textarea"
-        />
-      </el-form-item>
       <el-row :gutter="24">
-        <el-col :span="10">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="审批人">
             <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
-        <el-col :span="14">
+        <el-col :span="12">
           <el-form-item label="审批时间">
             <el-input disabled :value="approvetime" />
           </el-form-item>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index e74d70e..2003e31 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -1,7 +1,8 @@
 <!-- 新增或详情弹窗 -->
-<script lang="ts" setup name="addNotice">
+<script lang="ts" setup name="add">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
+import addRow from './addRow.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
@@ -16,6 +17,7 @@
 const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const name = ref('')
+const borrowList = ref([])
 const ruleForm = ref({
   assetNo: '', // 资产编号
   assetType: '', // 资产类型
@@ -357,10 +359,86 @@
     isShowCalibration.value = true
   }
 })
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerLevelName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+  },
+])
+const addRowRef = ref()
+// 添加行
+const addRowBtn = () => {
+  addRowRef.value.initDialog({ title: '添加' })
+}
+// 删除行
+const removeRowBtn = () => {
+  const removeArr = borrowList.value.filter(item => item.remove !== '')
+  if (removeArr.length) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      borrowList.value = borrowList.value.filter(item => item.remove === '')
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 借用设备列表添加
+const addRowMethods = (row) => {
+  row.forEach((element) => {
+    borrowList.value.push({ ...element, remove: '' })
+  })
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
     <detail-page :title="`${name}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
@@ -378,15 +456,16 @@
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder="">
+              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -430,7 +509,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -454,28 +533,56 @@
         </el-row>
       </el-form>
     </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>
+    <div>
+      <detail-block title="借用设备列表">
+        <template #btns>
+          <el-button type="primary" @click="addRowBtn">
+            添加行
+          </el-button>
+          <el-button type="info" @click="removeRowBtn">
+            删除行
+          </el-button>
+        </template>
+        <normal-table
+          :data="borrowList" :total="1" :columns="columns as any"
+        >
+          <template #preColumns>
+            <el-table-column label="选择" width="55" align="center">
+              <template #default="scope">
+                <el-checkbox v-model="scope.row.remove" :label="scope.$index" size="large" />
+              </template>
+            </el-table-column>
+            <el-table-column label="序号" width="60" align="center">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </detail-block>
+      <detail-block 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>
+    </div>
   </app-container>
 </template>
 
@@ -484,6 +591,10 @@
   background-color: #fff;
 }
 
+:deep(.el-checkbox__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,
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index aaaaf61..d588b8d 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,6 +1,7 @@
 <script lang="ts" setup name="bench">
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
+import type { trainLogStatistic } from './bench-interface'
 import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
 import { getPlanList } from '@/api/system/plan'
 import { listPageApi } from '@/api/measure/file'
@@ -132,15 +133,19 @@
     account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
+    const result: trainLogStatistic = res.data
+    const notQualified: number = Number(result.trainCount) - result.qualifiedCount
+    const qualifiedRate = ((result.qualifiedCount / result.trainCount) * 100).toFixed(2) // 合格率
+    const notQualifiedRate = ((notQualified / result.trainCount) * 100).toFixed(2) // 不合格率
     TrainLogSList.value = [
-      { name: `合格     ${res.data.qualified}-${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
-      { name: `不合格   ${res.data.notQualified}- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+      { name: `合   格   ${result.qualifiedCount}-${qualifiedRate}%`, value: result.qualifiedCount },
+      { name: `不合格   ${notQualified}- ${notQualifiedRate}%`, value: notQualified },
     ]
     TrainLogTitle.value = res.data.trainCount
   }).catch((_) => {
     // 处理异常
     TrainLogSList.value = [
-      { name: '合格     0 - 50%', value: 0 },
+      { name: '合   格   0 - 50%', value: 0 },
       { name: '不合格   0 - 50%', value: 0 },
     ]
     TrainLogTitle.value = 0
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 9ef0b93..1ad577b 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -270,7 +270,7 @@
               <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="6">
             <el-form-item label="名称" prop="fileName">
               <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
             </el-form-item>
@@ -279,13 +279,14 @@
         <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" class="fill-input" disabled>
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled style="width: 100%;">
                 <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="请选择发布单位"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -295,6 +296,7 @@
                 v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -311,12 +313,13 @@
                 v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人" prop="createUserId">
-              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index b45fbc3..542b284 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -26,7 +26,7 @@
   createUser: '', // 创建人
   createTime: '', // 创建
   approvalStatus: props.value, // 审批状态
-  limit: 10,
+  limit: 20,
   offset: 1,
   fileType: '', // 类型
   formId: '',
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 7d4724b..e54ddf5 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -26,7 +26,7 @@
   fileCode: '', // 文件号
   effectiveTime: '', // 实施时间
   effectiveStatus: '', // 实施状态
-  limit: 10,
+  limit: 20,
   offset: 1,
   fileType: '', // 类型
 }) // 查询参数
@@ -75,13 +75,19 @@
 const getStatus = () => {
   getDictByCode('effectiveStatus').then((res) => {
     if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
+      effectiveStatusSelect.value = [...res.data, { name: '全部', value: '', id: 'quanbu' }]
     }
   })
 }
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.publishTime) {
+    searchQuery.publishTime = ''
+  }
+  if (!searchQuery.effectiveTime) {
+    searchQuery.effectiveTime = ''
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -252,13 +258,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" />
         </search-item>
         <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
@@ -274,20 +280,16 @@
           <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: 185px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
             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: 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" placeholder="实施状态" clearable>
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index 5ca3275..a95c665 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -505,21 +505,21 @@
         <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] === '详情'" @change="directorChange">
+              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;" @change="directorChange">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.name" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
-              <el-select v-model="ruleForm.technologyJob" :placeholder="title.split('-')[2] === '详情' ? '' : '技术职务'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.technologyJob" :placeholder="title.split('-')[2] === '详情' ? '' : '技术职务'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;">
                 <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="administrationJob">
-              <el-select v-model="ruleForm.administrationJob" :placeholder="title.split('-')[2] === '详情' ? '' : '行政职务'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.administrationJob" :placeholder="title.split('-')[2] === '详情' ? '' : '行政职务'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index aac1ef2..11d6d0a 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -22,7 +22,7 @@
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
-  limit: 10,
+  limit: 20,
   offset: 1,
   organizeType: '', // 类型
   createTime: '', // 创建时间
@@ -118,6 +118,9 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.createTime) {
+    searchQuery.createTime = ''
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows.map(item => ({ ...item, createTime: item.createTime.split(' ')[0] }))
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 3f472eb..bc5d9d4 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -7,7 +7,9 @@
 // import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
-import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+// import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const props = defineProps({
   isRemind: {
     type: Boolean,
@@ -78,11 +80,14 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 // 获取所有部门
-const deptList = ref<DeptTreeNode[]>([])
+const deptList = ref([])
 const getDeptList = async () => {
   getDeptTreeList().then((res) => {
-    deptList.value = res.data
+    deptList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
@@ -177,6 +182,7 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   searchQuery.staffNo = ''
@@ -184,6 +190,7 @@
   searchQuery.deptId = ''
   searchQuery.certificateStatus = ''
   searchQuery.verifierCertificateNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -212,10 +219,6 @@
     loading.close()
   })
 }
-// 打印
-const print = () => {
-
-}
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传图片
@@ -268,20 +271,24 @@
           <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+          <!-- <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
             <el-option
               v-for="item in deptList"
               :key="item.id"
               :label="item.name"
               :value="item.id"
             />
-          </el-select>
+          </el-select> -->
+          <com-tree-select
+            ref="selectTreeRef" v-model="searchQuery.deptId" :options="deptList"
+            placeholder="工作部门" :tree-props="deptProps"
+          />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况">
+          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况" clearable>
             <el-option
               v-for="item in certificateStatusList"
               :key="item.id"
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 4352604..5a5f036 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -389,10 +389,10 @@
           关闭
         </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">
-            <el-form-item prop="minioFileName" label-width="70px">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item prop="minioFileName">
               <el-upload
                 class="avatar-uploader"
                 :show-file-list="false"
@@ -423,23 +423,24 @@
               <el-date-picker
                 v-model="ruleForm.birthday" type="date" format="YYYY-MM" value-format="YYYY-MM"
                 placeholder="出生年月" :disabled="title === '详情'"
+                style="width: 100%;"
               />
             </el-form-item>
             <el-form-item label="工作部门" prop="deptId" class="marg-item">
-              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled>
+              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled style="width: 100%;">
                 <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="ruleForm.deptId" :options="PubListTree"
-                placeholder="选择组织机构" :tree-props="deptProps"
+                placeholder="选择组织机构" :tree-props="deptProps" style="width: 100%;"
               />
             </el-form-item>
             <el-form-item label="计量专业" prop="major" class="marg-item">
               <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
             </el-form-item>
             <el-form-item label="是否特操人" prop="specialOperator" class="marg-item">
-              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -449,23 +450,23 @@
               <el-input v-model.trim="ruleForm.staffNo" placeholder="系统自动生成" disabled />
             </el-form-item>
             <el-form-item label="性别" prop="sex" class="marg-item">
-              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="技术职务" prop="technologyJob" class="marg-item">
-              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="从事日期" prop="workDate" class="marg-item">
               <el-date-picker
                 v-model="ruleForm.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-                placeholder="请选择从事日期"
+                placeholder="请选择从事日期" style="width: 100%;"
               />
             </el-form-item>
-            <el-form-item label="是否技术考核" prop="technologyExam" class="marg-item">
-              <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'">
+            <el-form-item label="是否技术考核" prop="technologyExam" class="marg-item" style="width: 100%;">
+              <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -475,17 +476,17 @@
               <el-input ref="cardRef" v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" @blur="getBirthday" />
             </el-form-item>
             <el-form-item label="文化程度" prop="education" class="marg-item">
-              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="行政职务" prop="administrationJob" class="marg-item">
-              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="是否主考人" prop="mainExaminer" class="marg-item">
-              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index 042636e..660f2b0 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -264,7 +264,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="性别" prop="meterStaff.sex">
-              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -273,21 +273,21 @@
         <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-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -296,7 +296,7 @@
         <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-select v-if="title === '详情'" v-model="meterStaff.deptId" disabled style="width: 100%;">
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
               <com-tree-select
@@ -304,6 +304,7 @@
                 ref="selectTreeRef" v-model="meterStaff.deptId" :options="PubListTree"
                 placeholder="选择组织机构"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -316,7 +317,7 @@
             <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="请选择从事日期"
+                placeholder="请选择从事日期" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -347,7 +348,7 @@
             <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="请选择发证日期"
+                placeholder="请选择发证日期" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -355,7 +356,7 @@
             <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="请选择有效日期"
+                placeholder="请选择有效日期" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 178fc12..d0116f3 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -3,7 +3,7 @@
 import type { FormInstance, FormRules } from 'element-plus'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
+const formLabelWidth = '110px'
 const form = reactive({
   certificateNo: '', // 证书号
   certificateName: '', // 证书名称
@@ -71,32 +71,52 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`" width="40%">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
     >
-      <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
-        <el-input v-model="form.certificateNo" placeholder="证书号" />
-      </el-form-item>
-      <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
-        <el-input v-model="form.certificateName" placeholder="证书名称" />
-      </el-form-item>
-      <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
-        <el-input v-model="form.certificateCompany" placeholder="发证单位" />
-      </el-form-item>
-      <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
-        <el-date-picker
-          v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择发证日期"
-        />
-      </el-form-item>
-      <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-        <el-date-picker
-          v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择有效日期"
-        />
-      </el-form-item>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
+            <el-input v-model="form.certificateNo" placeholder="证书号" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
+            <el-input v-model="form.certificateName" placeholder="证书名称" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
+            <el-input v-model="form.certificateCompany" placeholder="发证单位" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
+            <el-date-picker
+              v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择发证日期" style="width: 100%;"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+            <el-date-picker
+              v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择有效日期" style="width: 100%;"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <template #footer>
       <span class="dialog-footer">
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
index 5e20d1b..10b0deb 100644
--- a/src/views/measure/person/components/personListDialog.vue
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -1,8 +1,11 @@
 <!-- 计量人员列表弹窗 -->
 <script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
 import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import { getDeptTreeList } from '@/api/system/dept'
-import type { TreeStructure } from '@/views/system/user/user-interface'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -10,7 +13,7 @@
   staffNo: '', // 人员编号
   name: '', // 姓名
   deptId: '', // 所在部门
-  limit: 5,
+  limit: 10,
   offset: 1,
 })
 const loadingTable = ref<boolean>(false)
@@ -32,20 +35,22 @@
   },
 ])
 // 获取部门
-const deptIdList = ref<TreeStructure[]>([])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const deptIdList = ref([])
 const getDeptList = () => {
   getDeptTreeList().then((res) => {
-    deptIdList.value = res.data
+    deptIdList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
 const fetchData = () => {
-  select.value = ''
+  select.value = -1
   getStaffList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.records
       total.value = Number(res.data.total)
-      console.log(list.value, 'list')
     }
   })
 }
@@ -53,6 +58,7 @@
 const search = () => {
   fetchData()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   listQuery.value = {
@@ -62,6 +68,7 @@
     limit: 10,
     offset: 1,
   }
+  selectTreeRef.value.clearSelected()
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -76,18 +83,24 @@
 }
 // 点击保存
 const submitForm = () => {
-  const person = list.value.filter((item, index) => index == select.value)[0]
-  console.log(person, 'person')
-  getStaffDetail(person).then((res) => {
-    if (res.code === 200) {
-      emits('add', res.data)
-      dialogFormVisible.value = false
-    }
-  })
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    getStaffDetail(person).then((res) => {
+      if (res.code === 200) {
+        emits('add', res.data)
+        dialogFormVisible.value = false
+        reset()
+      }
+    })
+  }
+  else {
+    ElMessage.warning('请先选择人员')
+  }
 }
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
+  reset()
 }
 // 初始化
 const initDialog = () => {
@@ -99,39 +112,45 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员" width="50%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable style="width: 150px;" />
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable style="width: 150px;" />
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
+        <!-- <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
           <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
+        </el-select> -->
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
-    <normal-table
-      :data="list" :total="total" :columns="columns" :query="listQuery"
-      :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>
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :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">
             {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
           </template>
         </el-table-column> -->
-      </template>
-    </normal-table>
+        </template>
+      </normal-table>
+    </div>
     <template #footer>
       <span class="dialog-footer">
         <el-button type="primary" @click="submitForm">确认</el-button>
diff --git a/src/views/measure/person/components/userListDialog.vue b/src/views/measure/person/components/userListDialog.vue
index dcd05b5..cd62a73 100644
--- a/src/views/measure/person/components/userListDialog.vue
+++ b/src/views/measure/person/components/userListDialog.vue
@@ -3,14 +3,16 @@
 import { ElMessage } from 'element-plus'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
-import type { TreeStructure } from '@/views/system/user/user-interface'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
 const listQuery = ref({
   keywords: '', // 姓名
   deptId: '', // 所在部门
-  limit: 5,
+  limit: 10,
   offset: 1,
 })
 const loadingTable = ref<boolean>(false)
@@ -31,11 +33,14 @@
     value: 'deptName',
   },
 ])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 // 获取部门
-const deptIdList = ref<TreeStructure[]>([])
+const deptIdList = ref([])
 const getDeptList = () => {
   getDeptTreeList().then((res) => {
-    deptIdList.value = res.data
+    deptIdList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
@@ -52,6 +57,7 @@
 const search = () => {
   fetchData()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   listQuery.value = {
@@ -60,6 +66,7 @@
     limit: 10,
     offset: 1,
   }
+  selectTreeRef.value.clearSelected()
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -74,11 +81,11 @@
 }
 // 点击保存
 const submitForm = () => {
-  console.log(select.value)
   if (select.value >= 0) {
     const person = list.value.filter((item, index) => index == select.value)[0]
     emits('add', person)
     dialogFormVisible.value = false
+    reset()
   }
   else {
     ElMessage.warning('请先选择人员')
@@ -87,9 +94,11 @@
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
+  reset()
 }
 // 初始化
 const initDialog = () => {
+  // reset()
   dialogFormVisible.value = true
   getDeptList()
   fetchData()
@@ -98,16 +107,20 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+  <el-dialog v-model="dialogFormVisible" title="选择人员" width="50%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
         <el-input v-model.trim="listQuery.keywords" placeholder="真实姓名" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable>
+        <!-- <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable>
           <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
+        </el-select> -->
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 9c6f65d..355473a 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -7,7 +7,9 @@
 // import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
-import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+// import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
@@ -16,7 +18,7 @@
   major: '', // 计量专业
   verifierCertificateNo: '', // 证书号
   certificateStatus: '', // 证书状态
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -52,10 +54,10 @@
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取所有部门
-const deptList = ref<DeptTreeNode[]>([])
+const deptList = ref([])
 const getDeptList = async () => {
   getDeptTreeList().then((res) => {
-    deptList.value = res.data
+    deptList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
@@ -126,6 +128,7 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   searchQuery.staffNo = ''
@@ -133,6 +136,7 @@
   searchQuery.deptId = ''
   searchQuery.major = ''
   searchQuery.verifierCertificateNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -160,10 +164,9 @@
     loading.close()
   })
 }
-// 打印
-const print = () => {
-
-}
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传图片
@@ -216,14 +219,18 @@
           <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+          <!-- <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
             <el-option
               v-for="item in deptList"
               :key="item.id"
               :label="item.name"
               :value="item.id"
             />
-          </el-select>
+          </el-select> -->
+          <com-tree-select
+            ref="selectTreeRef" v-model="searchQuery.deptId" :options="deptList"
+            placeholder="工作部门" :tree-props="deptProps"
+          />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.major" placeholder="计量专业" clearable class="w-50 m-2" />
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index af0a29d..2e0e7af 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -1,12 +1,15 @@
 <script lang="ts" setup name="ListSourceAdd">
-import { reactive, ref } from 'vue'
+/**
+ * 添加/编辑/详情溯源供方
+ */
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions, IformInline } from './list_interface'
+import type { IOptions, IformInline, traceSupplierPerson } from './list_interface'
 import { exportFile } from '@/utils/exportUtils'
 import { UploadFile } from '@/api/measure/file'
 import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+import { validatePhone } from '@/utils/validate'
 const props = defineProps({
   infoId: {
     type: String,
@@ -19,43 +22,45 @@
 })
 const emit = defineEmits(['close'])
 const formInline: Ref<IformInline> = ref({
-  businessContent: null,
-  supplierName: null,
-  supplierNo: null,
-  bankAccount: null,
-  bankAccountNumber: null,
-  bankName: null,
-  briefName: null,
-  businessScope: null,
-  companyAddress: null,
-  companyArea: null,
-  companyCity: null,
-  companyCountry: null,
-  companyProvince: null,
-  createTime: null,
-  director: null,
-  fax: null,
-  invoiceAddress: null,
-  invoiceArea: null,
-  invoiceCity: null,
-  invoiceCountry: null,
-  invoiceProvince: null,
-  mailbox: null,
-  minioFileName: null,
-  mobile: null,
-  phone: null,
-  postalCode: null,
-  remark: null,
-  taxNumber: null,
-  website: null,
+  id: '',
+  businessContent: '',
+  supplierName: '',
+  supplierNo: '',
+  bankAccount: '',
+  bankAccountNumber: '',
+  bankName: '',
+  briefName: '',
+  businessScope: '',
+  companyAddress: '',
+  companyArea: '',
+  companyCity: '',
+  companyCountry: '',
+  companyProvince: '',
+  createTime: '',
+  director: '',
+  fax: '',
+  invoiceAddress: '',
+  invoiceArea: '',
+  invoiceCity: '',
+  invoiceCountry: '',
+  invoiceProvince: '',
+  mailbox: '',
+  minioFileName: '',
+  mobile: '',
+  phone: '',
+  postalCode: '',
+  remark: '',
+  taxNumber: '',
+  website: '',
   traceSupplierPersonList: [],
 })
+const traceSupplierPersonList: Ref<traceSupplierPerson[]> = ref([])
 const columns = ref([
-  { text: '人员编号', value: 'personNo', show: true },
-  { text: '姓名', value: 'name', show: true },
-  { text: '工作部门', value: 'department', show: true },
-  { text: '职务', value: 'job', show: true },
-  { text: '联系方式', value: 'phone', show: true },
+  { text: '人员编号', value: 'personNo', required: false },
+  { text: '姓名', value: 'name', required: true },
+  { text: '工作部门', value: 'department', required: false },
+  { text: '职务', value: 'job', required: false },
+  { text: '联系方式', value: 'phone', required: true, reg: validatePhone },
 ])
 const ruleFormRef = ref<FormInstance>()
 const provinceList = ref<IOptions[]>([])
@@ -66,14 +71,17 @@
 const invoiceCityList = ref<IOptions[]>([])
 const areaInvoiceList = ref<IOptions[]>([])
 const dialogVisible = ref(false)
-const addPersonList = ref({
+// 人员对象
+const addPersonObj: traceSupplierPerson = {
+  id: '',
   personNo: '',
   name: '',
   department: '',
   job: '',
   phone: '',
-})
-const SelectionList = ref([])
+  editable: true,
+}
+const SelectionList: Ref<traceSupplierPerson[]> = ref([])
 const upload = ref<UploadInstance>()
 // 校验规则
 const rules = ref({
@@ -91,7 +99,7 @@
   })
 }
 // 表格选中
-const handleSelectionChange = (e: any) => {
+const handleSelectionChange = (e: traceSupplierPerson[]) => {
   SelectionList.value = e
 }
 // 获取公司地址省级
@@ -142,15 +150,33 @@
   })
 }
 // 点击增加行
-const addRoow = () => {
-  const object = {
-    personNo: '',
-    name: '',
-    department: '',
-    job: '',
-    phone: '',
+const addRow = () => {
+  // 检查上一行必填项
+  if (checkPersonList()) {
+    setAllRowReadable()
+    traceSupplierPersonList.value.push({ ...addPersonObj })
   }
-  formInline.value.traceSupplierPersonList.push(object)
+}
+// 检查人员列表
+function checkPersonList() {
+  for (let index = 0; index < traceSupplierPersonList.value.length; index++) {
+    const item = traceSupplierPersonList.value[index]
+    for (const prop of columns.value) {
+      // 检查必填
+      if (prop.required && !item[prop.value]) {
+        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
+        return false
+      }
+      // 验证正则
+      if (prop.reg && typeof prop.reg === 'function') {
+        if (!prop.reg(item[prop.value])) {
+          ElMessage.warning(`第${index + 1}行中${prop.text}输入不合法`)
+          return false
+        }
+      }
+    }
+  }
+  return true
 }
 // 点击关闭
 const handleClose = () => {
@@ -158,12 +184,12 @@
 }
 // 点击弹窗的完成追加到表格数组中
 const addPushList = () => {
-  formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonList.value)))
+  formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonObj.value)))
   handleClose()
 }
 // 删除行
 const deleteList = () => {
-  formInline.value.traceSupplierPersonList = formInline.value.traceSupplierPersonList.filter((item) => {
+  traceSupplierPersonList.value = traceSupplierPersonList.value.filter((item: traceSupplierPerson) => {
     return !SelectionList.value.includes(item)
   })
 }
@@ -261,10 +287,16 @@
     }
   })
 }
-// 双击表格显示输入框
-const dblclickName = (item: object) => {
-  console.log(item)
-  item.show = false
+// 双击行显示输入框
+const dblclickRow = (row: traceSupplierPerson) => {
+  setAllRowReadable()
+  row.editable = true
+}
+// 将所有人员信息列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of traceSupplierPersonList.value) {
+    item.editable = false
+  }
 }
 if (props.buttonType !== '新建') {
   getInfo()
@@ -273,7 +305,7 @@
 
 <template>
   <app-container>
-    <detail-page :title="`培训计划-${buttonType}`">
+    <detail-page :title="`溯源供方-${buttonType}`">
       <template #btns>
         <el-button
           type="primary"
@@ -617,39 +649,36 @@
       </el-form>
     </detail-page>
     <detail-block title="人员信息">
-      <template #btns>
-        <el-button
-          type="info"
-          :disabled="buttonType === '详情'"
-          @click="deleteList"
-        >
+      <template v-if="buttonType !== '详情'" #btns>
+        <el-button type="info" @click="deleteList">
           删除行
         </el-button>
-        <el-button
-          type="primary"
-          :disabled="buttonType === '详情'"
-          @click="addRoow"
-        >
+        <el-button type="primary" @click="addRow">
           增加行
         </el-button>
       </template>
       <el-table
-        :data="formInline.traceSupplierPersonList"
+        :data="traceSupplierPersonList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
+        @row-dblclick="dblclickRow"
       >
-        <el-table-column type="selection" width="55" />
+        <el-table-column type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column
           v-for="item in columns"
           :key="item.value"
           :prop="item.value"
           :label="item.text"
+          align="center"
         >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
           <template #default="scope">
-            <span v-show="item.show" style="color: gray;" @dblclick="dblclickName(item)">{{ scope.row[item.value] || `双击编辑${item.text}` }}</span>
-            <el-input v-show="!item.show" v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" @blur="item.show = true" />
+            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+            <el-input v-else v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index 530bcc4..c057976 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -24,6 +24,18 @@
   areaName: string
 }
 
+// 溯源供方人员
+export interface traceSupplierPerson {
+  id: number | string // id
+  job: string // 职务
+  department: string// 部门
+  name: string// 信命
+  personNo: string// 人员编号
+  phone: string// 联系方式
+  editable?: boolean // 是否可编辑
+  [key: string]: any
+}
+
 export interface IformInline {
   businessContent: string
   supplierName: string
@@ -55,5 +67,6 @@
   remark: string
   taxNumber: string
   website: string
-  traceSupplierPersonList: []
+  traceSupplierPersonList: traceSupplierPerson []
 }
+
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index e44001a..600eda1 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -32,11 +32,20 @@
   dialogVisible.value = true
   ruleForm.noticePublisher = userInfo.$state.name
   ruleForm.noticeCompany = userInfo.$state.deptName
-  ruleForm.noticeTime = dayjs().format('YYYY-MM-DD')
+  ruleForm.noticeTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
 }
 defineExpose({ initDialog })
+// 重置
+const resetDialog = () => {
+  ruleForm.noticeTime = ''
+  ruleForm.noticeSketch = ''
+  ruleForm.noticeContent = ''
+  ruleForm.minioFileName = ''
+  ruleForm.noticeTitle = ''
+}
 // 关闭弹窗
 const close = () => {
+  resetDialog()
   dialogVisible.value = false
   emits('resetData')
 }
@@ -63,6 +72,7 @@
 const resetForm = (formEl: FormInstance | undefined) => {
   // if (!formEl) { return }
   formEl?.resetFields()
+  resetDialog()
   dialogVisible.value = false
   emits('resetData')
 }
@@ -105,7 +115,7 @@
     uploadImage: {
       server: 'http://111.198.10.15:21409/minio/file/upload', // 配置图片上传地址
       maxFileSize: 2 * 1024 * 1024, // 10M  图片大小限制
-      fieldName: 'img', // 上传类型
+      fieldName: 'multipartFile', // 上传名字
       allowedFileTypes: [], // 选择文件时的类型限制，默认为 ['image/*'] 。如不想限制，则设置为 []
       // 自定义上传参数，传递图片时需要带一些参数过去写在这。参数会被添加到 formData 中，一起上传到服务端。
       // meta: {
@@ -154,9 +164,9 @@
     uploadVideo: {
       server: 'http://111.198.10.15:21409/minio/file/upload', // 配置视频上传地址
       maxFileSize: 5 * 1024 * 1024, // 5M  视频大小限制
-      fieldName: 'your-custom-name', // 上传类型
+      fieldName: 'multipartFile', // 上传名字
       // 最多可上传几个文件，默认为 5
-      maxNumberOfFiles: 3,
+      // maxNumberOfFiles: 1,
       allowedFileTypes: [], // 选择文件时的类型限制，默认为 ['video/*'] 。如不想限制，则设置为 []
       // 自定义上传参数，传递图片时需要带一些参数过去写在这。参数会被添加到 formData 中，一起上传到服务端。
       // meta: {
@@ -167,8 +177,8 @@
       //     Accept: 'text/x-json',
       //     otherKey: 'xxx'
       // },
-      metaWithUrl: false, // 将 meta 拼接到 url 参数中，默认 false
-      withCredentials: true, // 跨域是否传递 cookie ，默认为 false
+      // metaWithUrl: false, // 将 meta 拼接到 url 参数中，默认 false
+      // withCredentials: true, // 跨域是否传递 cookie ，默认为 false
       // 上传之前触发
       onBeforeUpload(file: any) {
         // file 选中的文件，格式如 { key: file }
@@ -222,9 +232,6 @@
     editorRef.value = editor // 一定要用 Object.seal() ，否则会报错
   })
 }
-const look = () => {
-  console.log(ruleForm.noticeContent)
-}
 const minioFileUrl = ref('')
 watch(() => ruleForm.minioFileName, (newVal) => {
   if (newVal) {
@@ -278,7 +285,7 @@
           />
           <editor
             v-model="ruleForm.noticeContent"
-            style="height: 150px; overflow-y: hidden;"
+            style="height: 300px; overflow-y: hidden;"
             :default-config="editorConfig"
             mode="default"
             @onCreated="onCreated"
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index 0926957..a4cdd5e 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -16,7 +16,7 @@
   noticePublisher: '', // 发布人
   noticeTime: '', // 发布时间
   noticeTitle: '', // 标题
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -27,6 +27,7 @@
     text: '编号',
     value: 'noticeNo',
     align: 'center',
+    width: '180',
   },
   {
     text: '标题',
@@ -37,6 +38,7 @@
     text: '发布人',
     value: 'noticePublisher',
     align: 'center',
+    width: '150',
   },
   {
     text: '内容描述',
@@ -47,11 +49,15 @@
     text: '发布时间',
     value: 'noticeTime',
     align: 'center',
+    width: '200',
   },
 ] // 表格
 const list = ref([]) // 表格数据
 // 获取通知公告列表
 const getNoticeList = () => {
+  if (!searchQuery.noticeTime) {
+    searchQuery.noticeTime = ''
+  }
   getNoticeeApi(searchQuery).then((res) => {
     total.value = res.data.total
     list.value = res.data.rows
diff --git a/src/views/system/notice/noticeDetail.vue b/src/views/system/notice/noticeDetail.vue
index 94468d4..da36bd8 100644
--- a/src/views/system/notice/noticeDetail.vue
+++ b/src/views/system/notice/noticeDetail.vue
@@ -1,5 +1,6 @@
 <!-- 通知公告详情弹窗 -->
 <script lang="ts" setup name="noticeDetail">
+import { Editor } from '@wangeditor/editor-for-vue'
 import type { noticeType } from './notice-interface'
 import { getNoticeDetail } from '@/api/system/notice'
 import { getPhotoUrl } from '@/api/system/tool'
@@ -52,6 +53,18 @@
     })
   }
 })
+// 编辑器配置
+const editorConfig = ref({
+  readOnly: true,
+})
+// 富文本实例对象
+const editorRef = shallowRef()
+const onCreated = (editor: any) => {
+  editorRef.value = editor
+  nextTick(() => {
+    editorRef.value = editor // 一定要用 Object.seal() ，否则会报错
+  })
+}
 </script>
 
 <template>
@@ -89,7 +102,18 @@
       </el-form-item>
       <el-form-item label="发布内容" prop="noticeContent">
         <!-- <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" disabled /> -->
-        <div style="border: 1px solid #dcdfe6;width: 100%;border-radius: 4px;padding: 12px;" v-html="ruleForm.noticeContent" />
+        <!-- <div style="border: 1px solid #dcdfe6;width: 100%;border-radius: 4px;padding: 12px;" v-html="ruleForm.noticeContent" ></div> -->
+        <div style="border: 1px solid #dcdfe6;width: 100%;border-radius: 4px;">
+          <editor
+            ref="editorRef"
+            v-model="ruleForm.noticeContent"
+            style="height: 300px; overflow-y: hidden;"
+            :default-config="editorConfig"
+            mode="default"
+            :disabled="true"
+            @onCreated="onCreated"
+          />
+        </div>
       </el-form-item>
       <el-form-item label="查看附件">
         <el-link v-if="ruleForm.minioFileName" :href="minioFileUrl" type="primary" target="_blank">
diff --git a/src/views/system/tool/autograph/addDDialog.vue b/src/views/system/tool/autograph/addDDialog.vue
index e39b706..daadd9b 100644
--- a/src/views/system/tool/autograph/addDDialog.vue
+++ b/src/views/system/tool/autograph/addDDialog.vue
@@ -186,7 +186,7 @@
         <el-input v-model.trim="ruleForm.signDesc" placeholder="签名描述" :disabled="title === '详情'" />
       </el-form-item>
       <el-form-item label="可使用人" prop="userIdList">
-        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'">
+        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'" style="width: 100%;">
           <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </el-form-item>
@@ -198,7 +198,7 @@
         <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px', 'margin-top': ruleForm.minioFileName === '' ? '0px' : '56px' }" @click="upload">
           {{ ruleForm.minioFileName === '' ? '上传' : '更换图片' }}
         </el-button>
-        <input v-show="title === '123'" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <input v-show="title === '123'" ref="fileRef" type="file" accept="image/*" @change="onFileChange">
       </el-form-item>
     </el-form>
     <template #footer>
diff --git a/src/views/system/tool/autograph/autograph.vue b/src/views/system/tool/autograph/autograph.vue
index ac9f000..d3c6f81 100644
--- a/src/views/system/tool/autograph/autograph.vue
+++ b/src/views/system/tool/autograph/autograph.vue
@@ -15,7 +15,7 @@
   signName: '', // 名称
   signDirector: '', // 负责人
   createTime: '', // 创建时间
-  limit: 10,
+  limit: 20,
   offset: 1,
   signType: '',
 }) // 查询参数
@@ -38,6 +38,9 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.createTime) {
+    searchQuery.createTime = ''
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -168,10 +171,10 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model="searchQuery.signNo" placeholder="签章编号" clearable class="w-50 m-2 normal-input" />
+        <el-input v-model="searchQuery.signNo" placeholder="签名编号" clearable class="w-50 m-2 normal-input" />
       </search-item>
       <search-item>
-        <el-input v-model="searchQuery.signName" placeholder="签章名称" clearable class="w-50 m-2 normal-input" />
+        <el-input v-model="searchQuery.signName" placeholder="签名名称" clearable class="w-50 m-2 normal-input" />
       </search-item>
       <search-item>
         <el-input v-model="searchQuery.signDirector" placeholder="负责人" clearable class="w-50 m-2 normal-input" />
diff --git a/src/views/system/tool/certificate/addDDialog.vue b/src/views/system/tool/certificate/addDDialog.vue
index 2721bf8..0fdec28 100644
--- a/src/views/system/tool/certificate/addDDialog.vue
+++ b/src/views/system/tool/certificate/addDDialog.vue
@@ -185,7 +185,7 @@
         <el-input v-model.trim="ruleForm.templateDesc" placeholder="模板描述" :disabled="title === '详情'" />
       </el-form-item>
       <el-form-item label="可使用人" prop="userIdList">
-        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'">
+        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'" style="width: 100%;">
           <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </el-form-item>
diff --git a/src/views/system/tool/certificate/certificate.vue b/src/views/system/tool/certificate/certificate.vue
index 9787116..a2468de 100644
--- a/src/views/system/tool/certificate/certificate.vue
+++ b/src/views/system/tool/certificate/certificate.vue
@@ -15,7 +15,7 @@
   templateName: '', // 名称
   templateCreator: '', // 负责人
   createTime: '', // 创建时间
-  limit: 10,
+  limit: 20,
   offset: 1,
   templateType: '',
 }) // 查询参数
@@ -38,6 +38,9 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.createTime) {
+    searchQuery.createTime = ''
+  }
   templatePage(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows

diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index bb58885..2959118 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -53,3 +53,64 @@
   }
   return true
 }
+
+/**
+ * 验证小写字母
+ * @param str
+ * @returns
+ */
+export function validateLowerCase(str: string) {
+  const reg = /^[a-z]+$/
+  return reg.test(str)
+}
+
+/* 验证大写字母 */
+export function validateUpperCase(str: string) {
+  const reg = /^[A-Z]+$/
+  return reg.test(str)
+}
+
+/* 验证大小写字母 */
+export function validateAlphabets(str: string) {
+  const reg = /^[A-Za-z]+$/
+  return reg.test(str)
+}
+
+/**
+ * 验证邮箱
+ * @param email
+ * @returns {boolean}
+ */
+export function validateEmail(email: string) {
+  const re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
+  return re.test(email)
+}
+
+/**
+ * 验证手机号
+ * @param phone
+ * @returns {boolean}
+ */
+export function validateMobile(phone: string) {
+  const re = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/
+  return re.test(phone)
+}
+
+/**
+ * 校验身份证号
+ * @param value
+ * @returns
+ */
+export function validateIdCardNo(value: string) {
+  const re = /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/
+  return re.test(value)
+}
+/**
+ *
+ * @param value 验证电话号码
+ * @returns
+ */
+export function validatePhone(value: string) {
+  const re = /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/
+  return re.test(value)
+}
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 1c2405e..bca0958 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,13 +1,46 @@
-<script lang="ts" setup name="borrowHandle">
-// 逻辑代码
+<!-- 设备借用处理 -->
+<script lang="ts" setup name="borrowApply">
+import list from './components/handleList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '待借用', comp: list },
+  { name: '已借用', comp: list },
+  { name: '已归还', comp: list },
+])
+const current = ref('待借用')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用处理
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 03d414b..c5771f7 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,13 +1,50 @@
+<!-- 设备借用申请 -->
 <script lang="ts" setup name="borrowApply">
-// 逻辑代码
+import list from './components/applyList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '全部', comp: list },
+  { name: '草稿箱', comp: list },
+  { name: '待审批', comp: list },
+  { name: '审批中', comp: list },
+  { name: '已通过', comp: list },
+  { name: '未通过', comp: list },
+  { name: '已取消', comp: list },
+])
+const current = ref('全部')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用申请
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
new file mode 100644
index 0000000..052f3ce
--- /dev/null
+++ b/src/views/device/borrow/components/applyList.vue
@@ -0,0 +1,328 @@
+<script lang="ts" setup name="borrowApplyList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '文件号',
+    value: 'fileNo',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '类别',
+    value: 'catergory',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '李四',
+      time: '2020-12-14 00:00:00',
+      status: '未通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const approveRef = ref()
+// 同意
+const agree = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '1',
+  })
+}
+// 驳回
+const reject = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '3',
+  })
+}
+// 拒绝
+const refuse = (row: any) => {
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
+}
+// 取消
+const cancel = (rowrow: any) => {
+  ElMessageBox.confirm(
+    '确认取消吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" @click="addBtn" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="agree(row)">
+                  同意
+                </el-button>
+                <el-button size="small" type="primary" link @click="reject(row)">
+                  驳回
+                </el-button>
+                <el-button size="small" type="primary" link @click="refuse(row)">
+                  拒绝
+                </el-button>
+                <el-button size="small" type="primary" link @click="cancel(row)">
+                  取消
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/components/approvalActionDialog.vue b/src/views/device/borrow/components/approvalActionDialog.vue
new file mode 100644
index 0000000..214876c
--- /dev/null
+++ b/src/views/device/borrow/components/approvalActionDialog.vue
@@ -0,0 +1,104 @@
+<!-- 审批操作弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
+const dialogVisibleApprove = ref(false)
+const form = reactive({
+  radio: '1',
+})
+const ruleFormRef = ref<FormInstance>()
+const rules = reactive<FormRules>({
+})
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const approvetime = ref('') // 审批时间
+const initDialog = (row: any) => {
+  dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
+}
+defineExpose({ initDialog })
+
+// 点击保存
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      dialogVisibleApprove.value = false
+      emits('resetData')
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  formEl.resetFields()
+  dialogVisibleApprove.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
+    <el-form
+      ref="ruleFormRef" :model="form"
+      :rules="rules" label-width="110px"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人">
+            <el-input disabled :value="userInfo.$state.name" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间">
+            <el-input disabled :value="approvetime" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
+        <el-button @click="resetForm(ruleFormRef)">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
new file mode 100644
index 0000000..cfda00a
--- /dev/null
+++ b/src/views/device/borrow/components/handleList.vue
@@ -0,0 +1,281 @@
+<script lang="ts" setup name="borrowHandleList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '申请编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'dept',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      dept: '顶级',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      dept: '徐州分中心',
+      user: '里斯',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+const borrow = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="borrow(row)">
+                  借用
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/addRow.vue b/src/views/device/standingBook/components/addRow.vue
index 1678cdb..07b03d1 100644
--- a/src/views/device/standingBook/components/addRow.vue
+++ b/src/views/device/standingBook/components/addRow.vue
@@ -5,7 +5,7 @@
 import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
+const formLabelWidth = '110px'
 const form = ref({})
 const formTable = ref([
   {
@@ -91,108 +91,188 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`">
+  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
     >
       <div v-if="name === '周检记录'">
-        <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录表编号" />
-        </el-form-item>
-        <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录人" />
-        </el-form-item>
-        <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="检定日期"
-          />
-        </el-form-item>
-        <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="有效日期"
-          />
-        </el-form-item>
-        <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="送检人" />
-        </el-form-item>
-        <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录表编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="检定日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="有效日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="送检人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '状态变更记录'">
-        <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="状态类型" clearable>
-            <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="结束日期"
-          />
-        </el-form-item>
-        <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="申请人" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="状态类型" clearable style="width: 100%;">
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="申请人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '使用记录'">
-        <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用人" />
-        </el-form-item>
-        <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用部门" />
-        </el-form-item>
-        <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="使用类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用结束日期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用部门" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="使用类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '检定证书'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="证书类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书出具日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书有效期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
     </el-form>
     <template #footer>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 5f7b347..9a9f798 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -352,7 +352,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -376,7 +376,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -391,7 +391,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -404,14 +404,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -434,7 +434,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -443,20 +443,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -480,23 +480,23 @@
               <com-tree-select
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -507,10 +507,10 @@
             <el-form-item label="检定部门" prop="mesureDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -520,7 +520,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -529,13 +529,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -544,21 +544,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -578,14 +578,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -594,14 +594,14 @@
         <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-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -669,7 +669,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index fc3fd54..d9d4514 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -199,6 +199,8 @@
     useDeptList.value = toTreeList(res.data, '0', true)
   })
 }
+const selectTreeRef1 = ref()
+const selectTreeRef2 = ref()
 // 重置
 const resetDATA = () => {
   ruleForm.value = {
@@ -254,6 +256,10 @@
     isStandardSupportEquipment: '', //		是否标准配套设备
     id: '',
   }
+  if (title.value !== '详情') {
+    selectTreeRef1.value.clearSelected()
+    selectTreeRef2.value.clearSelected()
+  }
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
@@ -378,7 +384,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -402,7 +408,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -416,8 +422,7 @@
             <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"
+                :placeholder="title === '详情' ? '' : '出厂年月'" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -430,14 +435,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -460,7 +465,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -469,20 +474,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -505,24 +510,26 @@
             <el-form-item label="使用部门" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
+                ref="selectTreeRef2"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -536,10 +543,12 @@
               </el-select> -->
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                ref="selectTreeRef1"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -549,7 +558,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -558,13 +567,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -573,21 +582,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -607,14 +616,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -624,14 +633,14 @@
           <el-col :span="6">
             <el-form-item label="资本来源" prop="capitalSource">
               <!-- <el-input v-model.trim="ruleForm.capitalSource" placeholder="资本来源" :disabled="title === '详情'" /> -->
-              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -699,7 +708,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f653095..f4229a6 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -147,19 +147,17 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
-  setTimeout(() => {
-    list.value = [
-      {
-        equipmentNo: 123,
-        equipmentName: 'test',
-        modelNo: '001',
-        usePersonName: '张三',
-        validDate: '2022-12-12 00:00:00',
-        useDeptName: '顶级',
-      },
-    ]
-    total.value = 1
-  }, 1000)
+  list.value = [
+    {
+      equipmentNo: 123,
+      equipmentName: 'test',
+      modelNo: '001',
+      usePersonName: '张三',
+      validDate: '2022-12-12 00:00:00',
+      useDeptName: '顶级',
+    },
+  ] as any
+  total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -220,9 +218,11 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -300,13 +300,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.mesureType" class="m-2 normal-select" placeholder="检定方式" clearable>
+          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable>
             <el-option
               v-for="item in mesureTypeList"
               :key="item.id"
@@ -316,7 +316,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.managerState" class="m-2 normal-select" placeholder="管理状态" clearable>
+          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable>
             <el-option
               v-for="item in managerStateList"
               :key="item.id"
@@ -327,8 +327,9 @@
         </search-item>
         <search-item>
           <com-tree-select
+            ref="selectTreeRef"
             v-model="searchQuery.useDept" :options="useDeptList" placeholder="使用部门"
-            :tree-props="deptProps" style="width: 150px;"
+            :tree-props="deptProps"
           />
         </search-item>
         <search-item>
@@ -336,11 +337,10 @@
             v-model="searchQuery.validDate" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="有效日期"
             class="normal-date"
-            style="width: 150px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.abc" class="m-2 normal-select" placeholder="ABC" clearable>
+          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable>
             <el-option
               v-for="item in abcList"
               :key="item.id"
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 78a3800..4c31a94 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -2,9 +2,10 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/fixedAssetsAdd.vue'
-import type { fixedAssetsType } from './standingBook-interface'
+import type { fixedAssetsType, selectType } from './standingBook-interface'
 import { exportFile } from '@/utils/exportUtils'
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
+import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   assetNo: '', // 固定编号
@@ -50,7 +51,7 @@
   },
   {
     text: '设备类型',
-    value: 'assetTypeName',
+    value: 'equipmentTypeName',
     width: '150',
     align: 'center',
   },
@@ -102,6 +103,7 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+const equipmentCategoryList = ref<selectType[]>([]) // 设备类别
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
@@ -242,6 +244,10 @@
 }
 onMounted(() => {
   getList()
+  // 获取设备类别
+  getDictByCode('equipmentCategory').then((response) => {
+    equipmentCategoryList.value = response.data
+  })
 })
 </script>
 
@@ -265,7 +271,10 @@
           <el-input v-model="searchQuery.equipmentSpecifications" placeholder="设备规格" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-select v-model="searchQuery.equipmentCategory" placeholder="设备类别" clearable>
+            <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+          </el-select>
         </search-item>
       </search-area>
       <table-container>
diff --git a/src/views/device/stateManage/components/addRow.vue b/src/views/device/stateManage/components/addRow.vue
new file mode 100644
index 0000000..3ba82d6
--- /dev/null
+++ b/src/views/device/stateManage/components/addRow.vue
@@ -0,0 +1,160 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { listPageApi } from '@/api/device/standingBook'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  limit: 10,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '出厂编号',
+    value: 'manufacturingNo',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+  },
+])
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listPageApi(listQuery.value as any).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map(item => ({ ...item, checked: '' }))
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    equipmentName: '', // 姓名
+    equipmentNo: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const checkedArr = list.value.filter(item => item.checked !== '')
+  if (checkedArr.length) {
+    console.log(checkedArr, '选中的设备')
+    emits('add', checkedArr)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择设备')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns as any" :query="listQuery"
+        :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-checkbox v-model="scope.row.checked" :label="scope.$index" size="large" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-checkbox__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index 56417d6..214876c 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -47,38 +47,45 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="30%">
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
-      :rules="rules"
+      :rules="rules" label-width="110px"
     >
-      <el-form-item label="审批意见">
-        <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
-        <el-radio-group v-model="form.radio">
-          <el-radio label="1">
-            同意
-          </el-radio>
-          <el-radio label="2">
-            拒绝
-          </el-radio>
-          <el-radio label="3">
-            驳回
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="审批结论">
-        <el-input
-          :rows="4"
-          type="textarea"
-        />
-      </el-form-item>
       <el-row :gutter="24">
-        <el-col :span="10">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="审批人">
             <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
-        <el-col :span="14">
+        <el-col :span="12">
           <el-form-item label="审批时间">
             <el-input disabled :value="approvetime" />
           </el-form-item>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index e74d70e..2003e31 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -1,7 +1,8 @@
 <!-- 新增或详情弹窗 -->
-<script lang="ts" setup name="addNotice">
+<script lang="ts" setup name="add">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
+import addRow from './addRow.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
@@ -16,6 +17,7 @@
 const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const name = ref('')
+const borrowList = ref([])
 const ruleForm = ref({
   assetNo: '', // 资产编号
   assetType: '', // 资产类型
@@ -357,10 +359,86 @@
     isShowCalibration.value = true
   }
 })
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerLevelName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+  },
+])
+const addRowRef = ref()
+// 添加行
+const addRowBtn = () => {
+  addRowRef.value.initDialog({ title: '添加' })
+}
+// 删除行
+const removeRowBtn = () => {
+  const removeArr = borrowList.value.filter(item => item.remove !== '')
+  if (removeArr.length) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      borrowList.value = borrowList.value.filter(item => item.remove === '')
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 借用设备列表添加
+const addRowMethods = (row) => {
+  row.forEach((element) => {
+    borrowList.value.push({ ...element, remove: '' })
+  })
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
     <detail-page :title="`${name}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
@@ -378,15 +456,16 @@
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder="">
+              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -430,7 +509,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -454,28 +533,56 @@
         </el-row>
       </el-form>
     </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>
+    <div>
+      <detail-block title="借用设备列表">
+        <template #btns>
+          <el-button type="primary" @click="addRowBtn">
+            添加行
+          </el-button>
+          <el-button type="info" @click="removeRowBtn">
+            删除行
+          </el-button>
+        </template>
+        <normal-table
+          :data="borrowList" :total="1" :columns="columns as any"
+        >
+          <template #preColumns>
+            <el-table-column label="选择" width="55" align="center">
+              <template #default="scope">
+                <el-checkbox v-model="scope.row.remove" :label="scope.$index" size="large" />
+              </template>
+            </el-table-column>
+            <el-table-column label="序号" width="60" align="center">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </detail-block>
+      <detail-block 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>
+    </div>
   </app-container>
 </template>
 
@@ -484,6 +591,10 @@
   background-color: #fff;
 }
 
+:deep(.el-checkbox__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,
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index aaaaf61..d588b8d 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,6 +1,7 @@
 <script lang="ts" setup name="bench">
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
+import type { trainLogStatistic } from './bench-interface'
 import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
 import { getPlanList } from '@/api/system/plan'
 import { listPageApi } from '@/api/measure/file'
@@ -132,15 +133,19 @@
     account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
+    const result: trainLogStatistic = res.data
+    const notQualified: number = Number(result.trainCount) - result.qualifiedCount
+    const qualifiedRate = ((result.qualifiedCount / result.trainCount) * 100).toFixed(2) // 合格率
+    const notQualifiedRate = ((notQualified / result.trainCount) * 100).toFixed(2) // 不合格率
     TrainLogSList.value = [
-      { name: `合格     ${res.data.qualified}-${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
-      { name: `不合格   ${res.data.notQualified}- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+      { name: `合   格   ${result.qualifiedCount}-${qualifiedRate}%`, value: result.qualifiedCount },
+      { name: `不合格   ${notQualified}- ${notQualifiedRate}%`, value: notQualified },
     ]
     TrainLogTitle.value = res.data.trainCount
   }).catch((_) => {
     // 处理异常
     TrainLogSList.value = [
-      { name: '合格     0 - 50%', value: 0 },
+      { name: '合   格   0 - 50%', value: 0 },
       { name: '不合格   0 - 50%', value: 0 },
     ]
     TrainLogTitle.value = 0
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 9ef0b93..1ad577b 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -270,7 +270,7 @@
               <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="6">
             <el-form-item label="名称" prop="fileName">
               <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
             </el-form-item>
@@ -279,13 +279,14 @@
         <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" class="fill-input" disabled>
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled style="width: 100%;">
                 <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="请选择发布单位"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -295,6 +296,7 @@
                 v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -311,12 +313,13 @@
                 v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人" prop="createUserId">
-              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index b45fbc3..542b284 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -26,7 +26,7 @@
   createUser: '', // 创建人
   createTime: '', // 创建
   approvalStatus: props.value, // 审批状态
-  limit: 10,
+  limit: 20,
   offset: 1,
   fileType: '', // 类型
   formId: '',
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 7d4724b..e54ddf5 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -26,7 +26,7 @@
   fileCode: '', // 文件号
   effectiveTime: '', // 实施时间
   effectiveStatus: '', // 实施状态
-  limit: 10,
+  limit: 20,
   offset: 1,
   fileType: '', // 类型
 }) // 查询参数
@@ -75,13 +75,19 @@
 const getStatus = () => {
   getDictByCode('effectiveStatus').then((res) => {
     if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
+      effectiveStatusSelect.value = [...res.data, { name: '全部', value: '', id: 'quanbu' }]
     }
   })
 }
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.publishTime) {
+    searchQuery.publishTime = ''
+  }
+  if (!searchQuery.effectiveTime) {
+    searchQuery.effectiveTime = ''
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -252,13 +258,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" />
         </search-item>
         <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
@@ -274,20 +280,16 @@
           <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: 185px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
             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: 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" placeholder="实施状态" clearable>
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index 5ca3275..a95c665 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -505,21 +505,21 @@
         <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] === '详情'" @change="directorChange">
+              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;" @change="directorChange">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.name" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
-              <el-select v-model="ruleForm.technologyJob" :placeholder="title.split('-')[2] === '详情' ? '' : '技术职务'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.technologyJob" :placeholder="title.split('-')[2] === '详情' ? '' : '技术职务'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;">
                 <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="administrationJob">
-              <el-select v-model="ruleForm.administrationJob" :placeholder="title.split('-')[2] === '详情' ? '' : '行政职务'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.administrationJob" :placeholder="title.split('-')[2] === '详情' ? '' : '行政职务'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index aac1ef2..11d6d0a 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -22,7 +22,7 @@
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
-  limit: 10,
+  limit: 20,
   offset: 1,
   organizeType: '', // 类型
   createTime: '', // 创建时间
@@ -118,6 +118,9 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.createTime) {
+    searchQuery.createTime = ''
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows.map(item => ({ ...item, createTime: item.createTime.split(' ')[0] }))
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 3f472eb..bc5d9d4 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -7,7 +7,9 @@
 // import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
-import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+// import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const props = defineProps({
   isRemind: {
     type: Boolean,
@@ -78,11 +80,14 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 // 获取所有部门
-const deptList = ref<DeptTreeNode[]>([])
+const deptList = ref([])
 const getDeptList = async () => {
   getDeptTreeList().then((res) => {
-    deptList.value = res.data
+    deptList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
@@ -177,6 +182,7 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   searchQuery.staffNo = ''
@@ -184,6 +190,7 @@
   searchQuery.deptId = ''
   searchQuery.certificateStatus = ''
   searchQuery.verifierCertificateNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -212,10 +219,6 @@
     loading.close()
   })
 }
-// 打印
-const print = () => {
-
-}
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传图片
@@ -268,20 +271,24 @@
           <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+          <!-- <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
             <el-option
               v-for="item in deptList"
               :key="item.id"
               :label="item.name"
               :value="item.id"
             />
-          </el-select>
+          </el-select> -->
+          <com-tree-select
+            ref="selectTreeRef" v-model="searchQuery.deptId" :options="deptList"
+            placeholder="工作部门" :tree-props="deptProps"
+          />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况">
+          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况" clearable>
             <el-option
               v-for="item in certificateStatusList"
               :key="item.id"
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 4352604..5a5f036 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -389,10 +389,10 @@
           关闭
         </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">
-            <el-form-item prop="minioFileName" label-width="70px">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item prop="minioFileName">
               <el-upload
                 class="avatar-uploader"
                 :show-file-list="false"
@@ -423,23 +423,24 @@
               <el-date-picker
                 v-model="ruleForm.birthday" type="date" format="YYYY-MM" value-format="YYYY-MM"
                 placeholder="出生年月" :disabled="title === '详情'"
+                style="width: 100%;"
               />
             </el-form-item>
             <el-form-item label="工作部门" prop="deptId" class="marg-item">
-              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled>
+              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled style="width: 100%;">
                 <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="ruleForm.deptId" :options="PubListTree"
-                placeholder="选择组织机构" :tree-props="deptProps"
+                placeholder="选择组织机构" :tree-props="deptProps" style="width: 100%;"
               />
             </el-form-item>
             <el-form-item label="计量专业" prop="major" class="marg-item">
               <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
             </el-form-item>
             <el-form-item label="是否特操人" prop="specialOperator" class="marg-item">
-              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -449,23 +450,23 @@
               <el-input v-model.trim="ruleForm.staffNo" placeholder="系统自动生成" disabled />
             </el-form-item>
             <el-form-item label="性别" prop="sex" class="marg-item">
-              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="技术职务" prop="technologyJob" class="marg-item">
-              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="从事日期" prop="workDate" class="marg-item">
               <el-date-picker
                 v-model="ruleForm.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-                placeholder="请选择从事日期"
+                placeholder="请选择从事日期" style="width: 100%;"
               />
             </el-form-item>
-            <el-form-item label="是否技术考核" prop="technologyExam" class="marg-item">
-              <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'">
+            <el-form-item label="是否技术考核" prop="technologyExam" class="marg-item" style="width: 100%;">
+              <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -475,17 +476,17 @@
               <el-input ref="cardRef" v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" @blur="getBirthday" />
             </el-form-item>
             <el-form-item label="文化程度" prop="education" class="marg-item">
-              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="行政职务" prop="administrationJob" class="marg-item">
-              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="是否主考人" prop="mainExaminer" class="marg-item">
-              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index 042636e..660f2b0 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -264,7 +264,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="性别" prop="meterStaff.sex">
-              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -273,21 +273,21 @@
         <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-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -296,7 +296,7 @@
         <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-select v-if="title === '详情'" v-model="meterStaff.deptId" disabled style="width: 100%;">
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
               <com-tree-select
@@ -304,6 +304,7 @@
                 ref="selectTreeRef" v-model="meterStaff.deptId" :options="PubListTree"
                 placeholder="选择组织机构"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -316,7 +317,7 @@
             <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="请选择从事日期"
+                placeholder="请选择从事日期" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -347,7 +348,7 @@
             <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="请选择发证日期"
+                placeholder="请选择发证日期" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -355,7 +356,7 @@
             <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="请选择有效日期"
+                placeholder="请选择有效日期" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 178fc12..d0116f3 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -3,7 +3,7 @@
 import type { FormInstance, FormRules } from 'element-plus'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
+const formLabelWidth = '110px'
 const form = reactive({
   certificateNo: '', // 证书号
   certificateName: '', // 证书名称
@@ -71,32 +71,52 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`" width="40%">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
     >
-      <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
-        <el-input v-model="form.certificateNo" placeholder="证书号" />
-      </el-form-item>
-      <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
-        <el-input v-model="form.certificateName" placeholder="证书名称" />
-      </el-form-item>
-      <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
-        <el-input v-model="form.certificateCompany" placeholder="发证单位" />
-      </el-form-item>
-      <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
-        <el-date-picker
-          v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择发证日期"
-        />
-      </el-form-item>
-      <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-        <el-date-picker
-          v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择有效日期"
-        />
-      </el-form-item>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
+            <el-input v-model="form.certificateNo" placeholder="证书号" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
+            <el-input v-model="form.certificateName" placeholder="证书名称" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
+            <el-input v-model="form.certificateCompany" placeholder="发证单位" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
+            <el-date-picker
+              v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择发证日期" style="width: 100%;"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+            <el-date-picker
+              v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择有效日期" style="width: 100%;"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <template #footer>
       <span class="dialog-footer">
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
index 5e20d1b..10b0deb 100644
--- a/src/views/measure/person/components/personListDialog.vue
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -1,8 +1,11 @@
 <!-- 计量人员列表弹窗 -->
 <script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
 import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import { getDeptTreeList } from '@/api/system/dept'
-import type { TreeStructure } from '@/views/system/user/user-interface'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -10,7 +13,7 @@
   staffNo: '', // 人员编号
   name: '', // 姓名
   deptId: '', // 所在部门
-  limit: 5,
+  limit: 10,
   offset: 1,
 })
 const loadingTable = ref<boolean>(false)
@@ -32,20 +35,22 @@
   },
 ])
 // 获取部门
-const deptIdList = ref<TreeStructure[]>([])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const deptIdList = ref([])
 const getDeptList = () => {
   getDeptTreeList().then((res) => {
-    deptIdList.value = res.data
+    deptIdList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
 const fetchData = () => {
-  select.value = ''
+  select.value = -1
   getStaffList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.records
       total.value = Number(res.data.total)
-      console.log(list.value, 'list')
     }
   })
 }
@@ -53,6 +58,7 @@
 const search = () => {
   fetchData()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   listQuery.value = {
@@ -62,6 +68,7 @@
     limit: 10,
     offset: 1,
   }
+  selectTreeRef.value.clearSelected()
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -76,18 +83,24 @@
 }
 // 点击保存
 const submitForm = () => {
-  const person = list.value.filter((item, index) => index == select.value)[0]
-  console.log(person, 'person')
-  getStaffDetail(person).then((res) => {
-    if (res.code === 200) {
-      emits('add', res.data)
-      dialogFormVisible.value = false
-    }
-  })
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    getStaffDetail(person).then((res) => {
+      if (res.code === 200) {
+        emits('add', res.data)
+        dialogFormVisible.value = false
+        reset()
+      }
+    })
+  }
+  else {
+    ElMessage.warning('请先选择人员')
+  }
 }
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
+  reset()
 }
 // 初始化
 const initDialog = () => {
@@ -99,39 +112,45 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员" width="50%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable style="width: 150px;" />
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable style="width: 150px;" />
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
+        <!-- <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
           <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
+        </el-select> -->
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
-    <normal-table
-      :data="list" :total="total" :columns="columns" :query="listQuery"
-      :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>
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :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">
             {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
           </template>
         </el-table-column> -->
-      </template>
-    </normal-table>
+        </template>
+      </normal-table>
+    </div>
     <template #footer>
       <span class="dialog-footer">
         <el-button type="primary" @click="submitForm">确认</el-button>
diff --git a/src/views/measure/person/components/userListDialog.vue b/src/views/measure/person/components/userListDialog.vue
index dcd05b5..cd62a73 100644
--- a/src/views/measure/person/components/userListDialog.vue
+++ b/src/views/measure/person/components/userListDialog.vue
@@ -3,14 +3,16 @@
 import { ElMessage } from 'element-plus'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
-import type { TreeStructure } from '@/views/system/user/user-interface'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
 const listQuery = ref({
   keywords: '', // 姓名
   deptId: '', // 所在部门
-  limit: 5,
+  limit: 10,
   offset: 1,
 })
 const loadingTable = ref<boolean>(false)
@@ -31,11 +33,14 @@
     value: 'deptName',
   },
 ])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 // 获取部门
-const deptIdList = ref<TreeStructure[]>([])
+const deptIdList = ref([])
 const getDeptList = () => {
   getDeptTreeList().then((res) => {
-    deptIdList.value = res.data
+    deptIdList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
@@ -52,6 +57,7 @@
 const search = () => {
   fetchData()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   listQuery.value = {
@@ -60,6 +66,7 @@
     limit: 10,
     offset: 1,
   }
+  selectTreeRef.value.clearSelected()
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -74,11 +81,11 @@
 }
 // 点击保存
 const submitForm = () => {
-  console.log(select.value)
   if (select.value >= 0) {
     const person = list.value.filter((item, index) => index == select.value)[0]
     emits('add', person)
     dialogFormVisible.value = false
+    reset()
   }
   else {
     ElMessage.warning('请先选择人员')
@@ -87,9 +94,11 @@
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
+  reset()
 }
 // 初始化
 const initDialog = () => {
+  // reset()
   dialogFormVisible.value = true
   getDeptList()
   fetchData()
@@ -98,16 +107,20 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+  <el-dialog v-model="dialogFormVisible" title="选择人员" width="50%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
         <el-input v-model.trim="listQuery.keywords" placeholder="真实姓名" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable>
+        <!-- <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable>
           <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
+        </el-select> -->
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 9c6f65d..355473a 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -7,7 +7,9 @@
 // import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
-import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+// import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
@@ -16,7 +18,7 @@
   major: '', // 计量专业
   verifierCertificateNo: '', // 证书号
   certificateStatus: '', // 证书状态
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -52,10 +54,10 @@
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取所有部门
-const deptList = ref<DeptTreeNode[]>([])
+const deptList = ref([])
 const getDeptList = async () => {
   getDeptTreeList().then((res) => {
-    deptList.value = res.data
+    deptList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
@@ -126,6 +128,7 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   searchQuery.staffNo = ''
@@ -133,6 +136,7 @@
   searchQuery.deptId = ''
   searchQuery.major = ''
   searchQuery.verifierCertificateNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -160,10 +164,9 @@
     loading.close()
   })
 }
-// 打印
-const print = () => {
-
-}
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传图片
@@ -216,14 +219,18 @@
           <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+          <!-- <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
             <el-option
               v-for="item in deptList"
               :key="item.id"
               :label="item.name"
               :value="item.id"
             />
-          </el-select>
+          </el-select> -->
+          <com-tree-select
+            ref="selectTreeRef" v-model="searchQuery.deptId" :options="deptList"
+            placeholder="工作部门" :tree-props="deptProps"
+          />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.major" placeholder="计量专业" clearable class="w-50 m-2" />
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index af0a29d..2e0e7af 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -1,12 +1,15 @@
 <script lang="ts" setup name="ListSourceAdd">
-import { reactive, ref } from 'vue'
+/**
+ * 添加/编辑/详情溯源供方
+ */
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions, IformInline } from './list_interface'
+import type { IOptions, IformInline, traceSupplierPerson } from './list_interface'
 import { exportFile } from '@/utils/exportUtils'
 import { UploadFile } from '@/api/measure/file'
 import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+import { validatePhone } from '@/utils/validate'
 const props = defineProps({
   infoId: {
     type: String,
@@ -19,43 +22,45 @@
 })
 const emit = defineEmits(['close'])
 const formInline: Ref<IformInline> = ref({
-  businessContent: null,
-  supplierName: null,
-  supplierNo: null,
-  bankAccount: null,
-  bankAccountNumber: null,
-  bankName: null,
-  briefName: null,
-  businessScope: null,
-  companyAddress: null,
-  companyArea: null,
-  companyCity: null,
-  companyCountry: null,
-  companyProvince: null,
-  createTime: null,
-  director: null,
-  fax: null,
-  invoiceAddress: null,
-  invoiceArea: null,
-  invoiceCity: null,
-  invoiceCountry: null,
-  invoiceProvince: null,
-  mailbox: null,
-  minioFileName: null,
-  mobile: null,
-  phone: null,
-  postalCode: null,
-  remark: null,
-  taxNumber: null,
-  website: null,
+  id: '',
+  businessContent: '',
+  supplierName: '',
+  supplierNo: '',
+  bankAccount: '',
+  bankAccountNumber: '',
+  bankName: '',
+  briefName: '',
+  businessScope: '',
+  companyAddress: '',
+  companyArea: '',
+  companyCity: '',
+  companyCountry: '',
+  companyProvince: '',
+  createTime: '',
+  director: '',
+  fax: '',
+  invoiceAddress: '',
+  invoiceArea: '',
+  invoiceCity: '',
+  invoiceCountry: '',
+  invoiceProvince: '',
+  mailbox: '',
+  minioFileName: '',
+  mobile: '',
+  phone: '',
+  postalCode: '',
+  remark: '',
+  taxNumber: '',
+  website: '',
   traceSupplierPersonList: [],
 })
+const traceSupplierPersonList: Ref<traceSupplierPerson[]> = ref([])
 const columns = ref([
-  { text: '人员编号', value: 'personNo', show: true },
-  { text: '姓名', value: 'name', show: true },
-  { text: '工作部门', value: 'department', show: true },
-  { text: '职务', value: 'job', show: true },
-  { text: '联系方式', value: 'phone', show: true },
+  { text: '人员编号', value: 'personNo', required: false },
+  { text: '姓名', value: 'name', required: true },
+  { text: '工作部门', value: 'department', required: false },
+  { text: '职务', value: 'job', required: false },
+  { text: '联系方式', value: 'phone', required: true, reg: validatePhone },
 ])
 const ruleFormRef = ref<FormInstance>()
 const provinceList = ref<IOptions[]>([])
@@ -66,14 +71,17 @@
 const invoiceCityList = ref<IOptions[]>([])
 const areaInvoiceList = ref<IOptions[]>([])
 const dialogVisible = ref(false)
-const addPersonList = ref({
+// 人员对象
+const addPersonObj: traceSupplierPerson = {
+  id: '',
   personNo: '',
   name: '',
   department: '',
   job: '',
   phone: '',
-})
-const SelectionList = ref([])
+  editable: true,
+}
+const SelectionList: Ref<traceSupplierPerson[]> = ref([])
 const upload = ref<UploadInstance>()
 // 校验规则
 const rules = ref({
@@ -91,7 +99,7 @@
   })
 }
 // 表格选中
-const handleSelectionChange = (e: any) => {
+const handleSelectionChange = (e: traceSupplierPerson[]) => {
   SelectionList.value = e
 }
 // 获取公司地址省级
@@ -142,15 +150,33 @@
   })
 }
 // 点击增加行
-const addRoow = () => {
-  const object = {
-    personNo: '',
-    name: '',
-    department: '',
-    job: '',
-    phone: '',
+const addRow = () => {
+  // 检查上一行必填项
+  if (checkPersonList()) {
+    setAllRowReadable()
+    traceSupplierPersonList.value.push({ ...addPersonObj })
   }
-  formInline.value.traceSupplierPersonList.push(object)
+}
+// 检查人员列表
+function checkPersonList() {
+  for (let index = 0; index < traceSupplierPersonList.value.length; index++) {
+    const item = traceSupplierPersonList.value[index]
+    for (const prop of columns.value) {
+      // 检查必填
+      if (prop.required && !item[prop.value]) {
+        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
+        return false
+      }
+      // 验证正则
+      if (prop.reg && typeof prop.reg === 'function') {
+        if (!prop.reg(item[prop.value])) {
+          ElMessage.warning(`第${index + 1}行中${prop.text}输入不合法`)
+          return false
+        }
+      }
+    }
+  }
+  return true
 }
 // 点击关闭
 const handleClose = () => {
@@ -158,12 +184,12 @@
 }
 // 点击弹窗的完成追加到表格数组中
 const addPushList = () => {
-  formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonList.value)))
+  formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonObj.value)))
   handleClose()
 }
 // 删除行
 const deleteList = () => {
-  formInline.value.traceSupplierPersonList = formInline.value.traceSupplierPersonList.filter((item) => {
+  traceSupplierPersonList.value = traceSupplierPersonList.value.filter((item: traceSupplierPerson) => {
     return !SelectionList.value.includes(item)
   })
 }
@@ -261,10 +287,16 @@
     }
   })
 }
-// 双击表格显示输入框
-const dblclickName = (item: object) => {
-  console.log(item)
-  item.show = false
+// 双击行显示输入框
+const dblclickRow = (row: traceSupplierPerson) => {
+  setAllRowReadable()
+  row.editable = true
+}
+// 将所有人员信息列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of traceSupplierPersonList.value) {
+    item.editable = false
+  }
 }
 if (props.buttonType !== '新建') {
   getInfo()
@@ -273,7 +305,7 @@
 
 <template>
   <app-container>
-    <detail-page :title="`培训计划-${buttonType}`">
+    <detail-page :title="`溯源供方-${buttonType}`">
       <template #btns>
         <el-button
           type="primary"
@@ -617,39 +649,36 @@
       </el-form>
     </detail-page>
     <detail-block title="人员信息">
-      <template #btns>
-        <el-button
-          type="info"
-          :disabled="buttonType === '详情'"
-          @click="deleteList"
-        >
+      <template v-if="buttonType !== '详情'" #btns>
+        <el-button type="info" @click="deleteList">
           删除行
         </el-button>
-        <el-button
-          type="primary"
-          :disabled="buttonType === '详情'"
-          @click="addRoow"
-        >
+        <el-button type="primary" @click="addRow">
           增加行
         </el-button>
       </template>
       <el-table
-        :data="formInline.traceSupplierPersonList"
+        :data="traceSupplierPersonList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
+        @row-dblclick="dblclickRow"
       >
-        <el-table-column type="selection" width="55" />
+        <el-table-column type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column
           v-for="item in columns"
           :key="item.value"
           :prop="item.value"
           :label="item.text"
+          align="center"
         >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
           <template #default="scope">
-            <span v-show="item.show" style="color: gray;" @dblclick="dblclickName(item)">{{ scope.row[item.value] || `双击编辑${item.text}` }}</span>
-            <el-input v-show="!item.show" v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" @blur="item.show = true" />
+            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+            <el-input v-else v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index 530bcc4..c057976 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -24,6 +24,18 @@
   areaName: string
 }
 
+// 溯源供方人员
+export interface traceSupplierPerson {
+  id: number | string // id
+  job: string // 职务
+  department: string// 部门
+  name: string// 信命
+  personNo: string// 人员编号
+  phone: string// 联系方式
+  editable?: boolean // 是否可编辑
+  [key: string]: any
+}
+
 export interface IformInline {
   businessContent: string
   supplierName: string
@@ -55,5 +67,6 @@
   remark: string
   taxNumber: string
   website: string
-  traceSupplierPersonList: []
+  traceSupplierPersonList: traceSupplierPerson []
 }
+
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index e44001a..600eda1 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -32,11 +32,20 @@
   dialogVisible.value = true
   ruleForm.noticePublisher = userInfo.$state.name
   ruleForm.noticeCompany = userInfo.$state.deptName
-  ruleForm.noticeTime = dayjs().format('YYYY-MM-DD')
+  ruleForm.noticeTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
 }
 defineExpose({ initDialog })
+// 重置
+const resetDialog = () => {
+  ruleForm.noticeTime = ''
+  ruleForm.noticeSketch = ''
+  ruleForm.noticeContent = ''
+  ruleForm.minioFileName = ''
+  ruleForm.noticeTitle = ''
+}
 // 关闭弹窗
 const close = () => {
+  resetDialog()
   dialogVisible.value = false
   emits('resetData')
 }
@@ -63,6 +72,7 @@
 const resetForm = (formEl: FormInstance | undefined) => {
   // if (!formEl) { return }
   formEl?.resetFields()
+  resetDialog()
   dialogVisible.value = false
   emits('resetData')
 }
@@ -105,7 +115,7 @@
     uploadImage: {
       server: 'http://111.198.10.15:21409/minio/file/upload', // 配置图片上传地址
       maxFileSize: 2 * 1024 * 1024, // 10M  图片大小限制
-      fieldName: 'img', // 上传类型
+      fieldName: 'multipartFile', // 上传名字
       allowedFileTypes: [], // 选择文件时的类型限制，默认为 ['image/*'] 。如不想限制，则设置为 []
       // 自定义上传参数，传递图片时需要带一些参数过去写在这。参数会被添加到 formData 中，一起上传到服务端。
       // meta: {
@@ -154,9 +164,9 @@
     uploadVideo: {
       server: 'http://111.198.10.15:21409/minio/file/upload', // 配置视频上传地址
       maxFileSize: 5 * 1024 * 1024, // 5M  视频大小限制
-      fieldName: 'your-custom-name', // 上传类型
+      fieldName: 'multipartFile', // 上传名字
       // 最多可上传几个文件，默认为 5
-      maxNumberOfFiles: 3,
+      // maxNumberOfFiles: 1,
       allowedFileTypes: [], // 选择文件时的类型限制，默认为 ['video/*'] 。如不想限制，则设置为 []
       // 自定义上传参数，传递图片时需要带一些参数过去写在这。参数会被添加到 formData 中，一起上传到服务端。
       // meta: {
@@ -167,8 +177,8 @@
       //     Accept: 'text/x-json',
       //     otherKey: 'xxx'
       // },
-      metaWithUrl: false, // 将 meta 拼接到 url 参数中，默认 false
-      withCredentials: true, // 跨域是否传递 cookie ，默认为 false
+      // metaWithUrl: false, // 将 meta 拼接到 url 参数中，默认 false
+      // withCredentials: true, // 跨域是否传递 cookie ，默认为 false
       // 上传之前触发
       onBeforeUpload(file: any) {
         // file 选中的文件，格式如 { key: file }
@@ -222,9 +232,6 @@
     editorRef.value = editor // 一定要用 Object.seal() ，否则会报错
   })
 }
-const look = () => {
-  console.log(ruleForm.noticeContent)
-}
 const minioFileUrl = ref('')
 watch(() => ruleForm.minioFileName, (newVal) => {
   if (newVal) {
@@ -278,7 +285,7 @@
           />
           <editor
             v-model="ruleForm.noticeContent"
-            style="height: 150px; overflow-y: hidden;"
+            style="height: 300px; overflow-y: hidden;"
             :default-config="editorConfig"
             mode="default"
             @onCreated="onCreated"
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index 0926957..a4cdd5e 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -16,7 +16,7 @@
   noticePublisher: '', // 发布人
   noticeTime: '', // 发布时间
   noticeTitle: '', // 标题
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -27,6 +27,7 @@
     text: '编号',
     value: 'noticeNo',
     align: 'center',
+    width: '180',
   },
   {
     text: '标题',
@@ -37,6 +38,7 @@
     text: '发布人',
     value: 'noticePublisher',
     align: 'center',
+    width: '150',
   },
   {
     text: '内容描述',
@@ -47,11 +49,15 @@
     text: '发布时间',
     value: 'noticeTime',
     align: 'center',
+    width: '200',
   },
 ] // 表格
 const list = ref([]) // 表格数据
 // 获取通知公告列表
 const getNoticeList = () => {
+  if (!searchQuery.noticeTime) {
+    searchQuery.noticeTime = ''
+  }
   getNoticeeApi(searchQuery).then((res) => {
     total.value = res.data.total
     list.value = res.data.rows
diff --git a/src/views/system/notice/noticeDetail.vue b/src/views/system/notice/noticeDetail.vue
index 94468d4..da36bd8 100644
--- a/src/views/system/notice/noticeDetail.vue
+++ b/src/views/system/notice/noticeDetail.vue
@@ -1,5 +1,6 @@
 <!-- 通知公告详情弹窗 -->
 <script lang="ts" setup name="noticeDetail">
+import { Editor } from '@wangeditor/editor-for-vue'
 import type { noticeType } from './notice-interface'
 import { getNoticeDetail } from '@/api/system/notice'
 import { getPhotoUrl } from '@/api/system/tool'
@@ -52,6 +53,18 @@
     })
   }
 })
+// 编辑器配置
+const editorConfig = ref({
+  readOnly: true,
+})
+// 富文本实例对象
+const editorRef = shallowRef()
+const onCreated = (editor: any) => {
+  editorRef.value = editor
+  nextTick(() => {
+    editorRef.value = editor // 一定要用 Object.seal() ，否则会报错
+  })
+}
 </script>
 
 <template>
@@ -89,7 +102,18 @@
       </el-form-item>
       <el-form-item label="发布内容" prop="noticeContent">
         <!-- <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" disabled /> -->
-        <div style="border: 1px solid #dcdfe6;width: 100%;border-radius: 4px;padding: 12px;" v-html="ruleForm.noticeContent" />
+        <!-- <div style="border: 1px solid #dcdfe6;width: 100%;border-radius: 4px;padding: 12px;" v-html="ruleForm.noticeContent" ></div> -->
+        <div style="border: 1px solid #dcdfe6;width: 100%;border-radius: 4px;">
+          <editor
+            ref="editorRef"
+            v-model="ruleForm.noticeContent"
+            style="height: 300px; overflow-y: hidden;"
+            :default-config="editorConfig"
+            mode="default"
+            :disabled="true"
+            @onCreated="onCreated"
+          />
+        </div>
       </el-form-item>
       <el-form-item label="查看附件">
         <el-link v-if="ruleForm.minioFileName" :href="minioFileUrl" type="primary" target="_blank">
diff --git a/src/views/system/tool/autograph/addDDialog.vue b/src/views/system/tool/autograph/addDDialog.vue
index e39b706..daadd9b 100644
--- a/src/views/system/tool/autograph/addDDialog.vue
+++ b/src/views/system/tool/autograph/addDDialog.vue
@@ -186,7 +186,7 @@
         <el-input v-model.trim="ruleForm.signDesc" placeholder="签名描述" :disabled="title === '详情'" />
       </el-form-item>
       <el-form-item label="可使用人" prop="userIdList">
-        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'">
+        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'" style="width: 100%;">
           <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </el-form-item>
@@ -198,7 +198,7 @@
         <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px', 'margin-top': ruleForm.minioFileName === '' ? '0px' : '56px' }" @click="upload">
           {{ ruleForm.minioFileName === '' ? '上传' : '更换图片' }}
         </el-button>
-        <input v-show="title === '123'" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <input v-show="title === '123'" ref="fileRef" type="file" accept="image/*" @change="onFileChange">
       </el-form-item>
     </el-form>
     <template #footer>
diff --git a/src/views/system/tool/autograph/autograph.vue b/src/views/system/tool/autograph/autograph.vue
index ac9f000..d3c6f81 100644
--- a/src/views/system/tool/autograph/autograph.vue
+++ b/src/views/system/tool/autograph/autograph.vue
@@ -15,7 +15,7 @@
   signName: '', // 名称
   signDirector: '', // 负责人
   createTime: '', // 创建时间
-  limit: 10,
+  limit: 20,
   offset: 1,
   signType: '',
 }) // 查询参数
@@ -38,6 +38,9 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.createTime) {
+    searchQuery.createTime = ''
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -168,10 +171,10 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model="searchQuery.signNo" placeholder="签章编号" clearable class="w-50 m-2 normal-input" />
+        <el-input v-model="searchQuery.signNo" placeholder="签名编号" clearable class="w-50 m-2 normal-input" />
       </search-item>
       <search-item>
-        <el-input v-model="searchQuery.signName" placeholder="签章名称" clearable class="w-50 m-2 normal-input" />
+        <el-input v-model="searchQuery.signName" placeholder="签名名称" clearable class="w-50 m-2 normal-input" />
       </search-item>
       <search-item>
         <el-input v-model="searchQuery.signDirector" placeholder="负责人" clearable class="w-50 m-2 normal-input" />
diff --git a/src/views/system/tool/certificate/addDDialog.vue b/src/views/system/tool/certificate/addDDialog.vue
index 2721bf8..0fdec28 100644
--- a/src/views/system/tool/certificate/addDDialog.vue
+++ b/src/views/system/tool/certificate/addDDialog.vue
@@ -185,7 +185,7 @@
         <el-input v-model.trim="ruleForm.templateDesc" placeholder="模板描述" :disabled="title === '详情'" />
       </el-form-item>
       <el-form-item label="可使用人" prop="userIdList">
-        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'">
+        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'" style="width: 100%;">
           <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </el-form-item>
diff --git a/src/views/system/tool/certificate/certificate.vue b/src/views/system/tool/certificate/certificate.vue
index 9787116..a2468de 100644
--- a/src/views/system/tool/certificate/certificate.vue
+++ b/src/views/system/tool/certificate/certificate.vue
@@ -15,7 +15,7 @@
   templateName: '', // 名称
   templateCreator: '', // 负责人
   createTime: '', // 创建时间
-  limit: 10,
+  limit: 20,
   offset: 1,
   templateType: '',
 }) // 查询参数
@@ -38,6 +38,9 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.createTime) {
+    searchQuery.createTime = ''
+  }
   templatePage(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
diff --git a/src/views/system/tool/document/addDDialog.vue b/src/views/system/tool/document/addDDialog.vue
index c440d1d..d5d28d8 100644
--- a/src/views/system/tool/document/addDDialog.vue
+++ b/src/views/system/tool/document/addDDialog.vue
@@ -186,7 +186,7 @@
         <el-input v-model.trim="ruleForm.templateDesc" placeholder="模板描述" :disabled="title === '详情'" />
       </el-form-item>
       <el-form-item label="可使用人" prop="userIdList">
-        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'">
+        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'" style="width: 100%;">
           <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </el-form-item>

diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index bb58885..2959118 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -53,3 +53,64 @@
   }
   return true
 }
+
+/**
+ * 验证小写字母
+ * @param str
+ * @returns
+ */
+export function validateLowerCase(str: string) {
+  const reg = /^[a-z]+$/
+  return reg.test(str)
+}
+
+/* 验证大写字母 */
+export function validateUpperCase(str: string) {
+  const reg = /^[A-Z]+$/
+  return reg.test(str)
+}
+
+/* 验证大小写字母 */
+export function validateAlphabets(str: string) {
+  const reg = /^[A-Za-z]+$/
+  return reg.test(str)
+}
+
+/**
+ * 验证邮箱
+ * @param email
+ * @returns {boolean}
+ */
+export function validateEmail(email: string) {
+  const re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
+  return re.test(email)
+}
+
+/**
+ * 验证手机号
+ * @param phone
+ * @returns {boolean}
+ */
+export function validateMobile(phone: string) {
+  const re = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/
+  return re.test(phone)
+}
+
+/**
+ * 校验身份证号
+ * @param value
+ * @returns
+ */
+export function validateIdCardNo(value: string) {
+  const re = /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/
+  return re.test(value)
+}
+/**
+ *
+ * @param value 验证电话号码
+ * @returns
+ */
+export function validatePhone(value: string) {
+  const re = /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/
+  return re.test(value)
+}
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 1c2405e..bca0958 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,13 +1,46 @@
-<script lang="ts" setup name="borrowHandle">
-// 逻辑代码
+<!-- 设备借用处理 -->
+<script lang="ts" setup name="borrowApply">
+import list from './components/handleList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '待借用', comp: list },
+  { name: '已借用', comp: list },
+  { name: '已归还', comp: list },
+])
+const current = ref('待借用')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用处理
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 03d414b..c5771f7 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,13 +1,50 @@
+<!-- 设备借用申请 -->
 <script lang="ts" setup name="borrowApply">
-// 逻辑代码
+import list from './components/applyList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '全部', comp: list },
+  { name: '草稿箱', comp: list },
+  { name: '待审批', comp: list },
+  { name: '审批中', comp: list },
+  { name: '已通过', comp: list },
+  { name: '未通过', comp: list },
+  { name: '已取消', comp: list },
+])
+const current = ref('全部')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用申请
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
new file mode 100644
index 0000000..052f3ce
--- /dev/null
+++ b/src/views/device/borrow/components/applyList.vue
@@ -0,0 +1,328 @@
+<script lang="ts" setup name="borrowApplyList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '文件号',
+    value: 'fileNo',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '类别',
+    value: 'catergory',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '李四',
+      time: '2020-12-14 00:00:00',
+      status: '未通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const approveRef = ref()
+// 同意
+const agree = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '1',
+  })
+}
+// 驳回
+const reject = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '3',
+  })
+}
+// 拒绝
+const refuse = (row: any) => {
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
+}
+// 取消
+const cancel = (rowrow: any) => {
+  ElMessageBox.confirm(
+    '确认取消吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" @click="addBtn" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="agree(row)">
+                  同意
+                </el-button>
+                <el-button size="small" type="primary" link @click="reject(row)">
+                  驳回
+                </el-button>
+                <el-button size="small" type="primary" link @click="refuse(row)">
+                  拒绝
+                </el-button>
+                <el-button size="small" type="primary" link @click="cancel(row)">
+                  取消
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/components/approvalActionDialog.vue b/src/views/device/borrow/components/approvalActionDialog.vue
new file mode 100644
index 0000000..214876c
--- /dev/null
+++ b/src/views/device/borrow/components/approvalActionDialog.vue
@@ -0,0 +1,104 @@
+<!-- 审批操作弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
+const dialogVisibleApprove = ref(false)
+const form = reactive({
+  radio: '1',
+})
+const ruleFormRef = ref<FormInstance>()
+const rules = reactive<FormRules>({
+})
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const approvetime = ref('') // 审批时间
+const initDialog = (row: any) => {
+  dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
+}
+defineExpose({ initDialog })
+
+// 点击保存
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      dialogVisibleApprove.value = false
+      emits('resetData')
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  formEl.resetFields()
+  dialogVisibleApprove.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
+    <el-form
+      ref="ruleFormRef" :model="form"
+      :rules="rules" label-width="110px"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人">
+            <el-input disabled :value="userInfo.$state.name" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间">
+            <el-input disabled :value="approvetime" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
+        <el-button @click="resetForm(ruleFormRef)">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
new file mode 100644
index 0000000..cfda00a
--- /dev/null
+++ b/src/views/device/borrow/components/handleList.vue
@@ -0,0 +1,281 @@
+<script lang="ts" setup name="borrowHandleList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '申请编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'dept',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      dept: '顶级',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      dept: '徐州分中心',
+      user: '里斯',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+const borrow = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="borrow(row)">
+                  借用
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/addRow.vue b/src/views/device/standingBook/components/addRow.vue
index 1678cdb..07b03d1 100644
--- a/src/views/device/standingBook/components/addRow.vue
+++ b/src/views/device/standingBook/components/addRow.vue
@@ -5,7 +5,7 @@
 import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
+const formLabelWidth = '110px'
 const form = ref({})
 const formTable = ref([
   {
@@ -91,108 +91,188 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`">
+  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
     >
       <div v-if="name === '周检记录'">
-        <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录表编号" />
-        </el-form-item>
-        <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录人" />
-        </el-form-item>
-        <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="检定日期"
-          />
-        </el-form-item>
-        <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="有效日期"
-          />
-        </el-form-item>
-        <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="送检人" />
-        </el-form-item>
-        <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录表编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="检定日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="有效日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="送检人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '状态变更记录'">
-        <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="状态类型" clearable>
-            <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="结束日期"
-          />
-        </el-form-item>
-        <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="申请人" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="状态类型" clearable style="width: 100%;">
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="申请人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '使用记录'">
-        <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用人" />
-        </el-form-item>
-        <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用部门" />
-        </el-form-item>
-        <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="使用类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用结束日期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用部门" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="使用类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '检定证书'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="证书类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书出具日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书有效期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
     </el-form>
     <template #footer>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 5f7b347..9a9f798 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -352,7 +352,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -376,7 +376,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -391,7 +391,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -404,14 +404,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -434,7 +434,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -443,20 +443,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -480,23 +480,23 @@
               <com-tree-select
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -507,10 +507,10 @@
             <el-form-item label="检定部门" prop="mesureDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -520,7 +520,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -529,13 +529,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -544,21 +544,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -578,14 +578,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -594,14 +594,14 @@
         <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-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -669,7 +669,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index fc3fd54..d9d4514 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -199,6 +199,8 @@
     useDeptList.value = toTreeList(res.data, '0', true)
   })
 }
+const selectTreeRef1 = ref()
+const selectTreeRef2 = ref()
 // 重置
 const resetDATA = () => {
   ruleForm.value = {
@@ -254,6 +256,10 @@
     isStandardSupportEquipment: '', //		是否标准配套设备
     id: '',
   }
+  if (title.value !== '详情') {
+    selectTreeRef1.value.clearSelected()
+    selectTreeRef2.value.clearSelected()
+  }
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
@@ -378,7 +384,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -402,7 +408,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -416,8 +422,7 @@
             <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"
+                :placeholder="title === '详情' ? '' : '出厂年月'" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -430,14 +435,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -460,7 +465,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -469,20 +474,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -505,24 +510,26 @@
             <el-form-item label="使用部门" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
+                ref="selectTreeRef2"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -536,10 +543,12 @@
               </el-select> -->
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                ref="selectTreeRef1"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -549,7 +558,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -558,13 +567,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -573,21 +582,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -607,14 +616,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -624,14 +633,14 @@
           <el-col :span="6">
             <el-form-item label="资本来源" prop="capitalSource">
               <!-- <el-input v-model.trim="ruleForm.capitalSource" placeholder="资本来源" :disabled="title === '详情'" /> -->
-              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -699,7 +708,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f653095..f4229a6 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -147,19 +147,17 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
-  setTimeout(() => {
-    list.value = [
-      {
-        equipmentNo: 123,
-        equipmentName: 'test',
-        modelNo: '001',
-        usePersonName: '张三',
-        validDate: '2022-12-12 00:00:00',
-        useDeptName: '顶级',
-      },
-    ]
-    total.value = 1
-  }, 1000)
+  list.value = [
+    {
+      equipmentNo: 123,
+      equipmentName: 'test',
+      modelNo: '001',
+      usePersonName: '张三',
+      validDate: '2022-12-12 00:00:00',
+      useDeptName: '顶级',
+    },
+  ] as any
+  total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -220,9 +218,11 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -300,13 +300,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.mesureType" class="m-2 normal-select" placeholder="检定方式" clearable>
+          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable>
             <el-option
               v-for="item in mesureTypeList"
               :key="item.id"
@@ -316,7 +316,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.managerState" class="m-2 normal-select" placeholder="管理状态" clearable>
+          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable>
             <el-option
               v-for="item in managerStateList"
               :key="item.id"
@@ -327,8 +327,9 @@
         </search-item>
         <search-item>
           <com-tree-select
+            ref="selectTreeRef"
             v-model="searchQuery.useDept" :options="useDeptList" placeholder="使用部门"
-            :tree-props="deptProps" style="width: 150px;"
+            :tree-props="deptProps"
           />
         </search-item>
         <search-item>
@@ -336,11 +337,10 @@
             v-model="searchQuery.validDate" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="有效日期"
             class="normal-date"
-            style="width: 150px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.abc" class="m-2 normal-select" placeholder="ABC" clearable>
+          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable>
             <el-option
               v-for="item in abcList"
               :key="item.id"
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 78a3800..4c31a94 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -2,9 +2,10 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/fixedAssetsAdd.vue'
-import type { fixedAssetsType } from './standingBook-interface'
+import type { fixedAssetsType, selectType } from './standingBook-interface'
 import { exportFile } from '@/utils/exportUtils'
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
+import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   assetNo: '', // 固定编号
@@ -50,7 +51,7 @@
   },
   {
     text: '设备类型',
-    value: 'assetTypeName',
+    value: 'equipmentTypeName',
     width: '150',
     align: 'center',
   },
@@ -102,6 +103,7 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+const equipmentCategoryList = ref<selectType[]>([]) // 设备类别
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
@@ -242,6 +244,10 @@
 }
 onMounted(() => {
   getList()
+  // 获取设备类别
+  getDictByCode('equipmentCategory').then((response) => {
+    equipmentCategoryList.value = response.data
+  })
 })
 </script>
 
@@ -265,7 +271,10 @@
           <el-input v-model="searchQuery.equipmentSpecifications" placeholder="设备规格" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-select v-model="searchQuery.equipmentCategory" placeholder="设备类别" clearable>
+            <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+          </el-select>
         </search-item>
       </search-area>
       <table-container>
diff --git a/src/views/device/stateManage/components/addRow.vue b/src/views/device/stateManage/components/addRow.vue
new file mode 100644
index 0000000..3ba82d6
--- /dev/null
+++ b/src/views/device/stateManage/components/addRow.vue
@@ -0,0 +1,160 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { listPageApi } from '@/api/device/standingBook'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  limit: 10,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '出厂编号',
+    value: 'manufacturingNo',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+  },
+])
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listPageApi(listQuery.value as any).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map(item => ({ ...item, checked: '' }))
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    equipmentName: '', // 姓名
+    equipmentNo: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const checkedArr = list.value.filter(item => item.checked !== '')
+  if (checkedArr.length) {
+    console.log(checkedArr, '选中的设备')
+    emits('add', checkedArr)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择设备')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns as any" :query="listQuery"
+        :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-checkbox v-model="scope.row.checked" :label="scope.$index" size="large" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-checkbox__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index 56417d6..214876c 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -47,38 +47,45 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="30%">
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
-      :rules="rules"
+      :rules="rules" label-width="110px"
     >
-      <el-form-item label="审批意见">
-        <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
-        <el-radio-group v-model="form.radio">
-          <el-radio label="1">
-            同意
-          </el-radio>
-          <el-radio label="2">
-            拒绝
-          </el-radio>
-          <el-radio label="3">
-            驳回
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="审批结论">
-        <el-input
-          :rows="4"
-          type="textarea"
-        />
-      </el-form-item>
       <el-row :gutter="24">
-        <el-col :span="10">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="审批人">
             <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
-        <el-col :span="14">
+        <el-col :span="12">
           <el-form-item label="审批时间">
             <el-input disabled :value="approvetime" />
           </el-form-item>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index e74d70e..2003e31 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -1,7 +1,8 @@
 <!-- 新增或详情弹窗 -->
-<script lang="ts" setup name="addNotice">
+<script lang="ts" setup name="add">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
+import addRow from './addRow.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
@@ -16,6 +17,7 @@
 const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const name = ref('')
+const borrowList = ref([])
 const ruleForm = ref({
   assetNo: '', // 资产编号
   assetType: '', // 资产类型
@@ -357,10 +359,86 @@
     isShowCalibration.value = true
   }
 })
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerLevelName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+  },
+])
+const addRowRef = ref()
+// 添加行
+const addRowBtn = () => {
+  addRowRef.value.initDialog({ title: '添加' })
+}
+// 删除行
+const removeRowBtn = () => {
+  const removeArr = borrowList.value.filter(item => item.remove !== '')
+  if (removeArr.length) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      borrowList.value = borrowList.value.filter(item => item.remove === '')
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 借用设备列表添加
+const addRowMethods = (row) => {
+  row.forEach((element) => {
+    borrowList.value.push({ ...element, remove: '' })
+  })
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
     <detail-page :title="`${name}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
@@ -378,15 +456,16 @@
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder="">
+              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -430,7 +509,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -454,28 +533,56 @@
         </el-row>
       </el-form>
     </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>
+    <div>
+      <detail-block title="借用设备列表">
+        <template #btns>
+          <el-button type="primary" @click="addRowBtn">
+            添加行
+          </el-button>
+          <el-button type="info" @click="removeRowBtn">
+            删除行
+          </el-button>
+        </template>
+        <normal-table
+          :data="borrowList" :total="1" :columns="columns as any"
+        >
+          <template #preColumns>
+            <el-table-column label="选择" width="55" align="center">
+              <template #default="scope">
+                <el-checkbox v-model="scope.row.remove" :label="scope.$index" size="large" />
+              </template>
+            </el-table-column>
+            <el-table-column label="序号" width="60" align="center">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </detail-block>
+      <detail-block 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>
+    </div>
   </app-container>
 </template>
 
@@ -484,6 +591,10 @@
   background-color: #fff;
 }
 
+:deep(.el-checkbox__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,
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index aaaaf61..d588b8d 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,6 +1,7 @@
 <script lang="ts" setup name="bench">
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
+import type { trainLogStatistic } from './bench-interface'
 import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
 import { getPlanList } from '@/api/system/plan'
 import { listPageApi } from '@/api/measure/file'
@@ -132,15 +133,19 @@
     account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
+    const result: trainLogStatistic = res.data
+    const notQualified: number = Number(result.trainCount) - result.qualifiedCount
+    const qualifiedRate = ((result.qualifiedCount / result.trainCount) * 100).toFixed(2) // 合格率
+    const notQualifiedRate = ((notQualified / result.trainCount) * 100).toFixed(2) // 不合格率
     TrainLogSList.value = [
-      { name: `合格     ${res.data.qualified}-${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
-      { name: `不合格   ${res.data.notQualified}- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+      { name: `合   格   ${result.qualifiedCount}-${qualifiedRate}%`, value: result.qualifiedCount },
+      { name: `不合格   ${notQualified}- ${notQualifiedRate}%`, value: notQualified },
     ]
     TrainLogTitle.value = res.data.trainCount
   }).catch((_) => {
     // 处理异常
     TrainLogSList.value = [
-      { name: '合格     0 - 50%', value: 0 },
+      { name: '合   格   0 - 50%', value: 0 },
       { name: '不合格   0 - 50%', value: 0 },
     ]
     TrainLogTitle.value = 0
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 9ef0b93..1ad577b 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -270,7 +270,7 @@
               <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="6">
             <el-form-item label="名称" prop="fileName">
               <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
             </el-form-item>
@@ -279,13 +279,14 @@
         <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" class="fill-input" disabled>
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled style="width: 100%;">
                 <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="请选择发布单位"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -295,6 +296,7 @@
                 v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -311,12 +313,13 @@
                 v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人" prop="createUserId">
-              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index b45fbc3..542b284 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -26,7 +26,7 @@
   createUser: '', // 创建人
   createTime: '', // 创建
   approvalStatus: props.value, // 审批状态
-  limit: 10,
+  limit: 20,
   offset: 1,
   fileType: '', // 类型
   formId: '',
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 7d4724b..e54ddf5 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -26,7 +26,7 @@
   fileCode: '', // 文件号
   effectiveTime: '', // 实施时间
   effectiveStatus: '', // 实施状态
-  limit: 10,
+  limit: 20,
   offset: 1,
   fileType: '', // 类型
 }) // 查询参数
@@ -75,13 +75,19 @@
 const getStatus = () => {
   getDictByCode('effectiveStatus').then((res) => {
     if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
+      effectiveStatusSelect.value = [...res.data, { name: '全部', value: '', id: 'quanbu' }]
     }
   })
 }
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.publishTime) {
+    searchQuery.publishTime = ''
+  }
+  if (!searchQuery.effectiveTime) {
+    searchQuery.effectiveTime = ''
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -252,13 +258,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" />
         </search-item>
         <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
@@ -274,20 +280,16 @@
           <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: 185px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
             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: 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" placeholder="实施状态" clearable>
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index 5ca3275..a95c665 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -505,21 +505,21 @@
         <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] === '详情'" @change="directorChange">
+              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;" @change="directorChange">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.name" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
-              <el-select v-model="ruleForm.technologyJob" :placeholder="title.split('-')[2] === '详情' ? '' : '技术职务'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.technologyJob" :placeholder="title.split('-')[2] === '详情' ? '' : '技术职务'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;">
                 <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="administrationJob">
-              <el-select v-model="ruleForm.administrationJob" :placeholder="title.split('-')[2] === '详情' ? '' : '行政职务'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.administrationJob" :placeholder="title.split('-')[2] === '详情' ? '' : '行政职务'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index aac1ef2..11d6d0a 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -22,7 +22,7 @@
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
-  limit: 10,
+  limit: 20,
   offset: 1,
   organizeType: '', // 类型
   createTime: '', // 创建时间
@@ -118,6 +118,9 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.createTime) {
+    searchQuery.createTime = ''
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows.map(item => ({ ...item, createTime: item.createTime.split(' ')[0] }))
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 3f472eb..bc5d9d4 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -7,7 +7,9 @@
 // import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
-import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+// import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const props = defineProps({
   isRemind: {
     type: Boolean,
@@ -78,11 +80,14 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 // 获取所有部门
-const deptList = ref<DeptTreeNode[]>([])
+const deptList = ref([])
 const getDeptList = async () => {
   getDeptTreeList().then((res) => {
-    deptList.value = res.data
+    deptList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
@@ -177,6 +182,7 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   searchQuery.staffNo = ''
@@ -184,6 +190,7 @@
   searchQuery.deptId = ''
   searchQuery.certificateStatus = ''
   searchQuery.verifierCertificateNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -212,10 +219,6 @@
     loading.close()
   })
 }
-// 打印
-const print = () => {
-
-}
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传图片
@@ -268,20 +271,24 @@
           <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+          <!-- <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
             <el-option
               v-for="item in deptList"
               :key="item.id"
               :label="item.name"
               :value="item.id"
             />
-          </el-select>
+          </el-select> -->
+          <com-tree-select
+            ref="selectTreeRef" v-model="searchQuery.deptId" :options="deptList"
+            placeholder="工作部门" :tree-props="deptProps"
+          />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况">
+          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况" clearable>
             <el-option
               v-for="item in certificateStatusList"
               :key="item.id"
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 4352604..5a5f036 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -389,10 +389,10 @@
           关闭
         </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">
-            <el-form-item prop="minioFileName" label-width="70px">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item prop="minioFileName">
               <el-upload
                 class="avatar-uploader"
                 :show-file-list="false"
@@ -423,23 +423,24 @@
               <el-date-picker
                 v-model="ruleForm.birthday" type="date" format="YYYY-MM" value-format="YYYY-MM"
                 placeholder="出生年月" :disabled="title === '详情'"
+                style="width: 100%;"
               />
             </el-form-item>
             <el-form-item label="工作部门" prop="deptId" class="marg-item">
-              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled>
+              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled style="width: 100%;">
                 <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="ruleForm.deptId" :options="PubListTree"
-                placeholder="选择组织机构" :tree-props="deptProps"
+                placeholder="选择组织机构" :tree-props="deptProps" style="width: 100%;"
               />
             </el-form-item>
             <el-form-item label="计量专业" prop="major" class="marg-item">
               <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
             </el-form-item>
             <el-form-item label="是否特操人" prop="specialOperator" class="marg-item">
-              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -449,23 +450,23 @@
               <el-input v-model.trim="ruleForm.staffNo" placeholder="系统自动生成" disabled />
             </el-form-item>
             <el-form-item label="性别" prop="sex" class="marg-item">
-              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="技术职务" prop="technologyJob" class="marg-item">
-              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="从事日期" prop="workDate" class="marg-item">
               <el-date-picker
                 v-model="ruleForm.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-                placeholder="请选择从事日期"
+                placeholder="请选择从事日期" style="width: 100%;"
               />
             </el-form-item>
-            <el-form-item label="是否技术考核" prop="technologyExam" class="marg-item">
-              <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'">
+            <el-form-item label="是否技术考核" prop="technologyExam" class="marg-item" style="width: 100%;">
+              <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -475,17 +476,17 @@
               <el-input ref="cardRef" v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" @blur="getBirthday" />
             </el-form-item>
             <el-form-item label="文化程度" prop="education" class="marg-item">
-              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="行政职务" prop="administrationJob" class="marg-item">
-              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="是否主考人" prop="mainExaminer" class="marg-item">
-              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index 042636e..660f2b0 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -264,7 +264,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="性别" prop="meterStaff.sex">
-              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -273,21 +273,21 @@
         <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-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -296,7 +296,7 @@
         <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-select v-if="title === '详情'" v-model="meterStaff.deptId" disabled style="width: 100%;">
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
               <com-tree-select
@@ -304,6 +304,7 @@
                 ref="selectTreeRef" v-model="meterStaff.deptId" :options="PubListTree"
                 placeholder="选择组织机构"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -316,7 +317,7 @@
             <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="请选择从事日期"
+                placeholder="请选择从事日期" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -347,7 +348,7 @@
             <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="请选择发证日期"
+                placeholder="请选择发证日期" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -355,7 +356,7 @@
             <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="请选择有效日期"
+                placeholder="请选择有效日期" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 178fc12..d0116f3 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -3,7 +3,7 @@
 import type { FormInstance, FormRules } from 'element-plus'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
+const formLabelWidth = '110px'
 const form = reactive({
   certificateNo: '', // 证书号
   certificateName: '', // 证书名称
@@ -71,32 +71,52 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`" width="40%">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
     >
-      <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
-        <el-input v-model="form.certificateNo" placeholder="证书号" />
-      </el-form-item>
-      <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
-        <el-input v-model="form.certificateName" placeholder="证书名称" />
-      </el-form-item>
-      <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
-        <el-input v-model="form.certificateCompany" placeholder="发证单位" />
-      </el-form-item>
-      <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
-        <el-date-picker
-          v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择发证日期"
-        />
-      </el-form-item>
-      <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-        <el-date-picker
-          v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择有效日期"
-        />
-      </el-form-item>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
+            <el-input v-model="form.certificateNo" placeholder="证书号" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
+            <el-input v-model="form.certificateName" placeholder="证书名称" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
+            <el-input v-model="form.certificateCompany" placeholder="发证单位" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
+            <el-date-picker
+              v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择发证日期" style="width: 100%;"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+            <el-date-picker
+              v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择有效日期" style="width: 100%;"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <template #footer>
       <span class="dialog-footer">
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
index 5e20d1b..10b0deb 100644
--- a/src/views/measure/person/components/personListDialog.vue
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -1,8 +1,11 @@
 <!-- 计量人员列表弹窗 -->
 <script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
 import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import { getDeptTreeList } from '@/api/system/dept'
-import type { TreeStructure } from '@/views/system/user/user-interface'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -10,7 +13,7 @@
   staffNo: '', // 人员编号
   name: '', // 姓名
   deptId: '', // 所在部门
-  limit: 5,
+  limit: 10,
   offset: 1,
 })
 const loadingTable = ref<boolean>(false)
@@ -32,20 +35,22 @@
   },
 ])
 // 获取部门
-const deptIdList = ref<TreeStructure[]>([])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const deptIdList = ref([])
 const getDeptList = () => {
   getDeptTreeList().then((res) => {
-    deptIdList.value = res.data
+    deptIdList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
 const fetchData = () => {
-  select.value = ''
+  select.value = -1
   getStaffList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.records
       total.value = Number(res.data.total)
-      console.log(list.value, 'list')
     }
   })
 }
@@ -53,6 +58,7 @@
 const search = () => {
   fetchData()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   listQuery.value = {
@@ -62,6 +68,7 @@
     limit: 10,
     offset: 1,
   }
+  selectTreeRef.value.clearSelected()
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -76,18 +83,24 @@
 }
 // 点击保存
 const submitForm = () => {
-  const person = list.value.filter((item, index) => index == select.value)[0]
-  console.log(person, 'person')
-  getStaffDetail(person).then((res) => {
-    if (res.code === 200) {
-      emits('add', res.data)
-      dialogFormVisible.value = false
-    }
-  })
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    getStaffDetail(person).then((res) => {
+      if (res.code === 200) {
+        emits('add', res.data)
+        dialogFormVisible.value = false
+        reset()
+      }
+    })
+  }
+  else {
+    ElMessage.warning('请先选择人员')
+  }
 }
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
+  reset()
 }
 // 初始化
 const initDialog = () => {
@@ -99,39 +112,45 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员" width="50%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable style="width: 150px;" />
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable style="width: 150px;" />
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
+        <!-- <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
           <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
+        </el-select> -->
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
-    <normal-table
-      :data="list" :total="total" :columns="columns" :query="listQuery"
-      :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>
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :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">
             {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
           </template>
         </el-table-column> -->
-      </template>
-    </normal-table>
+        </template>
+      </normal-table>
+    </div>
     <template #footer>
       <span class="dialog-footer">
         <el-button type="primary" @click="submitForm">确认</el-button>
diff --git a/src/views/measure/person/components/userListDialog.vue b/src/views/measure/person/components/userListDialog.vue
index dcd05b5..cd62a73 100644
--- a/src/views/measure/person/components/userListDialog.vue
+++ b/src/views/measure/person/components/userListDialog.vue
@@ -3,14 +3,16 @@
 import { ElMessage } from 'element-plus'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
-import type { TreeStructure } from '@/views/system/user/user-interface'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
 const listQuery = ref({
   keywords: '', // 姓名
   deptId: '', // 所在部门
-  limit: 5,
+  limit: 10,
   offset: 1,
 })
 const loadingTable = ref<boolean>(false)
@@ -31,11 +33,14 @@
     value: 'deptName',
   },
 ])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 // 获取部门
-const deptIdList = ref<TreeStructure[]>([])
+const deptIdList = ref([])
 const getDeptList = () => {
   getDeptTreeList().then((res) => {
-    deptIdList.value = res.data
+    deptIdList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
@@ -52,6 +57,7 @@
 const search = () => {
   fetchData()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   listQuery.value = {
@@ -60,6 +66,7 @@
     limit: 10,
     offset: 1,
   }
+  selectTreeRef.value.clearSelected()
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -74,11 +81,11 @@
 }
 // 点击保存
 const submitForm = () => {
-  console.log(select.value)
   if (select.value >= 0) {
     const person = list.value.filter((item, index) => index == select.value)[0]
     emits('add', person)
     dialogFormVisible.value = false
+    reset()
   }
   else {
     ElMessage.warning('请先选择人员')
@@ -87,9 +94,11 @@
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
+  reset()
 }
 // 初始化
 const initDialog = () => {
+  // reset()
   dialogFormVisible.value = true
   getDeptList()
   fetchData()
@@ -98,16 +107,20 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+  <el-dialog v-model="dialogFormVisible" title="选择人员" width="50%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
         <el-input v-model.trim="listQuery.keywords" placeholder="真实姓名" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable>
+        <!-- <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable>
           <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
+        </el-select> -->
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 9c6f65d..355473a 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -7,7 +7,9 @@
 // import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
-import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+// import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
@@ -16,7 +18,7 @@
   major: '', // 计量专业
   verifierCertificateNo: '', // 证书号
   certificateStatus: '', // 证书状态
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -52,10 +54,10 @@
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取所有部门
-const deptList = ref<DeptTreeNode[]>([])
+const deptList = ref([])
 const getDeptList = async () => {
   getDeptTreeList().then((res) => {
-    deptList.value = res.data
+    deptList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
@@ -126,6 +128,7 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   searchQuery.staffNo = ''
@@ -133,6 +136,7 @@
   searchQuery.deptId = ''
   searchQuery.major = ''
   searchQuery.verifierCertificateNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -160,10 +164,9 @@
     loading.close()
   })
 }
-// 打印
-const print = () => {
-
-}
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传图片
@@ -216,14 +219,18 @@
           <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+          <!-- <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
             <el-option
               v-for="item in deptList"
               :key="item.id"
               :label="item.name"
               :value="item.id"
             />
-          </el-select>
+          </el-select> -->
+          <com-tree-select
+            ref="selectTreeRef" v-model="searchQuery.deptId" :options="deptList"
+            placeholder="工作部门" :tree-props="deptProps"
+          />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.major" placeholder="计量专业" clearable class="w-50 m-2" />
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index af0a29d..2e0e7af 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -1,12 +1,15 @@
 <script lang="ts" setup name="ListSourceAdd">
-import { reactive, ref } from 'vue'
+/**
+ * 添加/编辑/详情溯源供方
+ */
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions, IformInline } from './list_interface'
+import type { IOptions, IformInline, traceSupplierPerson } from './list_interface'
 import { exportFile } from '@/utils/exportUtils'
 import { UploadFile } from '@/api/measure/file'
 import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+import { validatePhone } from '@/utils/validate'
 const props = defineProps({
   infoId: {
     type: String,
@@ -19,43 +22,45 @@
 })
 const emit = defineEmits(['close'])
 const formInline: Ref<IformInline> = ref({
-  businessContent: null,
-  supplierName: null,
-  supplierNo: null,
-  bankAccount: null,
-  bankAccountNumber: null,
-  bankName: null,
-  briefName: null,
-  businessScope: null,
-  companyAddress: null,
-  companyArea: null,
-  companyCity: null,
-  companyCountry: null,
-  companyProvince: null,
-  createTime: null,
-  director: null,
-  fax: null,
-  invoiceAddress: null,
-  invoiceArea: null,
-  invoiceCity: null,
-  invoiceCountry: null,
-  invoiceProvince: null,
-  mailbox: null,
-  minioFileName: null,
-  mobile: null,
-  phone: null,
-  postalCode: null,
-  remark: null,
-  taxNumber: null,
-  website: null,
+  id: '',
+  businessContent: '',
+  supplierName: '',
+  supplierNo: '',
+  bankAccount: '',
+  bankAccountNumber: '',
+  bankName: '',
+  briefName: '',
+  businessScope: '',
+  companyAddress: '',
+  companyArea: '',
+  companyCity: '',
+  companyCountry: '',
+  companyProvince: '',
+  createTime: '',
+  director: '',
+  fax: '',
+  invoiceAddress: '',
+  invoiceArea: '',
+  invoiceCity: '',
+  invoiceCountry: '',
+  invoiceProvince: '',
+  mailbox: '',
+  minioFileName: '',
+  mobile: '',
+  phone: '',
+  postalCode: '',
+  remark: '',
+  taxNumber: '',
+  website: '',
   traceSupplierPersonList: [],
 })
+const traceSupplierPersonList: Ref<traceSupplierPerson[]> = ref([])
 const columns = ref([
-  { text: '人员编号', value: 'personNo', show: true },
-  { text: '姓名', value: 'name', show: true },
-  { text: '工作部门', value: 'department', show: true },
-  { text: '职务', value: 'job', show: true },
-  { text: '联系方式', value: 'phone', show: true },
+  { text: '人员编号', value: 'personNo', required: false },
+  { text: '姓名', value: 'name', required: true },
+  { text: '工作部门', value: 'department', required: false },
+  { text: '职务', value: 'job', required: false },
+  { text: '联系方式', value: 'phone', required: true, reg: validatePhone },
 ])
 const ruleFormRef = ref<FormInstance>()
 const provinceList = ref<IOptions[]>([])
@@ -66,14 +71,17 @@
 const invoiceCityList = ref<IOptions[]>([])
 const areaInvoiceList = ref<IOptions[]>([])
 const dialogVisible = ref(false)
-const addPersonList = ref({
+// 人员对象
+const addPersonObj: traceSupplierPerson = {
+  id: '',
   personNo: '',
   name: '',
   department: '',
   job: '',
   phone: '',
-})
-const SelectionList = ref([])
+  editable: true,
+}
+const SelectionList: Ref<traceSupplierPerson[]> = ref([])
 const upload = ref<UploadInstance>()
 // 校验规则
 const rules = ref({
@@ -91,7 +99,7 @@
   })
 }
 // 表格选中
-const handleSelectionChange = (e: any) => {
+const handleSelectionChange = (e: traceSupplierPerson[]) => {
   SelectionList.value = e
 }
 // 获取公司地址省级
@@ -142,15 +150,33 @@
   })
 }
 // 点击增加行
-const addRoow = () => {
-  const object = {
-    personNo: '',
-    name: '',
-    department: '',
-    job: '',
-    phone: '',
+const addRow = () => {
+  // 检查上一行必填项
+  if (checkPersonList()) {
+    setAllRowReadable()
+    traceSupplierPersonList.value.push({ ...addPersonObj })
   }
-  formInline.value.traceSupplierPersonList.push(object)
+}
+// 检查人员列表
+function checkPersonList() {
+  for (let index = 0; index < traceSupplierPersonList.value.length; index++) {
+    const item = traceSupplierPersonList.value[index]
+    for (const prop of columns.value) {
+      // 检查必填
+      if (prop.required && !item[prop.value]) {
+        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
+        return false
+      }
+      // 验证正则
+      if (prop.reg && typeof prop.reg === 'function') {
+        if (!prop.reg(item[prop.value])) {
+          ElMessage.warning(`第${index + 1}行中${prop.text}输入不合法`)
+          return false
+        }
+      }
+    }
+  }
+  return true
 }
 // 点击关闭
 const handleClose = () => {
@@ -158,12 +184,12 @@
 }
 // 点击弹窗的完成追加到表格数组中
 const addPushList = () => {
-  formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonList.value)))
+  formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonObj.value)))
   handleClose()
 }
 // 删除行
 const deleteList = () => {
-  formInline.value.traceSupplierPersonList = formInline.value.traceSupplierPersonList.filter((item) => {
+  traceSupplierPersonList.value = traceSupplierPersonList.value.filter((item: traceSupplierPerson) => {
     return !SelectionList.value.includes(item)
   })
 }
@@ -261,10 +287,16 @@
     }
   })
 }
-// 双击表格显示输入框
-const dblclickName = (item: object) => {
-  console.log(item)
-  item.show = false
+// 双击行显示输入框
+const dblclickRow = (row: traceSupplierPerson) => {
+  setAllRowReadable()
+  row.editable = true
+}
+// 将所有人员信息列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of traceSupplierPersonList.value) {
+    item.editable = false
+  }
 }
 if (props.buttonType !== '新建') {
   getInfo()
@@ -273,7 +305,7 @@
 
 <template>
   <app-container>
-    <detail-page :title="`培训计划-${buttonType}`">
+    <detail-page :title="`溯源供方-${buttonType}`">
       <template #btns>
         <el-button
           type="primary"
@@ -617,39 +649,36 @@
       </el-form>
     </detail-page>
     <detail-block title="人员信息">
-      <template #btns>
-        <el-button
-          type="info"
-          :disabled="buttonType === '详情'"
-          @click="deleteList"
-        >
+      <template v-if="buttonType !== '详情'" #btns>
+        <el-button type="info" @click="deleteList">
           删除行
         </el-button>
-        <el-button
-          type="primary"
-          :disabled="buttonType === '详情'"
-          @click="addRoow"
-        >
+        <el-button type="primary" @click="addRow">
           增加行
         </el-button>
       </template>
       <el-table
-        :data="formInline.traceSupplierPersonList"
+        :data="traceSupplierPersonList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
+        @row-dblclick="dblclickRow"
       >
-        <el-table-column type="selection" width="55" />
+        <el-table-column type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column
           v-for="item in columns"
           :key="item.value"
           :prop="item.value"
           :label="item.text"
+          align="center"
         >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
           <template #default="scope">
-            <span v-show="item.show" style="color: gray;" @dblclick="dblclickName(item)">{{ scope.row[item.value] || `双击编辑${item.text}` }}</span>
-            <el-input v-show="!item.show" v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" @blur="item.show = true" />
+            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+            <el-input v-else v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index 530bcc4..c057976 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -24,6 +24,18 @@
   areaName: string
 }
 
+// 溯源供方人员
+export interface traceSupplierPerson {
+  id: number | string // id
+  job: string // 职务
+  department: string// 部门
+  name: string// 信命
+  personNo: string// 人员编号
+  phone: string// 联系方式
+  editable?: boolean // 是否可编辑
+  [key: string]: any
+}
+
 export interface IformInline {
   businessContent: string
   supplierName: string
@@ -55,5 +67,6 @@
   remark: string
   taxNumber: string
   website: string
-  traceSupplierPersonList: []
+  traceSupplierPersonList: traceSupplierPerson []
 }
+
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index e44001a..600eda1 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -32,11 +32,20 @@
   dialogVisible.value = true
   ruleForm.noticePublisher = userInfo.$state.name
   ruleForm.noticeCompany = userInfo.$state.deptName
-  ruleForm.noticeTime = dayjs().format('YYYY-MM-DD')
+  ruleForm.noticeTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
 }
 defineExpose({ initDialog })
+// 重置
+const resetDialog = () => {
+  ruleForm.noticeTime = ''
+  ruleForm.noticeSketch = ''
+  ruleForm.noticeContent = ''
+  ruleForm.minioFileName = ''
+  ruleForm.noticeTitle = ''
+}
 // 关闭弹窗
 const close = () => {
+  resetDialog()
   dialogVisible.value = false
   emits('resetData')
 }
@@ -63,6 +72,7 @@
 const resetForm = (formEl: FormInstance | undefined) => {
   // if (!formEl) { return }
   formEl?.resetFields()
+  resetDialog()
   dialogVisible.value = false
   emits('resetData')
 }
@@ -105,7 +115,7 @@
     uploadImage: {
       server: 'http://111.198.10.15:21409/minio/file/upload', // 配置图片上传地址
       maxFileSize: 2 * 1024 * 1024, // 10M  图片大小限制
-      fieldName: 'img', // 上传类型
+      fieldName: 'multipartFile', // 上传名字
       allowedFileTypes: [], // 选择文件时的类型限制，默认为 ['image/*'] 。如不想限制，则设置为 []
       // 自定义上传参数，传递图片时需要带一些参数过去写在这。参数会被添加到 formData 中，一起上传到服务端。
       // meta: {
@@ -154,9 +164,9 @@
     uploadVideo: {
       server: 'http://111.198.10.15:21409/minio/file/upload', // 配置视频上传地址
       maxFileSize: 5 * 1024 * 1024, // 5M  视频大小限制
-      fieldName: 'your-custom-name', // 上传类型
+      fieldName: 'multipartFile', // 上传名字
       // 最多可上传几个文件，默认为 5
-      maxNumberOfFiles: 3,
+      // maxNumberOfFiles: 1,
       allowedFileTypes: [], // 选择文件时的类型限制，默认为 ['video/*'] 。如不想限制，则设置为 []
       // 自定义上传参数，传递图片时需要带一些参数过去写在这。参数会被添加到 formData 中，一起上传到服务端。
       // meta: {
@@ -167,8 +177,8 @@
       //     Accept: 'text/x-json',
       //     otherKey: 'xxx'
       // },
-      metaWithUrl: false, // 将 meta 拼接到 url 参数中，默认 false
-      withCredentials: true, // 跨域是否传递 cookie ，默认为 false
+      // metaWithUrl: false, // 将 meta 拼接到 url 参数中，默认 false
+      // withCredentials: true, // 跨域是否传递 cookie ，默认为 false
       // 上传之前触发
       onBeforeUpload(file: any) {
         // file 选中的文件，格式如 { key: file }
@@ -222,9 +232,6 @@
     editorRef.value = editor // 一定要用 Object.seal() ，否则会报错
   })
 }
-const look = () => {
-  console.log(ruleForm.noticeContent)
-}
 const minioFileUrl = ref('')
 watch(() => ruleForm.minioFileName, (newVal) => {
   if (newVal) {
@@ -278,7 +285,7 @@
           />
           <editor
             v-model="ruleForm.noticeContent"
-            style="height: 150px; overflow-y: hidden;"
+            style="height: 300px; overflow-y: hidden;"
             :default-config="editorConfig"
             mode="default"
             @onCreated="onCreated"
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index 0926957..a4cdd5e 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -16,7 +16,7 @@
   noticePublisher: '', // 发布人
   noticeTime: '', // 发布时间
   noticeTitle: '', // 标题
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -27,6 +27,7 @@
     text: '编号',
     value: 'noticeNo',
     align: 'center',
+    width: '180',
   },
   {
     text: '标题',
@@ -37,6 +38,7 @@
     text: '发布人',
     value: 'noticePublisher',
     align: 'center',
+    width: '150',
   },
   {
     text: '内容描述',
@@ -47,11 +49,15 @@
     text: '发布时间',
     value: 'noticeTime',
     align: 'center',
+    width: '200',
   },
 ] // 表格
 const list = ref([]) // 表格数据
 // 获取通知公告列表
 const getNoticeList = () => {
+  if (!searchQuery.noticeTime) {
+    searchQuery.noticeTime = ''
+  }
   getNoticeeApi(searchQuery).then((res) => {
     total.value = res.data.total
     list.value = res.data.rows
diff --git a/src/views/system/notice/noticeDetail.vue b/src/views/system/notice/noticeDetail.vue
index 94468d4..da36bd8 100644
--- a/src/views/system/notice/noticeDetail.vue
+++ b/src/views/system/notice/noticeDetail.vue
@@ -1,5 +1,6 @@
 <!-- 通知公告详情弹窗 -->
 <script lang="ts" setup name="noticeDetail">
+import { Editor } from '@wangeditor/editor-for-vue'
 import type { noticeType } from './notice-interface'
 import { getNoticeDetail } from '@/api/system/notice'
 import { getPhotoUrl } from '@/api/system/tool'
@@ -52,6 +53,18 @@
     })
   }
 })
+// 编辑器配置
+const editorConfig = ref({
+  readOnly: true,
+})
+// 富文本实例对象
+const editorRef = shallowRef()
+const onCreated = (editor: any) => {
+  editorRef.value = editor
+  nextTick(() => {
+    editorRef.value = editor // 一定要用 Object.seal() ，否则会报错
+  })
+}
 </script>
 
 <template>
@@ -89,7 +102,18 @@
       </el-form-item>
       <el-form-item label="发布内容" prop="noticeContent">
         <!-- <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" disabled /> -->
-        <div style="border: 1px solid #dcdfe6;width: 100%;border-radius: 4px;padding: 12px;" v-html="ruleForm.noticeContent" />
+        <!-- <div style="border: 1px solid #dcdfe6;width: 100%;border-radius: 4px;padding: 12px;" v-html="ruleForm.noticeContent" ></div> -->
+        <div style="border: 1px solid #dcdfe6;width: 100%;border-radius: 4px;">
+          <editor
+            ref="editorRef"
+            v-model="ruleForm.noticeContent"
+            style="height: 300px; overflow-y: hidden;"
+            :default-config="editorConfig"
+            mode="default"
+            :disabled="true"
+            @onCreated="onCreated"
+          />
+        </div>
       </el-form-item>
       <el-form-item label="查看附件">
         <el-link v-if="ruleForm.minioFileName" :href="minioFileUrl" type="primary" target="_blank">
diff --git a/src/views/system/tool/autograph/addDDialog.vue b/src/views/system/tool/autograph/addDDialog.vue
index e39b706..daadd9b 100644
--- a/src/views/system/tool/autograph/addDDialog.vue
+++ b/src/views/system/tool/autograph/addDDialog.vue
@@ -186,7 +186,7 @@
         <el-input v-model.trim="ruleForm.signDesc" placeholder="签名描述" :disabled="title === '详情'" />
       </el-form-item>
       <el-form-item label="可使用人" prop="userIdList">
-        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'">
+        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'" style="width: 100%;">
           <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </el-form-item>
@@ -198,7 +198,7 @@
         <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px', 'margin-top': ruleForm.minioFileName === '' ? '0px' : '56px' }" @click="upload">
           {{ ruleForm.minioFileName === '' ? '上传' : '更换图片' }}
         </el-button>
-        <input v-show="title === '123'" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <input v-show="title === '123'" ref="fileRef" type="file" accept="image/*" @change="onFileChange">
       </el-form-item>
     </el-form>
     <template #footer>
diff --git a/src/views/system/tool/autograph/autograph.vue b/src/views/system/tool/autograph/autograph.vue
index ac9f000..d3c6f81 100644
--- a/src/views/system/tool/autograph/autograph.vue
+++ b/src/views/system/tool/autograph/autograph.vue
@@ -15,7 +15,7 @@
   signName: '', // 名称
   signDirector: '', // 负责人
   createTime: '', // 创建时间
-  limit: 10,
+  limit: 20,
   offset: 1,
   signType: '',
 }) // 查询参数
@@ -38,6 +38,9 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.createTime) {
+    searchQuery.createTime = ''
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -168,10 +171,10 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model="searchQuery.signNo" placeholder="签章编号" clearable class="w-50 m-2 normal-input" />
+        <el-input v-model="searchQuery.signNo" placeholder="签名编号" clearable class="w-50 m-2 normal-input" />
       </search-item>
       <search-item>
-        <el-input v-model="searchQuery.signName" placeholder="签章名称" clearable class="w-50 m-2 normal-input" />
+        <el-input v-model="searchQuery.signName" placeholder="签名名称" clearable class="w-50 m-2 normal-input" />
       </search-item>
       <search-item>
         <el-input v-model="searchQuery.signDirector" placeholder="负责人" clearable class="w-50 m-2 normal-input" />
diff --git a/src/views/system/tool/certificate/addDDialog.vue b/src/views/system/tool/certificate/addDDialog.vue
index 2721bf8..0fdec28 100644
--- a/src/views/system/tool/certificate/addDDialog.vue
+++ b/src/views/system/tool/certificate/addDDialog.vue
@@ -185,7 +185,7 @@
         <el-input v-model.trim="ruleForm.templateDesc" placeholder="模板描述" :disabled="title === '详情'" />
       </el-form-item>
       <el-form-item label="可使用人" prop="userIdList">
-        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'">
+        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'" style="width: 100%;">
           <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </el-form-item>
diff --git a/src/views/system/tool/certificate/certificate.vue b/src/views/system/tool/certificate/certificate.vue
index 9787116..a2468de 100644
--- a/src/views/system/tool/certificate/certificate.vue
+++ b/src/views/system/tool/certificate/certificate.vue
@@ -15,7 +15,7 @@
   templateName: '', // 名称
   templateCreator: '', // 负责人
   createTime: '', // 创建时间
-  limit: 10,
+  limit: 20,
   offset: 1,
   templateType: '',
 }) // 查询参数
@@ -38,6 +38,9 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.createTime) {
+    searchQuery.createTime = ''
+  }
   templatePage(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
diff --git a/src/views/system/tool/document/addDDialog.vue b/src/views/system/tool/document/addDDialog.vue
index c440d1d..d5d28d8 100644
--- a/src/views/system/tool/document/addDDialog.vue
+++ b/src/views/system/tool/document/addDDialog.vue
@@ -186,7 +186,7 @@
         <el-input v-model.trim="ruleForm.templateDesc" placeholder="模板描述" :disabled="title === '详情'" />
       </el-form-item>
       <el-form-item label="可使用人" prop="userIdList">
-        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'">
+        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'" style="width: 100%;">
           <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </el-form-item>
diff --git a/src/views/system/tool/document/document.vue b/src/views/system/tool/document/document.vue
index 774e498..ac857ea 100644
--- a/src/views/system/tool/document/document.vue
+++ b/src/views/system/tool/document/document.vue
@@ -14,7 +14,7 @@
   templateName: '', // 名称
   templateCreator: '', // 负责人
   createTime: '', // 创建时间
-  limit: 10,
+  limit: 20,
   offset: 1,
   templateType: '',
 }) // 查询参数
@@ -37,6 +37,9 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.createTime) {
+    searchQuery.createTime = ''
+  }
   templatePage(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows

diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index bb58885..2959118 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -53,3 +53,64 @@
   }
   return true
 }
+
+/**
+ * 验证小写字母
+ * @param str
+ * @returns
+ */
+export function validateLowerCase(str: string) {
+  const reg = /^[a-z]+$/
+  return reg.test(str)
+}
+
+/* 验证大写字母 */
+export function validateUpperCase(str: string) {
+  const reg = /^[A-Z]+$/
+  return reg.test(str)
+}
+
+/* 验证大小写字母 */
+export function validateAlphabets(str: string) {
+  const reg = /^[A-Za-z]+$/
+  return reg.test(str)
+}
+
+/**
+ * 验证邮箱
+ * @param email
+ * @returns {boolean}
+ */
+export function validateEmail(email: string) {
+  const re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
+  return re.test(email)
+}
+
+/**
+ * 验证手机号
+ * @param phone
+ * @returns {boolean}
+ */
+export function validateMobile(phone: string) {
+  const re = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/
+  return re.test(phone)
+}
+
+/**
+ * 校验身份证号
+ * @param value
+ * @returns
+ */
+export function validateIdCardNo(value: string) {
+  const re = /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/
+  return re.test(value)
+}
+/**
+ *
+ * @param value 验证电话号码
+ * @returns
+ */
+export function validatePhone(value: string) {
+  const re = /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/
+  return re.test(value)
+}
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 1c2405e..bca0958 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,13 +1,46 @@
-<script lang="ts" setup name="borrowHandle">
-// 逻辑代码
+<!-- 设备借用处理 -->
+<script lang="ts" setup name="borrowApply">
+import list from './components/handleList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '待借用', comp: list },
+  { name: '已借用', comp: list },
+  { name: '已归还', comp: list },
+])
+const current = ref('待借用')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用处理
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 03d414b..c5771f7 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,13 +1,50 @@
+<!-- 设备借用申请 -->
 <script lang="ts" setup name="borrowApply">
-// 逻辑代码
+import list from './components/applyList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '全部', comp: list },
+  { name: '草稿箱', comp: list },
+  { name: '待审批', comp: list },
+  { name: '审批中', comp: list },
+  { name: '已通过', comp: list },
+  { name: '未通过', comp: list },
+  { name: '已取消', comp: list },
+])
+const current = ref('全部')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用申请
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
new file mode 100644
index 0000000..052f3ce
--- /dev/null
+++ b/src/views/device/borrow/components/applyList.vue
@@ -0,0 +1,328 @@
+<script lang="ts" setup name="borrowApplyList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '文件号',
+    value: 'fileNo',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '类别',
+    value: 'catergory',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '李四',
+      time: '2020-12-14 00:00:00',
+      status: '未通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const approveRef = ref()
+// 同意
+const agree = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '1',
+  })
+}
+// 驳回
+const reject = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '3',
+  })
+}
+// 拒绝
+const refuse = (row: any) => {
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
+}
+// 取消
+const cancel = (rowrow: any) => {
+  ElMessageBox.confirm(
+    '确认取消吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" @click="addBtn" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="agree(row)">
+                  同意
+                </el-button>
+                <el-button size="small" type="primary" link @click="reject(row)">
+                  驳回
+                </el-button>
+                <el-button size="small" type="primary" link @click="refuse(row)">
+                  拒绝
+                </el-button>
+                <el-button size="small" type="primary" link @click="cancel(row)">
+                  取消
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/components/approvalActionDialog.vue b/src/views/device/borrow/components/approvalActionDialog.vue
new file mode 100644
index 0000000..214876c
--- /dev/null
+++ b/src/views/device/borrow/components/approvalActionDialog.vue
@@ -0,0 +1,104 @@
+<!-- 审批操作弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
+const dialogVisibleApprove = ref(false)
+const form = reactive({
+  radio: '1',
+})
+const ruleFormRef = ref<FormInstance>()
+const rules = reactive<FormRules>({
+})
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const approvetime = ref('') // 审批时间
+const initDialog = (row: any) => {
+  dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
+}
+defineExpose({ initDialog })
+
+// 点击保存
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      dialogVisibleApprove.value = false
+      emits('resetData')
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  formEl.resetFields()
+  dialogVisibleApprove.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
+    <el-form
+      ref="ruleFormRef" :model="form"
+      :rules="rules" label-width="110px"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人">
+            <el-input disabled :value="userInfo.$state.name" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间">
+            <el-input disabled :value="approvetime" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
+        <el-button @click="resetForm(ruleFormRef)">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
new file mode 100644
index 0000000..cfda00a
--- /dev/null
+++ b/src/views/device/borrow/components/handleList.vue
@@ -0,0 +1,281 @@
+<script lang="ts" setup name="borrowHandleList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '申请编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'dept',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      dept: '顶级',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      dept: '徐州分中心',
+      user: '里斯',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+const borrow = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="borrow(row)">
+                  借用
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/addRow.vue b/src/views/device/standingBook/components/addRow.vue
index 1678cdb..07b03d1 100644
--- a/src/views/device/standingBook/components/addRow.vue
+++ b/src/views/device/standingBook/components/addRow.vue
@@ -5,7 +5,7 @@
 import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
+const formLabelWidth = '110px'
 const form = ref({})
 const formTable = ref([
   {
@@ -91,108 +91,188 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`">
+  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
     >
       <div v-if="name === '周检记录'">
-        <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录表编号" />
-        </el-form-item>
-        <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录人" />
-        </el-form-item>
-        <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="检定日期"
-          />
-        </el-form-item>
-        <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="有效日期"
-          />
-        </el-form-item>
-        <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="送检人" />
-        </el-form-item>
-        <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录表编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="检定日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="有效日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="送检人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '状态变更记录'">
-        <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="状态类型" clearable>
-            <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="结束日期"
-          />
-        </el-form-item>
-        <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="申请人" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="状态类型" clearable style="width: 100%;">
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="申请人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '使用记录'">
-        <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用人" />
-        </el-form-item>
-        <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用部门" />
-        </el-form-item>
-        <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="使用类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用结束日期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用部门" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="使用类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '检定证书'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="证书类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书出具日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书有效期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
     </el-form>
     <template #footer>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 5f7b347..9a9f798 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -352,7 +352,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -376,7 +376,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -391,7 +391,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -404,14 +404,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -434,7 +434,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -443,20 +443,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -480,23 +480,23 @@
               <com-tree-select
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -507,10 +507,10 @@
             <el-form-item label="检定部门" prop="mesureDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -520,7 +520,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -529,13 +529,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -544,21 +544,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -578,14 +578,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -594,14 +594,14 @@
         <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-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -669,7 +669,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index fc3fd54..d9d4514 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -199,6 +199,8 @@
     useDeptList.value = toTreeList(res.data, '0', true)
   })
 }
+const selectTreeRef1 = ref()
+const selectTreeRef2 = ref()
 // 重置
 const resetDATA = () => {
   ruleForm.value = {
@@ -254,6 +256,10 @@
     isStandardSupportEquipment: '', //		是否标准配套设备
     id: '',
   }
+  if (title.value !== '详情') {
+    selectTreeRef1.value.clearSelected()
+    selectTreeRef2.value.clearSelected()
+  }
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
@@ -378,7 +384,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -402,7 +408,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -416,8 +422,7 @@
             <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"
+                :placeholder="title === '详情' ? '' : '出厂年月'" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -430,14 +435,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -460,7 +465,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -469,20 +474,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -505,24 +510,26 @@
             <el-form-item label="使用部门" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
+                ref="selectTreeRef2"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -536,10 +543,12 @@
               </el-select> -->
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                ref="selectTreeRef1"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -549,7 +558,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -558,13 +567,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -573,21 +582,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -607,14 +616,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -624,14 +633,14 @@
           <el-col :span="6">
             <el-form-item label="资本来源" prop="capitalSource">
               <!-- <el-input v-model.trim="ruleForm.capitalSource" placeholder="资本来源" :disabled="title === '详情'" /> -->
-              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -699,7 +708,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f653095..f4229a6 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -147,19 +147,17 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
-  setTimeout(() => {
-    list.value = [
-      {
-        equipmentNo: 123,
-        equipmentName: 'test',
-        modelNo: '001',
-        usePersonName: '张三',
-        validDate: '2022-12-12 00:00:00',
-        useDeptName: '顶级',
-      },
-    ]
-    total.value = 1
-  }, 1000)
+  list.value = [
+    {
+      equipmentNo: 123,
+      equipmentName: 'test',
+      modelNo: '001',
+      usePersonName: '张三',
+      validDate: '2022-12-12 00:00:00',
+      useDeptName: '顶级',
+    },
+  ] as any
+  total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -220,9 +218,11 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -300,13 +300,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.mesureType" class="m-2 normal-select" placeholder="检定方式" clearable>
+          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable>
             <el-option
               v-for="item in mesureTypeList"
               :key="item.id"
@@ -316,7 +316,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.managerState" class="m-2 normal-select" placeholder="管理状态" clearable>
+          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable>
             <el-option
               v-for="item in managerStateList"
               :key="item.id"
@@ -327,8 +327,9 @@
         </search-item>
         <search-item>
           <com-tree-select
+            ref="selectTreeRef"
             v-model="searchQuery.useDept" :options="useDeptList" placeholder="使用部门"
-            :tree-props="deptProps" style="width: 150px;"
+            :tree-props="deptProps"
           />
         </search-item>
         <search-item>
@@ -336,11 +337,10 @@
             v-model="searchQuery.validDate" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="有效日期"
             class="normal-date"
-            style="width: 150px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.abc" class="m-2 normal-select" placeholder="ABC" clearable>
+          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable>
             <el-option
               v-for="item in abcList"
               :key="item.id"
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 78a3800..4c31a94 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -2,9 +2,10 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/fixedAssetsAdd.vue'
-import type { fixedAssetsType } from './standingBook-interface'
+import type { fixedAssetsType, selectType } from './standingBook-interface'
 import { exportFile } from '@/utils/exportUtils'
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
+import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   assetNo: '', // 固定编号
@@ -50,7 +51,7 @@
   },
   {
     text: '设备类型',
-    value: 'assetTypeName',
+    value: 'equipmentTypeName',
     width: '150',
     align: 'center',
   },
@@ -102,6 +103,7 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+const equipmentCategoryList = ref<selectType[]>([]) // 设备类别
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
@@ -242,6 +244,10 @@
 }
 onMounted(() => {
   getList()
+  // 获取设备类别
+  getDictByCode('equipmentCategory').then((response) => {
+    equipmentCategoryList.value = response.data
+  })
 })
 </script>
 
@@ -265,7 +271,10 @@
           <el-input v-model="searchQuery.equipmentSpecifications" placeholder="设备规格" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-select v-model="searchQuery.equipmentCategory" placeholder="设备类别" clearable>
+            <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+          </el-select>
         </search-item>
       </search-area>
       <table-container>
diff --git a/src/views/device/stateManage/components/addRow.vue b/src/views/device/stateManage/components/addRow.vue
new file mode 100644
index 0000000..3ba82d6
--- /dev/null
+++ b/src/views/device/stateManage/components/addRow.vue
@@ -0,0 +1,160 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { listPageApi } from '@/api/device/standingBook'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  limit: 10,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '出厂编号',
+    value: 'manufacturingNo',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+  },
+])
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listPageApi(listQuery.value as any).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map(item => ({ ...item, checked: '' }))
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    equipmentName: '', // 姓名
+    equipmentNo: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const checkedArr = list.value.filter(item => item.checked !== '')
+  if (checkedArr.length) {
+    console.log(checkedArr, '选中的设备')
+    emits('add', checkedArr)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择设备')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns as any" :query="listQuery"
+        :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-checkbox v-model="scope.row.checked" :label="scope.$index" size="large" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-checkbox__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index 56417d6..214876c 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -47,38 +47,45 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="30%">
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
-      :rules="rules"
+      :rules="rules" label-width="110px"
     >
-      <el-form-item label="审批意见">
-        <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
-        <el-radio-group v-model="form.radio">
-          <el-radio label="1">
-            同意
-          </el-radio>
-          <el-radio label="2">
-            拒绝
-          </el-radio>
-          <el-radio label="3">
-            驳回
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="审批结论">
-        <el-input
-          :rows="4"
-          type="textarea"
-        />
-      </el-form-item>
       <el-row :gutter="24">
-        <el-col :span="10">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="审批人">
             <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
-        <el-col :span="14">
+        <el-col :span="12">
           <el-form-item label="审批时间">
             <el-input disabled :value="approvetime" />
           </el-form-item>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index e74d70e..2003e31 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -1,7 +1,8 @@
 <!-- 新增或详情弹窗 -->
-<script lang="ts" setup name="addNotice">
+<script lang="ts" setup name="add">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
+import addRow from './addRow.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
@@ -16,6 +17,7 @@
 const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const name = ref('')
+const borrowList = ref([])
 const ruleForm = ref({
   assetNo: '', // 资产编号
   assetType: '', // 资产类型
@@ -357,10 +359,86 @@
     isShowCalibration.value = true
   }
 })
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerLevelName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+  },
+])
+const addRowRef = ref()
+// 添加行
+const addRowBtn = () => {
+  addRowRef.value.initDialog({ title: '添加' })
+}
+// 删除行
+const removeRowBtn = () => {
+  const removeArr = borrowList.value.filter(item => item.remove !== '')
+  if (removeArr.length) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      borrowList.value = borrowList.value.filter(item => item.remove === '')
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 借用设备列表添加
+const addRowMethods = (row) => {
+  row.forEach((element) => {
+    borrowList.value.push({ ...element, remove: '' })
+  })
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
     <detail-page :title="`${name}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
@@ -378,15 +456,16 @@
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder="">
+              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -430,7 +509,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -454,28 +533,56 @@
         </el-row>
       </el-form>
     </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>
+    <div>
+      <detail-block title="借用设备列表">
+        <template #btns>
+          <el-button type="primary" @click="addRowBtn">
+            添加行
+          </el-button>
+          <el-button type="info" @click="removeRowBtn">
+            删除行
+          </el-button>
+        </template>
+        <normal-table
+          :data="borrowList" :total="1" :columns="columns as any"
+        >
+          <template #preColumns>
+            <el-table-column label="选择" width="55" align="center">
+              <template #default="scope">
+                <el-checkbox v-model="scope.row.remove" :label="scope.$index" size="large" />
+              </template>
+            </el-table-column>
+            <el-table-column label="序号" width="60" align="center">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </detail-block>
+      <detail-block 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>
+    </div>
   </app-container>
 </template>
 
@@ -484,6 +591,10 @@
   background-color: #fff;
 }
 
+:deep(.el-checkbox__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,
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index aaaaf61..d588b8d 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,6 +1,7 @@
 <script lang="ts" setup name="bench">
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
+import type { trainLogStatistic } from './bench-interface'
 import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
 import { getPlanList } from '@/api/system/plan'
 import { listPageApi } from '@/api/measure/file'
@@ -132,15 +133,19 @@
     account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
+    const result: trainLogStatistic = res.data
+    const notQualified: number = Number(result.trainCount) - result.qualifiedCount
+    const qualifiedRate = ((result.qualifiedCount / result.trainCount) * 100).toFixed(2) // 合格率
+    const notQualifiedRate = ((notQualified / result.trainCount) * 100).toFixed(2) // 不合格率
     TrainLogSList.value = [
-      { name: `合格     ${res.data.qualified}-${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
-      { name: `不合格   ${res.data.notQualified}- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+      { name: `合   格   ${result.qualifiedCount}-${qualifiedRate}%`, value: result.qualifiedCount },
+      { name: `不合格   ${notQualified}- ${notQualifiedRate}%`, value: notQualified },
     ]
     TrainLogTitle.value = res.data.trainCount
   }).catch((_) => {
     // 处理异常
     TrainLogSList.value = [
-      { name: '合格     0 - 50%', value: 0 },
+      { name: '合   格   0 - 50%', value: 0 },
       { name: '不合格   0 - 50%', value: 0 },
     ]
     TrainLogTitle.value = 0
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 9ef0b93..1ad577b 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -270,7 +270,7 @@
               <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="6">
             <el-form-item label="名称" prop="fileName">
               <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
             </el-form-item>
@@ -279,13 +279,14 @@
         <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" class="fill-input" disabled>
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled style="width: 100%;">
                 <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="请选择发布单位"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -295,6 +296,7 @@
                 v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -311,12 +313,13 @@
                 v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人" prop="createUserId">
-              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index b45fbc3..542b284 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -26,7 +26,7 @@
   createUser: '', // 创建人
   createTime: '', // 创建
   approvalStatus: props.value, // 审批状态
-  limit: 10,
+  limit: 20,
   offset: 1,
   fileType: '', // 类型
   formId: '',
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 7d4724b..e54ddf5 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -26,7 +26,7 @@
   fileCode: '', // 文件号
   effectiveTime: '', // 实施时间
   effectiveStatus: '', // 实施状态
-  limit: 10,
+  limit: 20,
   offset: 1,
   fileType: '', // 类型
 }) // 查询参数
@@ -75,13 +75,19 @@
 const getStatus = () => {
   getDictByCode('effectiveStatus').then((res) => {
     if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
+      effectiveStatusSelect.value = [...res.data, { name: '全部', value: '', id: 'quanbu' }]
     }
   })
 }
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.publishTime) {
+    searchQuery.publishTime = ''
+  }
+  if (!searchQuery.effectiveTime) {
+    searchQuery.effectiveTime = ''
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -252,13 +258,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" />
         </search-item>
         <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
@@ -274,20 +280,16 @@
           <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: 185px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
             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: 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" placeholder="实施状态" clearable>
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index 5ca3275..a95c665 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -505,21 +505,21 @@
         <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] === '详情'" @change="directorChange">
+              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;" @change="directorChange">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.name" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
-              <el-select v-model="ruleForm.technologyJob" :placeholder="title.split('-')[2] === '详情' ? '' : '技术职务'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.technologyJob" :placeholder="title.split('-')[2] === '详情' ? '' : '技术职务'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;">
                 <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="administrationJob">
-              <el-select v-model="ruleForm.administrationJob" :placeholder="title.split('-')[2] === '详情' ? '' : '行政职务'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.administrationJob" :placeholder="title.split('-')[2] === '详情' ? '' : '行政职务'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index aac1ef2..11d6d0a 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -22,7 +22,7 @@
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
-  limit: 10,
+  limit: 20,
   offset: 1,
   organizeType: '', // 类型
   createTime: '', // 创建时间
@@ -118,6 +118,9 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.createTime) {
+    searchQuery.createTime = ''
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows.map(item => ({ ...item, createTime: item.createTime.split(' ')[0] }))
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 3f472eb..bc5d9d4 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -7,7 +7,9 @@
 // import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
-import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+// import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const props = defineProps({
   isRemind: {
     type: Boolean,
@@ -78,11 +80,14 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 // 获取所有部门
-const deptList = ref<DeptTreeNode[]>([])
+const deptList = ref([])
 const getDeptList = async () => {
   getDeptTreeList().then((res) => {
-    deptList.value = res.data
+    deptList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
@@ -177,6 +182,7 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   searchQuery.staffNo = ''
@@ -184,6 +190,7 @@
   searchQuery.deptId = ''
   searchQuery.certificateStatus = ''
   searchQuery.verifierCertificateNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -212,10 +219,6 @@
     loading.close()
   })
 }
-// 打印
-const print = () => {
-
-}
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传图片
@@ -268,20 +271,24 @@
           <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+          <!-- <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
             <el-option
               v-for="item in deptList"
               :key="item.id"
               :label="item.name"
               :value="item.id"
             />
-          </el-select>
+          </el-select> -->
+          <com-tree-select
+            ref="selectTreeRef" v-model="searchQuery.deptId" :options="deptList"
+            placeholder="工作部门" :tree-props="deptProps"
+          />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况">
+          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况" clearable>
             <el-option
               v-for="item in certificateStatusList"
               :key="item.id"
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 4352604..5a5f036 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -389,10 +389,10 @@
           关闭
         </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">
-            <el-form-item prop="minioFileName" label-width="70px">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item prop="minioFileName">
               <el-upload
                 class="avatar-uploader"
                 :show-file-list="false"
@@ -423,23 +423,24 @@
               <el-date-picker
                 v-model="ruleForm.birthday" type="date" format="YYYY-MM" value-format="YYYY-MM"
                 placeholder="出生年月" :disabled="title === '详情'"
+                style="width: 100%;"
               />
             </el-form-item>
             <el-form-item label="工作部门" prop="deptId" class="marg-item">
-              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled>
+              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled style="width: 100%;">
                 <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="ruleForm.deptId" :options="PubListTree"
-                placeholder="选择组织机构" :tree-props="deptProps"
+                placeholder="选择组织机构" :tree-props="deptProps" style="width: 100%;"
               />
             </el-form-item>
             <el-form-item label="计量专业" prop="major" class="marg-item">
               <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
             </el-form-item>
             <el-form-item label="是否特操人" prop="specialOperator" class="marg-item">
-              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -449,23 +450,23 @@
               <el-input v-model.trim="ruleForm.staffNo" placeholder="系统自动生成" disabled />
             </el-form-item>
             <el-form-item label="性别" prop="sex" class="marg-item">
-              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="技术职务" prop="technologyJob" class="marg-item">
-              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="从事日期" prop="workDate" class="marg-item">
               <el-date-picker
                 v-model="ruleForm.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-                placeholder="请选择从事日期"
+                placeholder="请选择从事日期" style="width: 100%;"
               />
             </el-form-item>
-            <el-form-item label="是否技术考核" prop="technologyExam" class="marg-item">
-              <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'">
+            <el-form-item label="是否技术考核" prop="technologyExam" class="marg-item" style="width: 100%;">
+              <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -475,17 +476,17 @@
               <el-input ref="cardRef" v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" @blur="getBirthday" />
             </el-form-item>
             <el-form-item label="文化程度" prop="education" class="marg-item">
-              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="行政职务" prop="administrationJob" class="marg-item">
-              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="是否主考人" prop="mainExaminer" class="marg-item">
-              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index 042636e..660f2b0 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -264,7 +264,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="性别" prop="meterStaff.sex">
-              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -273,21 +273,21 @@
         <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-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -296,7 +296,7 @@
         <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-select v-if="title === '详情'" v-model="meterStaff.deptId" disabled style="width: 100%;">
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
               <com-tree-select
@@ -304,6 +304,7 @@
                 ref="selectTreeRef" v-model="meterStaff.deptId" :options="PubListTree"
                 placeholder="选择组织机构"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -316,7 +317,7 @@
             <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="请选择从事日期"
+                placeholder="请选择从事日期" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -347,7 +348,7 @@
             <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="请选择发证日期"
+                placeholder="请选择发证日期" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -355,7 +356,7 @@
             <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="请选择有效日期"
+                placeholder="请选择有效日期" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 178fc12..d0116f3 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -3,7 +3,7 @@
 import type { FormInstance, FormRules } from 'element-plus'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
+const formLabelWidth = '110px'
 const form = reactive({
   certificateNo: '', // 证书号
   certificateName: '', // 证书名称
@@ -71,32 +71,52 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`" width="40%">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
     >
-      <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
-        <el-input v-model="form.certificateNo" placeholder="证书号" />
-      </el-form-item>
-      <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
-        <el-input v-model="form.certificateName" placeholder="证书名称" />
-      </el-form-item>
-      <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
-        <el-input v-model="form.certificateCompany" placeholder="发证单位" />
-      </el-form-item>
-      <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
-        <el-date-picker
-          v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择发证日期"
-        />
-      </el-form-item>
-      <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-        <el-date-picker
-          v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择有效日期"
-        />
-      </el-form-item>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
+            <el-input v-model="form.certificateNo" placeholder="证书号" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
+            <el-input v-model="form.certificateName" placeholder="证书名称" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
+            <el-input v-model="form.certificateCompany" placeholder="发证单位" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
+            <el-date-picker
+              v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择发证日期" style="width: 100%;"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+            <el-date-picker
+              v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择有效日期" style="width: 100%;"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <template #footer>
       <span class="dialog-footer">
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
index 5e20d1b..10b0deb 100644
--- a/src/views/measure/person/components/personListDialog.vue
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -1,8 +1,11 @@
 <!-- 计量人员列表弹窗 -->
 <script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
 import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import { getDeptTreeList } from '@/api/system/dept'
-import type { TreeStructure } from '@/views/system/user/user-interface'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -10,7 +13,7 @@
   staffNo: '', // 人员编号
   name: '', // 姓名
   deptId: '', // 所在部门
-  limit: 5,
+  limit: 10,
   offset: 1,
 })
 const loadingTable = ref<boolean>(false)
@@ -32,20 +35,22 @@
   },
 ])
 // 获取部门
-const deptIdList = ref<TreeStructure[]>([])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const deptIdList = ref([])
 const getDeptList = () => {
   getDeptTreeList().then((res) => {
-    deptIdList.value = res.data
+    deptIdList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
 const fetchData = () => {
-  select.value = ''
+  select.value = -1
   getStaffList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.records
       total.value = Number(res.data.total)
-      console.log(list.value, 'list')
     }
   })
 }
@@ -53,6 +58,7 @@
 const search = () => {
   fetchData()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   listQuery.value = {
@@ -62,6 +68,7 @@
     limit: 10,
     offset: 1,
   }
+  selectTreeRef.value.clearSelected()
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -76,18 +83,24 @@
 }
 // 点击保存
 const submitForm = () => {
-  const person = list.value.filter((item, index) => index == select.value)[0]
-  console.log(person, 'person')
-  getStaffDetail(person).then((res) => {
-    if (res.code === 200) {
-      emits('add', res.data)
-      dialogFormVisible.value = false
-    }
-  })
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    getStaffDetail(person).then((res) => {
+      if (res.code === 200) {
+        emits('add', res.data)
+        dialogFormVisible.value = false
+        reset()
+      }
+    })
+  }
+  else {
+    ElMessage.warning('请先选择人员')
+  }
 }
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
+  reset()
 }
 // 初始化
 const initDialog = () => {
@@ -99,39 +112,45 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员" width="50%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable style="width: 150px;" />
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable style="width: 150px;" />
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
+        <!-- <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
           <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
+        </el-select> -->
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
-    <normal-table
-      :data="list" :total="total" :columns="columns" :query="listQuery"
-      :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>
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :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">
             {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
           </template>
         </el-table-column> -->
-      </template>
-    </normal-table>
+        </template>
+      </normal-table>
+    </div>
     <template #footer>
       <span class="dialog-footer">
         <el-button type="primary" @click="submitForm">确认</el-button>
diff --git a/src/views/measure/person/components/userListDialog.vue b/src/views/measure/person/components/userListDialog.vue
index dcd05b5..cd62a73 100644
--- a/src/views/measure/person/components/userListDialog.vue
+++ b/src/views/measure/person/components/userListDialog.vue
@@ -3,14 +3,16 @@
 import { ElMessage } from 'element-plus'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
-import type { TreeStructure } from '@/views/system/user/user-interface'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
 const listQuery = ref({
   keywords: '', // 姓名
   deptId: '', // 所在部门
-  limit: 5,
+  limit: 10,
   offset: 1,
 })
 const loadingTable = ref<boolean>(false)
@@ -31,11 +33,14 @@
     value: 'deptName',
   },
 ])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 // 获取部门
-const deptIdList = ref<TreeStructure[]>([])
+const deptIdList = ref([])
 const getDeptList = () => {
   getDeptTreeList().then((res) => {
-    deptIdList.value = res.data
+    deptIdList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
@@ -52,6 +57,7 @@
 const search = () => {
   fetchData()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   listQuery.value = {
@@ -60,6 +66,7 @@
     limit: 10,
     offset: 1,
   }
+  selectTreeRef.value.clearSelected()
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -74,11 +81,11 @@
 }
 // 点击保存
 const submitForm = () => {
-  console.log(select.value)
   if (select.value >= 0) {
     const person = list.value.filter((item, index) => index == select.value)[0]
     emits('add', person)
     dialogFormVisible.value = false
+    reset()
   }
   else {
     ElMessage.warning('请先选择人员')
@@ -87,9 +94,11 @@
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
+  reset()
 }
 // 初始化
 const initDialog = () => {
+  // reset()
   dialogFormVisible.value = true
   getDeptList()
   fetchData()
@@ -98,16 +107,20 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+  <el-dialog v-model="dialogFormVisible" title="选择人员" width="50%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
         <el-input v-model.trim="listQuery.keywords" placeholder="真实姓名" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable>
+        <!-- <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable>
           <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
+        </el-select> -->
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 9c6f65d..355473a 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -7,7 +7,9 @@
 // import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
-import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+// import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
@@ -16,7 +18,7 @@
   major: '', // 计量专业
   verifierCertificateNo: '', // 证书号
   certificateStatus: '', // 证书状态
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -52,10 +54,10 @@
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取所有部门
-const deptList = ref<DeptTreeNode[]>([])
+const deptList = ref([])
 const getDeptList = async () => {
   getDeptTreeList().then((res) => {
-    deptList.value = res.data
+    deptList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
@@ -126,6 +128,7 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   searchQuery.staffNo = ''
@@ -133,6 +136,7 @@
   searchQuery.deptId = ''
   searchQuery.major = ''
   searchQuery.verifierCertificateNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -160,10 +164,9 @@
     loading.close()
   })
 }
-// 打印
-const print = () => {
-
-}
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传图片
@@ -216,14 +219,18 @@
           <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+          <!-- <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
             <el-option
               v-for="item in deptList"
               :key="item.id"
               :label="item.name"
               :value="item.id"
             />
-          </el-select>
+          </el-select> -->
+          <com-tree-select
+            ref="selectTreeRef" v-model="searchQuery.deptId" :options="deptList"
+            placeholder="工作部门" :tree-props="deptProps"
+          />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.major" placeholder="计量专业" clearable class="w-50 m-2" />
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index af0a29d..2e0e7af 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -1,12 +1,15 @@
 <script lang="ts" setup name="ListSourceAdd">
-import { reactive, ref } from 'vue'
+/**
+ * 添加/编辑/详情溯源供方
+ */
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions, IformInline } from './list_interface'
+import type { IOptions, IformInline, traceSupplierPerson } from './list_interface'
 import { exportFile } from '@/utils/exportUtils'
 import { UploadFile } from '@/api/measure/file'
 import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+import { validatePhone } from '@/utils/validate'
 const props = defineProps({
   infoId: {
     type: String,
@@ -19,43 +22,45 @@
 })
 const emit = defineEmits(['close'])
 const formInline: Ref<IformInline> = ref({
-  businessContent: null,
-  supplierName: null,
-  supplierNo: null,
-  bankAccount: null,
-  bankAccountNumber: null,
-  bankName: null,
-  briefName: null,
-  businessScope: null,
-  companyAddress: null,
-  companyArea: null,
-  companyCity: null,
-  companyCountry: null,
-  companyProvince: null,
-  createTime: null,
-  director: null,
-  fax: null,
-  invoiceAddress: null,
-  invoiceArea: null,
-  invoiceCity: null,
-  invoiceCountry: null,
-  invoiceProvince: null,
-  mailbox: null,
-  minioFileName: null,
-  mobile: null,
-  phone: null,
-  postalCode: null,
-  remark: null,
-  taxNumber: null,
-  website: null,
+  id: '',
+  businessContent: '',
+  supplierName: '',
+  supplierNo: '',
+  bankAccount: '',
+  bankAccountNumber: '',
+  bankName: '',
+  briefName: '',
+  businessScope: '',
+  companyAddress: '',
+  companyArea: '',
+  companyCity: '',
+  companyCountry: '',
+  companyProvince: '',
+  createTime: '',
+  director: '',
+  fax: '',
+  invoiceAddress: '',
+  invoiceArea: '',
+  invoiceCity: '',
+  invoiceCountry: '',
+  invoiceProvince: '',
+  mailbox: '',
+  minioFileName: '',
+  mobile: '',
+  phone: '',
+  postalCode: '',
+  remark: '',
+  taxNumber: '',
+  website: '',
   traceSupplierPersonList: [],
 })
+const traceSupplierPersonList: Ref<traceSupplierPerson[]> = ref([])
 const columns = ref([
-  { text: '人员编号', value: 'personNo', show: true },
-  { text: '姓名', value: 'name', show: true },
-  { text: '工作部门', value: 'department', show: true },
-  { text: '职务', value: 'job', show: true },
-  { text: '联系方式', value: 'phone', show: true },
+  { text: '人员编号', value: 'personNo', required: false },
+  { text: '姓名', value: 'name', required: true },
+  { text: '工作部门', value: 'department', required: false },
+  { text: '职务', value: 'job', required: false },
+  { text: '联系方式', value: 'phone', required: true, reg: validatePhone },
 ])
 const ruleFormRef = ref<FormInstance>()
 const provinceList = ref<IOptions[]>([])
@@ -66,14 +71,17 @@
 const invoiceCityList = ref<IOptions[]>([])
 const areaInvoiceList = ref<IOptions[]>([])
 const dialogVisible = ref(false)
-const addPersonList = ref({
+// 人员对象
+const addPersonObj: traceSupplierPerson = {
+  id: '',
   personNo: '',
   name: '',
   department: '',
   job: '',
   phone: '',
-})
-const SelectionList = ref([])
+  editable: true,
+}
+const SelectionList: Ref<traceSupplierPerson[]> = ref([])
 const upload = ref<UploadInstance>()
 // 校验规则
 const rules = ref({
@@ -91,7 +99,7 @@
   })
 }
 // 表格选中
-const handleSelectionChange = (e: any) => {
+const handleSelectionChange = (e: traceSupplierPerson[]) => {
   SelectionList.value = e
 }
 // 获取公司地址省级
@@ -142,15 +150,33 @@
   })
 }
 // 点击增加行
-const addRoow = () => {
-  const object = {
-    personNo: '',
-    name: '',
-    department: '',
-    job: '',
-    phone: '',
+const addRow = () => {
+  // 检查上一行必填项
+  if (checkPersonList()) {
+    setAllRowReadable()
+    traceSupplierPersonList.value.push({ ...addPersonObj })
   }
-  formInline.value.traceSupplierPersonList.push(object)
+}
+// 检查人员列表
+function checkPersonList() {
+  for (let index = 0; index < traceSupplierPersonList.value.length; index++) {
+    const item = traceSupplierPersonList.value[index]
+    for (const prop of columns.value) {
+      // 检查必填
+      if (prop.required && !item[prop.value]) {
+        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
+        return false
+      }
+      // 验证正则
+      if (prop.reg && typeof prop.reg === 'function') {
+        if (!prop.reg(item[prop.value])) {
+          ElMessage.warning(`第${index + 1}行中${prop.text}输入不合法`)
+          return false
+        }
+      }
+    }
+  }
+  return true
 }
 // 点击关闭
 const handleClose = () => {
@@ -158,12 +184,12 @@
 }
 // 点击弹窗的完成追加到表格数组中
 const addPushList = () => {
-  formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonList.value)))
+  formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonObj.value)))
   handleClose()
 }
 // 删除行
 const deleteList = () => {
-  formInline.value.traceSupplierPersonList = formInline.value.traceSupplierPersonList.filter((item) => {
+  traceSupplierPersonList.value = traceSupplierPersonList.value.filter((item: traceSupplierPerson) => {
     return !SelectionList.value.includes(item)
   })
 }
@@ -261,10 +287,16 @@
     }
   })
 }
-// 双击表格显示输入框
-const dblclickName = (item: object) => {
-  console.log(item)
-  item.show = false
+// 双击行显示输入框
+const dblclickRow = (row: traceSupplierPerson) => {
+  setAllRowReadable()
+  row.editable = true
+}
+// 将所有人员信息列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of traceSupplierPersonList.value) {
+    item.editable = false
+  }
 }
 if (props.buttonType !== '新建') {
   getInfo()
@@ -273,7 +305,7 @@
 
 <template>
   <app-container>
-    <detail-page :title="`培训计划-${buttonType}`">
+    <detail-page :title="`溯源供方-${buttonType}`">
       <template #btns>
         <el-button
           type="primary"
@@ -617,39 +649,36 @@
       </el-form>
     </detail-page>
     <detail-block title="人员信息">
-      <template #btns>
-        <el-button
-          type="info"
-          :disabled="buttonType === '详情'"
-          @click="deleteList"
-        >
+      <template v-if="buttonType !== '详情'" #btns>
+        <el-button type="info" @click="deleteList">
           删除行
         </el-button>
-        <el-button
-          type="primary"
-          :disabled="buttonType === '详情'"
-          @click="addRoow"
-        >
+        <el-button type="primary" @click="addRow">
           增加行
         </el-button>
       </template>
       <el-table
-        :data="formInline.traceSupplierPersonList"
+        :data="traceSupplierPersonList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
+        @row-dblclick="dblclickRow"
       >
-        <el-table-column type="selection" width="55" />
+        <el-table-column type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column
           v-for="item in columns"
           :key="item.value"
           :prop="item.value"
           :label="item.text"
+          align="center"
         >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
           <template #default="scope">
-            <span v-show="item.show" style="color: gray;" @dblclick="dblclickName(item)">{{ scope.row[item.value] || `双击编辑${item.text}` }}</span>
-            <el-input v-show="!item.show" v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" @blur="item.show = true" />
+            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+            <el-input v-else v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index 530bcc4..c057976 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -24,6 +24,18 @@
   areaName: string
 }
 
+// 溯源供方人员
+export interface traceSupplierPerson {
+  id: number | string // id
+  job: string // 职务
+  department: string// 部门
+  name: string// 信命
+  personNo: string// 人员编号
+  phone: string// 联系方式
+  editable?: boolean // 是否可编辑
+  [key: string]: any
+}
+
 export interface IformInline {
   businessContent: string
   supplierName: string
@@ -55,5 +67,6 @@
   remark: string
   taxNumber: string
   website: string
-  traceSupplierPersonList: []
+  traceSupplierPersonList: traceSupplierPerson []
 }
+
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index e44001a..600eda1 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -32,11 +32,20 @@
   dialogVisible.value = true
   ruleForm.noticePublisher = userInfo.$state.name
   ruleForm.noticeCompany = userInfo.$state.deptName
-  ruleForm.noticeTime = dayjs().format('YYYY-MM-DD')
+  ruleForm.noticeTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
 }
 defineExpose({ initDialog })
+// 重置
+const resetDialog = () => {
+  ruleForm.noticeTime = ''
+  ruleForm.noticeSketch = ''
+  ruleForm.noticeContent = ''
+  ruleForm.minioFileName = ''
+  ruleForm.noticeTitle = ''
+}
 // 关闭弹窗
 const close = () => {
+  resetDialog()
   dialogVisible.value = false
   emits('resetData')
 }
@@ -63,6 +72,7 @@
 const resetForm = (formEl: FormInstance | undefined) => {
   // if (!formEl) { return }
   formEl?.resetFields()
+  resetDialog()
   dialogVisible.value = false
   emits('resetData')
 }
@@ -105,7 +115,7 @@
     uploadImage: {
       server: 'http://111.198.10.15:21409/minio/file/upload', // 配置图片上传地址
       maxFileSize: 2 * 1024 * 1024, // 10M  图片大小限制
-      fieldName: 'img', // 上传类型
+      fieldName: 'multipartFile', // 上传名字
       allowedFileTypes: [], // 选择文件时的类型限制，默认为 ['image/*'] 。如不想限制，则设置为 []
       // 自定义上传参数，传递图片时需要带一些参数过去写在这。参数会被添加到 formData 中，一起上传到服务端。
       // meta: {
@@ -154,9 +164,9 @@
     uploadVideo: {
       server: 'http://111.198.10.15:21409/minio/file/upload', // 配置视频上传地址
       maxFileSize: 5 * 1024 * 1024, // 5M  视频大小限制
-      fieldName: 'your-custom-name', // 上传类型
+      fieldName: 'multipartFile', // 上传名字
       // 最多可上传几个文件，默认为 5
-      maxNumberOfFiles: 3,
+      // maxNumberOfFiles: 1,
       allowedFileTypes: [], // 选择文件时的类型限制，默认为 ['video/*'] 。如不想限制，则设置为 []
       // 自定义上传参数，传递图片时需要带一些参数过去写在这。参数会被添加到 formData 中，一起上传到服务端。
       // meta: {
@@ -167,8 +177,8 @@
       //     Accept: 'text/x-json',
       //     otherKey: 'xxx'
       // },
-      metaWithUrl: false, // 将 meta 拼接到 url 参数中，默认 false
-      withCredentials: true, // 跨域是否传递 cookie ，默认为 false
+      // metaWithUrl: false, // 将 meta 拼接到 url 参数中，默认 false
+      // withCredentials: true, // 跨域是否传递 cookie ，默认为 false
       // 上传之前触发
       onBeforeUpload(file: any) {
         // file 选中的文件，格式如 { key: file }
@@ -222,9 +232,6 @@
     editorRef.value = editor // 一定要用 Object.seal() ，否则会报错
   })
 }
-const look = () => {
-  console.log(ruleForm.noticeContent)
-}
 const minioFileUrl = ref('')
 watch(() => ruleForm.minioFileName, (newVal) => {
   if (newVal) {
@@ -278,7 +285,7 @@
           />
           <editor
             v-model="ruleForm.noticeContent"
-            style="height: 150px; overflow-y: hidden;"
+            style="height: 300px; overflow-y: hidden;"
             :default-config="editorConfig"
             mode="default"
             @onCreated="onCreated"
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index 0926957..a4cdd5e 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -16,7 +16,7 @@
   noticePublisher: '', // 发布人
   noticeTime: '', // 发布时间
   noticeTitle: '', // 标题
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -27,6 +27,7 @@
     text: '编号',
     value: 'noticeNo',
     align: 'center',
+    width: '180',
   },
   {
     text: '标题',
@@ -37,6 +38,7 @@
     text: '发布人',
     value: 'noticePublisher',
     align: 'center',
+    width: '150',
   },
   {
     text: '内容描述',
@@ -47,11 +49,15 @@
     text: '发布时间',
     value: 'noticeTime',
     align: 'center',
+    width: '200',
   },
 ] // 表格
 const list = ref([]) // 表格数据
 // 获取通知公告列表
 const getNoticeList = () => {
+  if (!searchQuery.noticeTime) {
+    searchQuery.noticeTime = ''
+  }
   getNoticeeApi(searchQuery).then((res) => {
     total.value = res.data.total
     list.value = res.data.rows
diff --git a/src/views/system/notice/noticeDetail.vue b/src/views/system/notice/noticeDetail.vue
index 94468d4..da36bd8 100644
--- a/src/views/system/notice/noticeDetail.vue
+++ b/src/views/system/notice/noticeDetail.vue
@@ -1,5 +1,6 @@
 <!-- 通知公告详情弹窗 -->
 <script lang="ts" setup name="noticeDetail">
+import { Editor } from '@wangeditor/editor-for-vue'
 import type { noticeType } from './notice-interface'
 import { getNoticeDetail } from '@/api/system/notice'
 import { getPhotoUrl } from '@/api/system/tool'
@@ -52,6 +53,18 @@
     })
   }
 })
+// 编辑器配置
+const editorConfig = ref({
+  readOnly: true,
+})
+// 富文本实例对象
+const editorRef = shallowRef()
+const onCreated = (editor: any) => {
+  editorRef.value = editor
+  nextTick(() => {
+    editorRef.value = editor // 一定要用 Object.seal() ，否则会报错
+  })
+}
 </script>
 
 <template>
@@ -89,7 +102,18 @@
       </el-form-item>
       <el-form-item label="发布内容" prop="noticeContent">
         <!-- <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" disabled /> -->
-        <div style="border: 1px solid #dcdfe6;width: 100%;border-radius: 4px;padding: 12px;" v-html="ruleForm.noticeContent" />
+        <!-- <div style="border: 1px solid #dcdfe6;width: 100%;border-radius: 4px;padding: 12px;" v-html="ruleForm.noticeContent" ></div> -->
+        <div style="border: 1px solid #dcdfe6;width: 100%;border-radius: 4px;">
+          <editor
+            ref="editorRef"
+            v-model="ruleForm.noticeContent"
+            style="height: 300px; overflow-y: hidden;"
+            :default-config="editorConfig"
+            mode="default"
+            :disabled="true"
+            @onCreated="onCreated"
+          />
+        </div>
       </el-form-item>
       <el-form-item label="查看附件">
         <el-link v-if="ruleForm.minioFileName" :href="minioFileUrl" type="primary" target="_blank">
diff --git a/src/views/system/tool/autograph/addDDialog.vue b/src/views/system/tool/autograph/addDDialog.vue
index e39b706..daadd9b 100644
--- a/src/views/system/tool/autograph/addDDialog.vue
+++ b/src/views/system/tool/autograph/addDDialog.vue
@@ -186,7 +186,7 @@
         <el-input v-model.trim="ruleForm.signDesc" placeholder="签名描述" :disabled="title === '详情'" />
       </el-form-item>
       <el-form-item label="可使用人" prop="userIdList">
-        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'">
+        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'" style="width: 100%;">
           <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </el-form-item>
@@ -198,7 +198,7 @@
         <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px', 'margin-top': ruleForm.minioFileName === '' ? '0px' : '56px' }" @click="upload">
           {{ ruleForm.minioFileName === '' ? '上传' : '更换图片' }}
         </el-button>
-        <input v-show="title === '123'" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <input v-show="title === '123'" ref="fileRef" type="file" accept="image/*" @change="onFileChange">
       </el-form-item>
     </el-form>
     <template #footer>
diff --git a/src/views/system/tool/autograph/autograph.vue b/src/views/system/tool/autograph/autograph.vue
index ac9f000..d3c6f81 100644
--- a/src/views/system/tool/autograph/autograph.vue
+++ b/src/views/system/tool/autograph/autograph.vue
@@ -15,7 +15,7 @@
   signName: '', // 名称
   signDirector: '', // 负责人
   createTime: '', // 创建时间
-  limit: 10,
+  limit: 20,
   offset: 1,
   signType: '',
 }) // 查询参数
@@ -38,6 +38,9 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.createTime) {
+    searchQuery.createTime = ''
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -168,10 +171,10 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model="searchQuery.signNo" placeholder="签章编号" clearable class="w-50 m-2 normal-input" />
+        <el-input v-model="searchQuery.signNo" placeholder="签名编号" clearable class="w-50 m-2 normal-input" />
       </search-item>
       <search-item>
-        <el-input v-model="searchQuery.signName" placeholder="签章名称" clearable class="w-50 m-2 normal-input" />
+        <el-input v-model="searchQuery.signName" placeholder="签名名称" clearable class="w-50 m-2 normal-input" />
       </search-item>
       <search-item>
         <el-input v-model="searchQuery.signDirector" placeholder="负责人" clearable class="w-50 m-2 normal-input" />
diff --git a/src/views/system/tool/certificate/addDDialog.vue b/src/views/system/tool/certificate/addDDialog.vue
index 2721bf8..0fdec28 100644
--- a/src/views/system/tool/certificate/addDDialog.vue
+++ b/src/views/system/tool/certificate/addDDialog.vue
@@ -185,7 +185,7 @@
         <el-input v-model.trim="ruleForm.templateDesc" placeholder="模板描述" :disabled="title === '详情'" />
       </el-form-item>
       <el-form-item label="可使用人" prop="userIdList">
-        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'">
+        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'" style="width: 100%;">
           <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </el-form-item>
diff --git a/src/views/system/tool/certificate/certificate.vue b/src/views/system/tool/certificate/certificate.vue
index 9787116..a2468de 100644
--- a/src/views/system/tool/certificate/certificate.vue
+++ b/src/views/system/tool/certificate/certificate.vue
@@ -15,7 +15,7 @@
   templateName: '', // 名称
   templateCreator: '', // 负责人
   createTime: '', // 创建时间
-  limit: 10,
+  limit: 20,
   offset: 1,
   templateType: '',
 }) // 查询参数
@@ -38,6 +38,9 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.createTime) {
+    searchQuery.createTime = ''
+  }
   templatePage(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
diff --git a/src/views/system/tool/document/addDDialog.vue b/src/views/system/tool/document/addDDialog.vue
index c440d1d..d5d28d8 100644
--- a/src/views/system/tool/document/addDDialog.vue
+++ b/src/views/system/tool/document/addDDialog.vue
@@ -186,7 +186,7 @@
         <el-input v-model.trim="ruleForm.templateDesc" placeholder="模板描述" :disabled="title === '详情'" />
       </el-form-item>
       <el-form-item label="可使用人" prop="userIdList">
-        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'">
+        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'" style="width: 100%;">
           <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </el-form-item>
diff --git a/src/views/system/tool/document/document.vue b/src/views/system/tool/document/document.vue
index 774e498..ac857ea 100644
--- a/src/views/system/tool/document/document.vue
+++ b/src/views/system/tool/document/document.vue
@@ -14,7 +14,7 @@
   templateName: '', // 名称
   templateCreator: '', // 负责人
   createTime: '', // 创建时间
-  limit: 10,
+  limit: 20,
   offset: 1,
   templateType: '',
 }) // 查询参数
@@ -37,6 +37,9 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.createTime) {
+    searchQuery.createTime = ''
+  }
   templatePage(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
diff --git a/src/views/system/tool/signature/addDDialog.vue b/src/views/system/tool/signature/addDDialog.vue
index 509509c..bb4c177 100644
--- a/src/views/system/tool/signature/addDDialog.vue
+++ b/src/views/system/tool/signature/addDDialog.vue
@@ -185,7 +185,7 @@
         <el-input v-model.trim="ruleForm.signDesc" placeholder="签章描述" :disabled="title === '详情'" />
       </el-form-item>
       <el-form-item label="可使用人" prop="userIdList">
-        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'">
+        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'" style="width: 100%;">
           <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </el-form-item>

diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index bb58885..2959118 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -53,3 +53,64 @@
   }
   return true
 }
+
+/**
+ * 验证小写字母
+ * @param str
+ * @returns
+ */
+export function validateLowerCase(str: string) {
+  const reg = /^[a-z]+$/
+  return reg.test(str)
+}
+
+/* 验证大写字母 */
+export function validateUpperCase(str: string) {
+  const reg = /^[A-Z]+$/
+  return reg.test(str)
+}
+
+/* 验证大小写字母 */
+export function validateAlphabets(str: string) {
+  const reg = /^[A-Za-z]+$/
+  return reg.test(str)
+}
+
+/**
+ * 验证邮箱
+ * @param email
+ * @returns {boolean}
+ */
+export function validateEmail(email: string) {
+  const re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
+  return re.test(email)
+}
+
+/**
+ * 验证手机号
+ * @param phone
+ * @returns {boolean}
+ */
+export function validateMobile(phone: string) {
+  const re = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/
+  return re.test(phone)
+}
+
+/**
+ * 校验身份证号
+ * @param value
+ * @returns
+ */
+export function validateIdCardNo(value: string) {
+  const re = /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/
+  return re.test(value)
+}
+/**
+ *
+ * @param value 验证电话号码
+ * @returns
+ */
+export function validatePhone(value: string) {
+  const re = /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/
+  return re.test(value)
+}
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 1c2405e..bca0958 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,13 +1,46 @@
-<script lang="ts" setup name="borrowHandle">
-// 逻辑代码
+<!-- 设备借用处理 -->
+<script lang="ts" setup name="borrowApply">
+import list from './components/handleList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '待借用', comp: list },
+  { name: '已借用', comp: list },
+  { name: '已归还', comp: list },
+])
+const current = ref('待借用')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用处理
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 03d414b..c5771f7 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,13 +1,50 @@
+<!-- 设备借用申请 -->
 <script lang="ts" setup name="borrowApply">
-// 逻辑代码
+import list from './components/applyList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '全部', comp: list },
+  { name: '草稿箱', comp: list },
+  { name: '待审批', comp: list },
+  { name: '审批中', comp: list },
+  { name: '已通过', comp: list },
+  { name: '未通过', comp: list },
+  { name: '已取消', comp: list },
+])
+const current = ref('全部')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用申请
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
new file mode 100644
index 0000000..052f3ce
--- /dev/null
+++ b/src/views/device/borrow/components/applyList.vue
@@ -0,0 +1,328 @@
+<script lang="ts" setup name="borrowApplyList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '文件号',
+    value: 'fileNo',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '类别',
+    value: 'catergory',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '李四',
+      time: '2020-12-14 00:00:00',
+      status: '未通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const approveRef = ref()
+// 同意
+const agree = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '1',
+  })
+}
+// 驳回
+const reject = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '3',
+  })
+}
+// 拒绝
+const refuse = (row: any) => {
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
+}
+// 取消
+const cancel = (rowrow: any) => {
+  ElMessageBox.confirm(
+    '确认取消吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" @click="addBtn" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="agree(row)">
+                  同意
+                </el-button>
+                <el-button size="small" type="primary" link @click="reject(row)">
+                  驳回
+                </el-button>
+                <el-button size="small" type="primary" link @click="refuse(row)">
+                  拒绝
+                </el-button>
+                <el-button size="small" type="primary" link @click="cancel(row)">
+                  取消
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/components/approvalActionDialog.vue b/src/views/device/borrow/components/approvalActionDialog.vue
new file mode 100644
index 0000000..214876c
--- /dev/null
+++ b/src/views/device/borrow/components/approvalActionDialog.vue
@@ -0,0 +1,104 @@
+<!-- 审批操作弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
+const dialogVisibleApprove = ref(false)
+const form = reactive({
+  radio: '1',
+})
+const ruleFormRef = ref<FormInstance>()
+const rules = reactive<FormRules>({
+})
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const approvetime = ref('') // 审批时间
+const initDialog = (row: any) => {
+  dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
+}
+defineExpose({ initDialog })
+
+// 点击保存
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      dialogVisibleApprove.value = false
+      emits('resetData')
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  formEl.resetFields()
+  dialogVisibleApprove.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
+    <el-form
+      ref="ruleFormRef" :model="form"
+      :rules="rules" label-width="110px"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人">
+            <el-input disabled :value="userInfo.$state.name" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间">
+            <el-input disabled :value="approvetime" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
+        <el-button @click="resetForm(ruleFormRef)">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
new file mode 100644
index 0000000..cfda00a
--- /dev/null
+++ b/src/views/device/borrow/components/handleList.vue
@@ -0,0 +1,281 @@
+<script lang="ts" setup name="borrowHandleList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '申请编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'dept',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      dept: '顶级',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      dept: '徐州分中心',
+      user: '里斯',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+const borrow = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="borrow(row)">
+                  借用
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/addRow.vue b/src/views/device/standingBook/components/addRow.vue
index 1678cdb..07b03d1 100644
--- a/src/views/device/standingBook/components/addRow.vue
+++ b/src/views/device/standingBook/components/addRow.vue
@@ -5,7 +5,7 @@
 import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
+const formLabelWidth = '110px'
 const form = ref({})
 const formTable = ref([
   {
@@ -91,108 +91,188 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`">
+  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
     >
       <div v-if="name === '周检记录'">
-        <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录表编号" />
-        </el-form-item>
-        <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录人" />
-        </el-form-item>
-        <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="检定日期"
-          />
-        </el-form-item>
-        <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="有效日期"
-          />
-        </el-form-item>
-        <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="送检人" />
-        </el-form-item>
-        <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录表编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="检定日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="有效日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="送检人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '状态变更记录'">
-        <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="状态类型" clearable>
-            <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="结束日期"
-          />
-        </el-form-item>
-        <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="申请人" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="状态类型" clearable style="width: 100%;">
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="申请人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '使用记录'">
-        <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用人" />
-        </el-form-item>
-        <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用部门" />
-        </el-form-item>
-        <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="使用类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用结束日期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用部门" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="使用类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '检定证书'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="证书类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书出具日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书有效期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
     </el-form>
     <template #footer>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 5f7b347..9a9f798 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -352,7 +352,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -376,7 +376,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -391,7 +391,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -404,14 +404,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -434,7 +434,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -443,20 +443,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -480,23 +480,23 @@
               <com-tree-select
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -507,10 +507,10 @@
             <el-form-item label="检定部门" prop="mesureDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -520,7 +520,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -529,13 +529,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -544,21 +544,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -578,14 +578,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -594,14 +594,14 @@
         <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-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -669,7 +669,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index fc3fd54..d9d4514 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -199,6 +199,8 @@
     useDeptList.value = toTreeList(res.data, '0', true)
   })
 }
+const selectTreeRef1 = ref()
+const selectTreeRef2 = ref()
 // 重置
 const resetDATA = () => {
   ruleForm.value = {
@@ -254,6 +256,10 @@
     isStandardSupportEquipment: '', //		是否标准配套设备
     id: '',
   }
+  if (title.value !== '详情') {
+    selectTreeRef1.value.clearSelected()
+    selectTreeRef2.value.clearSelected()
+  }
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
@@ -378,7 +384,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -402,7 +408,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -416,8 +422,7 @@
             <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"
+                :placeholder="title === '详情' ? '' : '出厂年月'" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -430,14 +435,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -460,7 +465,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -469,20 +474,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -505,24 +510,26 @@
             <el-form-item label="使用部门" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
+                ref="selectTreeRef2"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -536,10 +543,12 @@
               </el-select> -->
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                ref="selectTreeRef1"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -549,7 +558,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -558,13 +567,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -573,21 +582,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -607,14 +616,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -624,14 +633,14 @@
           <el-col :span="6">
             <el-form-item label="资本来源" prop="capitalSource">
               <!-- <el-input v-model.trim="ruleForm.capitalSource" placeholder="资本来源" :disabled="title === '详情'" /> -->
-              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -699,7 +708,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f653095..f4229a6 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -147,19 +147,17 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
-  setTimeout(() => {
-    list.value = [
-      {
-        equipmentNo: 123,
-        equipmentName: 'test',
-        modelNo: '001',
-        usePersonName: '张三',
-        validDate: '2022-12-12 00:00:00',
-        useDeptName: '顶级',
-      },
-    ]
-    total.value = 1
-  }, 1000)
+  list.value = [
+    {
+      equipmentNo: 123,
+      equipmentName: 'test',
+      modelNo: '001',
+      usePersonName: '张三',
+      validDate: '2022-12-12 00:00:00',
+      useDeptName: '顶级',
+    },
+  ] as any
+  total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -220,9 +218,11 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -300,13 +300,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.mesureType" class="m-2 normal-select" placeholder="检定方式" clearable>
+          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable>
             <el-option
               v-for="item in mesureTypeList"
               :key="item.id"
@@ -316,7 +316,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.managerState" class="m-2 normal-select" placeholder="管理状态" clearable>
+          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable>
             <el-option
               v-for="item in managerStateList"
               :key="item.id"
@@ -327,8 +327,9 @@
         </search-item>
         <search-item>
           <com-tree-select
+            ref="selectTreeRef"
             v-model="searchQuery.useDept" :options="useDeptList" placeholder="使用部门"
-            :tree-props="deptProps" style="width: 150px;"
+            :tree-props="deptProps"
           />
         </search-item>
         <search-item>
@@ -336,11 +337,10 @@
             v-model="searchQuery.validDate" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="有效日期"
             class="normal-date"
-            style="width: 150px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.abc" class="m-2 normal-select" placeholder="ABC" clearable>
+          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable>
             <el-option
               v-for="item in abcList"
               :key="item.id"
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 78a3800..4c31a94 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -2,9 +2,10 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/fixedAssetsAdd.vue'
-import type { fixedAssetsType } from './standingBook-interface'
+import type { fixedAssetsType, selectType } from './standingBook-interface'
 import { exportFile } from '@/utils/exportUtils'
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
+import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   assetNo: '', // 固定编号
@@ -50,7 +51,7 @@
   },
   {
     text: '设备类型',
-    value: 'assetTypeName',
+    value: 'equipmentTypeName',
     width: '150',
     align: 'center',
   },
@@ -102,6 +103,7 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+const equipmentCategoryList = ref<selectType[]>([]) // 设备类别
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
@@ -242,6 +244,10 @@
 }
 onMounted(() => {
   getList()
+  // 获取设备类别
+  getDictByCode('equipmentCategory').then((response) => {
+    equipmentCategoryList.value = response.data
+  })
 })
 </script>
 
@@ -265,7 +271,10 @@
           <el-input v-model="searchQuery.equipmentSpecifications" placeholder="设备规格" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-select v-model="searchQuery.equipmentCategory" placeholder="设备类别" clearable>
+            <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+          </el-select>
         </search-item>
       </search-area>
       <table-container>
diff --git a/src/views/device/stateManage/components/addRow.vue b/src/views/device/stateManage/components/addRow.vue
new file mode 100644
index 0000000..3ba82d6
--- /dev/null
+++ b/src/views/device/stateManage/components/addRow.vue
@@ -0,0 +1,160 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { listPageApi } from '@/api/device/standingBook'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  limit: 10,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '出厂编号',
+    value: 'manufacturingNo',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+  },
+])
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listPageApi(listQuery.value as any).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map(item => ({ ...item, checked: '' }))
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    equipmentName: '', // 姓名
+    equipmentNo: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const checkedArr = list.value.filter(item => item.checked !== '')
+  if (checkedArr.length) {
+    console.log(checkedArr, '选中的设备')
+    emits('add', checkedArr)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择设备')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns as any" :query="listQuery"
+        :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-checkbox v-model="scope.row.checked" :label="scope.$index" size="large" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-checkbox__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index 56417d6..214876c 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -47,38 +47,45 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="30%">
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
-      :rules="rules"
+      :rules="rules" label-width="110px"
     >
-      <el-form-item label="审批意见">
-        <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
-        <el-radio-group v-model="form.radio">
-          <el-radio label="1">
-            同意
-          </el-radio>
-          <el-radio label="2">
-            拒绝
-          </el-radio>
-          <el-radio label="3">
-            驳回
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="审批结论">
-        <el-input
-          :rows="4"
-          type="textarea"
-        />
-      </el-form-item>
       <el-row :gutter="24">
-        <el-col :span="10">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="审批人">
             <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
-        <el-col :span="14">
+        <el-col :span="12">
           <el-form-item label="审批时间">
             <el-input disabled :value="approvetime" />
           </el-form-item>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index e74d70e..2003e31 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -1,7 +1,8 @@
 <!-- 新增或详情弹窗 -->
-<script lang="ts" setup name="addNotice">
+<script lang="ts" setup name="add">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
+import addRow from './addRow.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
@@ -16,6 +17,7 @@
 const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const name = ref('')
+const borrowList = ref([])
 const ruleForm = ref({
   assetNo: '', // 资产编号
   assetType: '', // 资产类型
@@ -357,10 +359,86 @@
     isShowCalibration.value = true
   }
 })
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerLevelName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+  },
+])
+const addRowRef = ref()
+// 添加行
+const addRowBtn = () => {
+  addRowRef.value.initDialog({ title: '添加' })
+}
+// 删除行
+const removeRowBtn = () => {
+  const removeArr = borrowList.value.filter(item => item.remove !== '')
+  if (removeArr.length) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      borrowList.value = borrowList.value.filter(item => item.remove === '')
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 借用设备列表添加
+const addRowMethods = (row) => {
+  row.forEach((element) => {
+    borrowList.value.push({ ...element, remove: '' })
+  })
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
     <detail-page :title="`${name}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
@@ -378,15 +456,16 @@
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder="">
+              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -430,7 +509,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -454,28 +533,56 @@
         </el-row>
       </el-form>
     </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>
+    <div>
+      <detail-block title="借用设备列表">
+        <template #btns>
+          <el-button type="primary" @click="addRowBtn">
+            添加行
+          </el-button>
+          <el-button type="info" @click="removeRowBtn">
+            删除行
+          </el-button>
+        </template>
+        <normal-table
+          :data="borrowList" :total="1" :columns="columns as any"
+        >
+          <template #preColumns>
+            <el-table-column label="选择" width="55" align="center">
+              <template #default="scope">
+                <el-checkbox v-model="scope.row.remove" :label="scope.$index" size="large" />
+              </template>
+            </el-table-column>
+            <el-table-column label="序号" width="60" align="center">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </detail-block>
+      <detail-block 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>
+    </div>
   </app-container>
 </template>
 
@@ -484,6 +591,10 @@
   background-color: #fff;
 }
 
+:deep(.el-checkbox__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,
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index aaaaf61..d588b8d 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,6 +1,7 @@
 <script lang="ts" setup name="bench">
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
+import type { trainLogStatistic } from './bench-interface'
 import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
 import { getPlanList } from '@/api/system/plan'
 import { listPageApi } from '@/api/measure/file'
@@ -132,15 +133,19 @@
     account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
+    const result: trainLogStatistic = res.data
+    const notQualified: number = Number(result.trainCount) - result.qualifiedCount
+    const qualifiedRate = ((result.qualifiedCount / result.trainCount) * 100).toFixed(2) // 合格率
+    const notQualifiedRate = ((notQualified / result.trainCount) * 100).toFixed(2) // 不合格率
     TrainLogSList.value = [
-      { name: `合格     ${res.data.qualified}-${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
-      { name: `不合格   ${res.data.notQualified}- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+      { name: `合   格   ${result.qualifiedCount}-${qualifiedRate}%`, value: result.qualifiedCount },
+      { name: `不合格   ${notQualified}- ${notQualifiedRate}%`, value: notQualified },
     ]
     TrainLogTitle.value = res.data.trainCount
   }).catch((_) => {
     // 处理异常
     TrainLogSList.value = [
-      { name: '合格     0 - 50%', value: 0 },
+      { name: '合   格   0 - 50%', value: 0 },
       { name: '不合格   0 - 50%', value: 0 },
     ]
     TrainLogTitle.value = 0
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 9ef0b93..1ad577b 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -270,7 +270,7 @@
               <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="6">
             <el-form-item label="名称" prop="fileName">
               <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
             </el-form-item>
@@ -279,13 +279,14 @@
         <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" class="fill-input" disabled>
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled style="width: 100%;">
                 <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="请选择发布单位"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -295,6 +296,7 @@
                 v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -311,12 +313,13 @@
                 v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人" prop="createUserId">
-              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index b45fbc3..542b284 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -26,7 +26,7 @@
   createUser: '', // 创建人
   createTime: '', // 创建
   approvalStatus: props.value, // 审批状态
-  limit: 10,
+  limit: 20,
   offset: 1,
   fileType: '', // 类型
   formId: '',
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 7d4724b..e54ddf5 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -26,7 +26,7 @@
   fileCode: '', // 文件号
   effectiveTime: '', // 实施时间
   effectiveStatus: '', // 实施状态
-  limit: 10,
+  limit: 20,
   offset: 1,
   fileType: '', // 类型
 }) // 查询参数
@@ -75,13 +75,19 @@
 const getStatus = () => {
   getDictByCode('effectiveStatus').then((res) => {
     if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
+      effectiveStatusSelect.value = [...res.data, { name: '全部', value: '', id: 'quanbu' }]
     }
   })
 }
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.publishTime) {
+    searchQuery.publishTime = ''
+  }
+  if (!searchQuery.effectiveTime) {
+    searchQuery.effectiveTime = ''
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -252,13 +258,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" />
         </search-item>
         <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
@@ -274,20 +280,16 @@
           <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: 185px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
             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: 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" placeholder="实施状态" clearable>
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index 5ca3275..a95c665 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -505,21 +505,21 @@
         <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] === '详情'" @change="directorChange">
+              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;" @change="directorChange">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.name" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
-              <el-select v-model="ruleForm.technologyJob" :placeholder="title.split('-')[2] === '详情' ? '' : '技术职务'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.technologyJob" :placeholder="title.split('-')[2] === '详情' ? '' : '技术职务'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;">
                 <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="administrationJob">
-              <el-select v-model="ruleForm.administrationJob" :placeholder="title.split('-')[2] === '详情' ? '' : '行政职务'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.administrationJob" :placeholder="title.split('-')[2] === '详情' ? '' : '行政职务'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index aac1ef2..11d6d0a 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -22,7 +22,7 @@
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
-  limit: 10,
+  limit: 20,
   offset: 1,
   organizeType: '', // 类型
   createTime: '', // 创建时间
@@ -118,6 +118,9 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.createTime) {
+    searchQuery.createTime = ''
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows.map(item => ({ ...item, createTime: item.createTime.split(' ')[0] }))
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 3f472eb..bc5d9d4 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -7,7 +7,9 @@
 // import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
-import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+// import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const props = defineProps({
   isRemind: {
     type: Boolean,
@@ -78,11 +80,14 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 // 获取所有部门
-const deptList = ref<DeptTreeNode[]>([])
+const deptList = ref([])
 const getDeptList = async () => {
   getDeptTreeList().then((res) => {
-    deptList.value = res.data
+    deptList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
@@ -177,6 +182,7 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   searchQuery.staffNo = ''
@@ -184,6 +190,7 @@
   searchQuery.deptId = ''
   searchQuery.certificateStatus = ''
   searchQuery.verifierCertificateNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -212,10 +219,6 @@
     loading.close()
   })
 }
-// 打印
-const print = () => {
-
-}
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传图片
@@ -268,20 +271,24 @@
           <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+          <!-- <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
             <el-option
               v-for="item in deptList"
               :key="item.id"
               :label="item.name"
               :value="item.id"
             />
-          </el-select>
+          </el-select> -->
+          <com-tree-select
+            ref="selectTreeRef" v-model="searchQuery.deptId" :options="deptList"
+            placeholder="工作部门" :tree-props="deptProps"
+          />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况">
+          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况" clearable>
             <el-option
               v-for="item in certificateStatusList"
               :key="item.id"
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 4352604..5a5f036 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -389,10 +389,10 @@
           关闭
         </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">
-            <el-form-item prop="minioFileName" label-width="70px">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item prop="minioFileName">
               <el-upload
                 class="avatar-uploader"
                 :show-file-list="false"
@@ -423,23 +423,24 @@
               <el-date-picker
                 v-model="ruleForm.birthday" type="date" format="YYYY-MM" value-format="YYYY-MM"
                 placeholder="出生年月" :disabled="title === '详情'"
+                style="width: 100%;"
               />
             </el-form-item>
             <el-form-item label="工作部门" prop="deptId" class="marg-item">
-              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled>
+              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled style="width: 100%;">
                 <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="ruleForm.deptId" :options="PubListTree"
-                placeholder="选择组织机构" :tree-props="deptProps"
+                placeholder="选择组织机构" :tree-props="deptProps" style="width: 100%;"
               />
             </el-form-item>
             <el-form-item label="计量专业" prop="major" class="marg-item">
               <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
             </el-form-item>
             <el-form-item label="是否特操人" prop="specialOperator" class="marg-item">
-              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -449,23 +450,23 @@
               <el-input v-model.trim="ruleForm.staffNo" placeholder="系统自动生成" disabled />
             </el-form-item>
             <el-form-item label="性别" prop="sex" class="marg-item">
-              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="技术职务" prop="technologyJob" class="marg-item">
-              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="从事日期" prop="workDate" class="marg-item">
               <el-date-picker
                 v-model="ruleForm.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-                placeholder="请选择从事日期"
+                placeholder="请选择从事日期" style="width: 100%;"
               />
             </el-form-item>
-            <el-form-item label="是否技术考核" prop="technologyExam" class="marg-item">
-              <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'">
+            <el-form-item label="是否技术考核" prop="technologyExam" class="marg-item" style="width: 100%;">
+              <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -475,17 +476,17 @@
               <el-input ref="cardRef" v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" @blur="getBirthday" />
             </el-form-item>
             <el-form-item label="文化程度" prop="education" class="marg-item">
-              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="行政职务" prop="administrationJob" class="marg-item">
-              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="是否主考人" prop="mainExaminer" class="marg-item">
-              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index 042636e..660f2b0 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -264,7 +264,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="性别" prop="meterStaff.sex">
-              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -273,21 +273,21 @@
         <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-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -296,7 +296,7 @@
         <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-select v-if="title === '详情'" v-model="meterStaff.deptId" disabled style="width: 100%;">
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
               <com-tree-select
@@ -304,6 +304,7 @@
                 ref="selectTreeRef" v-model="meterStaff.deptId" :options="PubListTree"
                 placeholder="选择组织机构"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -316,7 +317,7 @@
             <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="请选择从事日期"
+                placeholder="请选择从事日期" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -347,7 +348,7 @@
             <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="请选择发证日期"
+                placeholder="请选择发证日期" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -355,7 +356,7 @@
             <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="请选择有效日期"
+                placeholder="请选择有效日期" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 178fc12..d0116f3 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -3,7 +3,7 @@
 import type { FormInstance, FormRules } from 'element-plus'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
+const formLabelWidth = '110px'
 const form = reactive({
   certificateNo: '', // 证书号
   certificateName: '', // 证书名称
@@ -71,32 +71,52 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`" width="40%">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
     >
-      <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
-        <el-input v-model="form.certificateNo" placeholder="证书号" />
-      </el-form-item>
-      <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
-        <el-input v-model="form.certificateName" placeholder="证书名称" />
-      </el-form-item>
-      <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
-        <el-input v-model="form.certificateCompany" placeholder="发证单位" />
-      </el-form-item>
-      <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
-        <el-date-picker
-          v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择发证日期"
-        />
-      </el-form-item>
-      <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-        <el-date-picker
-          v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择有效日期"
-        />
-      </el-form-item>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
+            <el-input v-model="form.certificateNo" placeholder="证书号" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
+            <el-input v-model="form.certificateName" placeholder="证书名称" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
+            <el-input v-model="form.certificateCompany" placeholder="发证单位" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
+            <el-date-picker
+              v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择发证日期" style="width: 100%;"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+            <el-date-picker
+              v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择有效日期" style="width: 100%;"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <template #footer>
       <span class="dialog-footer">
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
index 5e20d1b..10b0deb 100644
--- a/src/views/measure/person/components/personListDialog.vue
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -1,8 +1,11 @@
 <!-- 计量人员列表弹窗 -->
 <script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
 import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import { getDeptTreeList } from '@/api/system/dept'
-import type { TreeStructure } from '@/views/system/user/user-interface'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -10,7 +13,7 @@
   staffNo: '', // 人员编号
   name: '', // 姓名
   deptId: '', // 所在部门
-  limit: 5,
+  limit: 10,
   offset: 1,
 })
 const loadingTable = ref<boolean>(false)
@@ -32,20 +35,22 @@
   },
 ])
 // 获取部门
-const deptIdList = ref<TreeStructure[]>([])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const deptIdList = ref([])
 const getDeptList = () => {
   getDeptTreeList().then((res) => {
-    deptIdList.value = res.data
+    deptIdList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
 const fetchData = () => {
-  select.value = ''
+  select.value = -1
   getStaffList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.records
       total.value = Number(res.data.total)
-      console.log(list.value, 'list')
     }
   })
 }
@@ -53,6 +58,7 @@
 const search = () => {
   fetchData()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   listQuery.value = {
@@ -62,6 +68,7 @@
     limit: 10,
     offset: 1,
   }
+  selectTreeRef.value.clearSelected()
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -76,18 +83,24 @@
 }
 // 点击保存
 const submitForm = () => {
-  const person = list.value.filter((item, index) => index == select.value)[0]
-  console.log(person, 'person')
-  getStaffDetail(person).then((res) => {
-    if (res.code === 200) {
-      emits('add', res.data)
-      dialogFormVisible.value = false
-    }
-  })
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    getStaffDetail(person).then((res) => {
+      if (res.code === 200) {
+        emits('add', res.data)
+        dialogFormVisible.value = false
+        reset()
+      }
+    })
+  }
+  else {
+    ElMessage.warning('请先选择人员')
+  }
 }
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
+  reset()
 }
 // 初始化
 const initDialog = () => {
@@ -99,39 +112,45 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员" width="50%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable style="width: 150px;" />
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable style="width: 150px;" />
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
+        <!-- <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
           <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
+        </el-select> -->
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
-    <normal-table
-      :data="list" :total="total" :columns="columns" :query="listQuery"
-      :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>
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :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">
             {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
           </template>
         </el-table-column> -->
-      </template>
-    </normal-table>
+        </template>
+      </normal-table>
+    </div>
     <template #footer>
       <span class="dialog-footer">
         <el-button type="primary" @click="submitForm">确认</el-button>
diff --git a/src/views/measure/person/components/userListDialog.vue b/src/views/measure/person/components/userListDialog.vue
index dcd05b5..cd62a73 100644
--- a/src/views/measure/person/components/userListDialog.vue
+++ b/src/views/measure/person/components/userListDialog.vue
@@ -3,14 +3,16 @@
 import { ElMessage } from 'element-plus'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
-import type { TreeStructure } from '@/views/system/user/user-interface'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
 const listQuery = ref({
   keywords: '', // 姓名
   deptId: '', // 所在部门
-  limit: 5,
+  limit: 10,
   offset: 1,
 })
 const loadingTable = ref<boolean>(false)
@@ -31,11 +33,14 @@
     value: 'deptName',
   },
 ])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 // 获取部门
-const deptIdList = ref<TreeStructure[]>([])
+const deptIdList = ref([])
 const getDeptList = () => {
   getDeptTreeList().then((res) => {
-    deptIdList.value = res.data
+    deptIdList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
@@ -52,6 +57,7 @@
 const search = () => {
   fetchData()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   listQuery.value = {
@@ -60,6 +66,7 @@
     limit: 10,
     offset: 1,
   }
+  selectTreeRef.value.clearSelected()
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -74,11 +81,11 @@
 }
 // 点击保存
 const submitForm = () => {
-  console.log(select.value)
   if (select.value >= 0) {
     const person = list.value.filter((item, index) => index == select.value)[0]
     emits('add', person)
     dialogFormVisible.value = false
+    reset()
   }
   else {
     ElMessage.warning('请先选择人员')
@@ -87,9 +94,11 @@
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
+  reset()
 }
 // 初始化
 const initDialog = () => {
+  // reset()
   dialogFormVisible.value = true
   getDeptList()
   fetchData()
@@ -98,16 +107,20 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+  <el-dialog v-model="dialogFormVisible" title="选择人员" width="50%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
         <el-input v-model.trim="listQuery.keywords" placeholder="真实姓名" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable>
+        <!-- <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable>
           <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
+        </el-select> -->
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 9c6f65d..355473a 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -7,7 +7,9 @@
 // import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
-import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+// import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
@@ -16,7 +18,7 @@
   major: '', // 计量专业
   verifierCertificateNo: '', // 证书号
   certificateStatus: '', // 证书状态
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -52,10 +54,10 @@
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取所有部门
-const deptList = ref<DeptTreeNode[]>([])
+const deptList = ref([])
 const getDeptList = async () => {
   getDeptTreeList().then((res) => {
-    deptList.value = res.data
+    deptList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
@@ -126,6 +128,7 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   searchQuery.staffNo = ''
@@ -133,6 +136,7 @@
   searchQuery.deptId = ''
   searchQuery.major = ''
   searchQuery.verifierCertificateNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -160,10 +164,9 @@
     loading.close()
   })
 }
-// 打印
-const print = () => {
-
-}
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传图片
@@ -216,14 +219,18 @@
           <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+          <!-- <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
             <el-option
               v-for="item in deptList"
               :key="item.id"
               :label="item.name"
               :value="item.id"
             />
-          </el-select>
+          </el-select> -->
+          <com-tree-select
+            ref="selectTreeRef" v-model="searchQuery.deptId" :options="deptList"
+            placeholder="工作部门" :tree-props="deptProps"
+          />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.major" placeholder="计量专业" clearable class="w-50 m-2" />
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index af0a29d..2e0e7af 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -1,12 +1,15 @@
 <script lang="ts" setup name="ListSourceAdd">
-import { reactive, ref } from 'vue'
+/**
+ * 添加/编辑/详情溯源供方
+ */
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions, IformInline } from './list_interface'
+import type { IOptions, IformInline, traceSupplierPerson } from './list_interface'
 import { exportFile } from '@/utils/exportUtils'
 import { UploadFile } from '@/api/measure/file'
 import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+import { validatePhone } from '@/utils/validate'
 const props = defineProps({
   infoId: {
     type: String,
@@ -19,43 +22,45 @@
 })
 const emit = defineEmits(['close'])
 const formInline: Ref<IformInline> = ref({
-  businessContent: null,
-  supplierName: null,
-  supplierNo: null,
-  bankAccount: null,
-  bankAccountNumber: null,
-  bankName: null,
-  briefName: null,
-  businessScope: null,
-  companyAddress: null,
-  companyArea: null,
-  companyCity: null,
-  companyCountry: null,
-  companyProvince: null,
-  createTime: null,
-  director: null,
-  fax: null,
-  invoiceAddress: null,
-  invoiceArea: null,
-  invoiceCity: null,
-  invoiceCountry: null,
-  invoiceProvince: null,
-  mailbox: null,
-  minioFileName: null,
-  mobile: null,
-  phone: null,
-  postalCode: null,
-  remark: null,
-  taxNumber: null,
-  website: null,
+  id: '',
+  businessContent: '',
+  supplierName: '',
+  supplierNo: '',
+  bankAccount: '',
+  bankAccountNumber: '',
+  bankName: '',
+  briefName: '',
+  businessScope: '',
+  companyAddress: '',
+  companyArea: '',
+  companyCity: '',
+  companyCountry: '',
+  companyProvince: '',
+  createTime: '',
+  director: '',
+  fax: '',
+  invoiceAddress: '',
+  invoiceArea: '',
+  invoiceCity: '',
+  invoiceCountry: '',
+  invoiceProvince: '',
+  mailbox: '',
+  minioFileName: '',
+  mobile: '',
+  phone: '',
+  postalCode: '',
+  remark: '',
+  taxNumber: '',
+  website: '',
   traceSupplierPersonList: [],
 })
+const traceSupplierPersonList: Ref<traceSupplierPerson[]> = ref([])
 const columns = ref([
-  { text: '人员编号', value: 'personNo', show: true },
-  { text: '姓名', value: 'name', show: true },
-  { text: '工作部门', value: 'department', show: true },
-  { text: '职务', value: 'job', show: true },
-  { text: '联系方式', value: 'phone', show: true },
+  { text: '人员编号', value: 'personNo', required: false },
+  { text: '姓名', value: 'name', required: true },
+  { text: '工作部门', value: 'department', required: false },
+  { text: '职务', value: 'job', required: false },
+  { text: '联系方式', value: 'phone', required: true, reg: validatePhone },
 ])
 const ruleFormRef = ref<FormInstance>()
 const provinceList = ref<IOptions[]>([])
@@ -66,14 +71,17 @@
 const invoiceCityList = ref<IOptions[]>([])
 const areaInvoiceList = ref<IOptions[]>([])
 const dialogVisible = ref(false)
-const addPersonList = ref({
+// 人员对象
+const addPersonObj: traceSupplierPerson = {
+  id: '',
   personNo: '',
   name: '',
   department: '',
   job: '',
   phone: '',
-})
-const SelectionList = ref([])
+  editable: true,
+}
+const SelectionList: Ref<traceSupplierPerson[]> = ref([])
 const upload = ref<UploadInstance>()
 // 校验规则
 const rules = ref({
@@ -91,7 +99,7 @@
   })
 }
 // 表格选中
-const handleSelectionChange = (e: any) => {
+const handleSelectionChange = (e: traceSupplierPerson[]) => {
   SelectionList.value = e
 }
 // 获取公司地址省级
@@ -142,15 +150,33 @@
   })
 }
 // 点击增加行
-const addRoow = () => {
-  const object = {
-    personNo: '',
-    name: '',
-    department: '',
-    job: '',
-    phone: '',
+const addRow = () => {
+  // 检查上一行必填项
+  if (checkPersonList()) {
+    setAllRowReadable()
+    traceSupplierPersonList.value.push({ ...addPersonObj })
   }
-  formInline.value.traceSupplierPersonList.push(object)
+}
+// 检查人员列表
+function checkPersonList() {
+  for (let index = 0; index < traceSupplierPersonList.value.length; index++) {
+    const item = traceSupplierPersonList.value[index]
+    for (const prop of columns.value) {
+      // 检查必填
+      if (prop.required && !item[prop.value]) {
+        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
+        return false
+      }
+      // 验证正则
+      if (prop.reg && typeof prop.reg === 'function') {
+        if (!prop.reg(item[prop.value])) {
+          ElMessage.warning(`第${index + 1}行中${prop.text}输入不合法`)
+          return false
+        }
+      }
+    }
+  }
+  return true
 }
 // 点击关闭
 const handleClose = () => {
@@ -158,12 +184,12 @@
 }
 // 点击弹窗的完成追加到表格数组中
 const addPushList = () => {
-  formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonList.value)))
+  formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonObj.value)))
   handleClose()
 }
 // 删除行
 const deleteList = () => {
-  formInline.value.traceSupplierPersonList = formInline.value.traceSupplierPersonList.filter((item) => {
+  traceSupplierPersonList.value = traceSupplierPersonList.value.filter((item: traceSupplierPerson) => {
     return !SelectionList.value.includes(item)
   })
 }
@@ -261,10 +287,16 @@
     }
   })
 }
-// 双击表格显示输入框
-const dblclickName = (item: object) => {
-  console.log(item)
-  item.show = false
+// 双击行显示输入框
+const dblclickRow = (row: traceSupplierPerson) => {
+  setAllRowReadable()
+  row.editable = true
+}
+// 将所有人员信息列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of traceSupplierPersonList.value) {
+    item.editable = false
+  }
 }
 if (props.buttonType !== '新建') {
   getInfo()
@@ -273,7 +305,7 @@
 
 <template>
   <app-container>
-    <detail-page :title="`培训计划-${buttonType}`">
+    <detail-page :title="`溯源供方-${buttonType}`">
       <template #btns>
         <el-button
           type="primary"
@@ -617,39 +649,36 @@
       </el-form>
     </detail-page>
     <detail-block title="人员信息">
-      <template #btns>
-        <el-button
-          type="info"
-          :disabled="buttonType === '详情'"
-          @click="deleteList"
-        >
+      <template v-if="buttonType !== '详情'" #btns>
+        <el-button type="info" @click="deleteList">
           删除行
         </el-button>
-        <el-button
-          type="primary"
-          :disabled="buttonType === '详情'"
-          @click="addRoow"
-        >
+        <el-button type="primary" @click="addRow">
           增加行
         </el-button>
       </template>
       <el-table
-        :data="formInline.traceSupplierPersonList"
+        :data="traceSupplierPersonList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
+        @row-dblclick="dblclickRow"
       >
-        <el-table-column type="selection" width="55" />
+        <el-table-column type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column
           v-for="item in columns"
           :key="item.value"
           :prop="item.value"
           :label="item.text"
+          align="center"
         >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
           <template #default="scope">
-            <span v-show="item.show" style="color: gray;" @dblclick="dblclickName(item)">{{ scope.row[item.value] || `双击编辑${item.text}` }}</span>
-            <el-input v-show="!item.show" v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" @blur="item.show = true" />
+            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+            <el-input v-else v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index 530bcc4..c057976 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -24,6 +24,18 @@
   areaName: string
 }
 
+// 溯源供方人员
+export interface traceSupplierPerson {
+  id: number | string // id
+  job: string // 职务
+  department: string// 部门
+  name: string// 信命
+  personNo: string// 人员编号
+  phone: string// 联系方式
+  editable?: boolean // 是否可编辑
+  [key: string]: any
+}
+
 export interface IformInline {
   businessContent: string
   supplierName: string
@@ -55,5 +67,6 @@
   remark: string
   taxNumber: string
   website: string
-  traceSupplierPersonList: []
+  traceSupplierPersonList: traceSupplierPerson []
 }
+
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index e44001a..600eda1 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -32,11 +32,20 @@
   dialogVisible.value = true
   ruleForm.noticePublisher = userInfo.$state.name
   ruleForm.noticeCompany = userInfo.$state.deptName
-  ruleForm.noticeTime = dayjs().format('YYYY-MM-DD')
+  ruleForm.noticeTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
 }
 defineExpose({ initDialog })
+// 重置
+const resetDialog = () => {
+  ruleForm.noticeTime = ''
+  ruleForm.noticeSketch = ''
+  ruleForm.noticeContent = ''
+  ruleForm.minioFileName = ''
+  ruleForm.noticeTitle = ''
+}
 // 关闭弹窗
 const close = () => {
+  resetDialog()
   dialogVisible.value = false
   emits('resetData')
 }
@@ -63,6 +72,7 @@
 const resetForm = (formEl: FormInstance | undefined) => {
   // if (!formEl) { return }
   formEl?.resetFields()
+  resetDialog()
   dialogVisible.value = false
   emits('resetData')
 }
@@ -105,7 +115,7 @@
     uploadImage: {
       server: 'http://111.198.10.15:21409/minio/file/upload', // 配置图片上传地址
       maxFileSize: 2 * 1024 * 1024, // 10M  图片大小限制
-      fieldName: 'img', // 上传类型
+      fieldName: 'multipartFile', // 上传名字
       allowedFileTypes: [], // 选择文件时的类型限制，默认为 ['image/*'] 。如不想限制，则设置为 []
       // 自定义上传参数，传递图片时需要带一些参数过去写在这。参数会被添加到 formData 中，一起上传到服务端。
       // meta: {
@@ -154,9 +164,9 @@
     uploadVideo: {
       server: 'http://111.198.10.15:21409/minio/file/upload', // 配置视频上传地址
       maxFileSize: 5 * 1024 * 1024, // 5M  视频大小限制
-      fieldName: 'your-custom-name', // 上传类型
+      fieldName: 'multipartFile', // 上传名字
       // 最多可上传几个文件，默认为 5
-      maxNumberOfFiles: 3,
+      // maxNumberOfFiles: 1,
       allowedFileTypes: [], // 选择文件时的类型限制，默认为 ['video/*'] 。如不想限制，则设置为 []
       // 自定义上传参数，传递图片时需要带一些参数过去写在这。参数会被添加到 formData 中，一起上传到服务端。
       // meta: {
@@ -167,8 +177,8 @@
       //     Accept: 'text/x-json',
       //     otherKey: 'xxx'
       // },
-      metaWithUrl: false, // 将 meta 拼接到 url 参数中，默认 false
-      withCredentials: true, // 跨域是否传递 cookie ，默认为 false
+      // metaWithUrl: false, // 将 meta 拼接到 url 参数中，默认 false
+      // withCredentials: true, // 跨域是否传递 cookie ，默认为 false
       // 上传之前触发
       onBeforeUpload(file: any) {
         // file 选中的文件，格式如 { key: file }
@@ -222,9 +232,6 @@
     editorRef.value = editor // 一定要用 Object.seal() ，否则会报错
   })
 }
-const look = () => {
-  console.log(ruleForm.noticeContent)
-}
 const minioFileUrl = ref('')
 watch(() => ruleForm.minioFileName, (newVal) => {
   if (newVal) {
@@ -278,7 +285,7 @@
           />
           <editor
             v-model="ruleForm.noticeContent"
-            style="height: 150px; overflow-y: hidden;"
+            style="height: 300px; overflow-y: hidden;"
             :default-config="editorConfig"
             mode="default"
             @onCreated="onCreated"
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index 0926957..a4cdd5e 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -16,7 +16,7 @@
   noticePublisher: '', // 发布人
   noticeTime: '', // 发布时间
   noticeTitle: '', // 标题
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -27,6 +27,7 @@
     text: '编号',
     value: 'noticeNo',
     align: 'center',
+    width: '180',
   },
   {
     text: '标题',
@@ -37,6 +38,7 @@
     text: '发布人',
     value: 'noticePublisher',
     align: 'center',
+    width: '150',
   },
   {
     text: '内容描述',
@@ -47,11 +49,15 @@
     text: '发布时间',
     value: 'noticeTime',
     align: 'center',
+    width: '200',
   },
 ] // 表格
 const list = ref([]) // 表格数据
 // 获取通知公告列表
 const getNoticeList = () => {
+  if (!searchQuery.noticeTime) {
+    searchQuery.noticeTime = ''
+  }
   getNoticeeApi(searchQuery).then((res) => {
     total.value = res.data.total
     list.value = res.data.rows
diff --git a/src/views/system/notice/noticeDetail.vue b/src/views/system/notice/noticeDetail.vue
index 94468d4..da36bd8 100644
--- a/src/views/system/notice/noticeDetail.vue
+++ b/src/views/system/notice/noticeDetail.vue
@@ -1,5 +1,6 @@
 <!-- 通知公告详情弹窗 -->
 <script lang="ts" setup name="noticeDetail">
+import { Editor } from '@wangeditor/editor-for-vue'
 import type { noticeType } from './notice-interface'
 import { getNoticeDetail } from '@/api/system/notice'
 import { getPhotoUrl } from '@/api/system/tool'
@@ -52,6 +53,18 @@
     })
   }
 })
+// 编辑器配置
+const editorConfig = ref({
+  readOnly: true,
+})
+// 富文本实例对象
+const editorRef = shallowRef()
+const onCreated = (editor: any) => {
+  editorRef.value = editor
+  nextTick(() => {
+    editorRef.value = editor // 一定要用 Object.seal() ，否则会报错
+  })
+}
 </script>
 
 <template>
@@ -89,7 +102,18 @@
       </el-form-item>
       <el-form-item label="发布内容" prop="noticeContent">
         <!-- <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" disabled /> -->
-        <div style="border: 1px solid #dcdfe6;width: 100%;border-radius: 4px;padding: 12px;" v-html="ruleForm.noticeContent" />
+        <!-- <div style="border: 1px solid #dcdfe6;width: 100%;border-radius: 4px;padding: 12px;" v-html="ruleForm.noticeContent" ></div> -->
+        <div style="border: 1px solid #dcdfe6;width: 100%;border-radius: 4px;">
+          <editor
+            ref="editorRef"
+            v-model="ruleForm.noticeContent"
+            style="height: 300px; overflow-y: hidden;"
+            :default-config="editorConfig"
+            mode="default"
+            :disabled="true"
+            @onCreated="onCreated"
+          />
+        </div>
       </el-form-item>
       <el-form-item label="查看附件">
         <el-link v-if="ruleForm.minioFileName" :href="minioFileUrl" type="primary" target="_blank">
diff --git a/src/views/system/tool/autograph/addDDialog.vue b/src/views/system/tool/autograph/addDDialog.vue
index e39b706..daadd9b 100644
--- a/src/views/system/tool/autograph/addDDialog.vue
+++ b/src/views/system/tool/autograph/addDDialog.vue
@@ -186,7 +186,7 @@
         <el-input v-model.trim="ruleForm.signDesc" placeholder="签名描述" :disabled="title === '详情'" />
       </el-form-item>
       <el-form-item label="可使用人" prop="userIdList">
-        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'">
+        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'" style="width: 100%;">
           <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </el-form-item>
@@ -198,7 +198,7 @@
         <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px', 'margin-top': ruleForm.minioFileName === '' ? '0px' : '56px' }" @click="upload">
           {{ ruleForm.minioFileName === '' ? '上传' : '更换图片' }}
         </el-button>
-        <input v-show="title === '123'" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <input v-show="title === '123'" ref="fileRef" type="file" accept="image/*" @change="onFileChange">
       </el-form-item>
     </el-form>
     <template #footer>
diff --git a/src/views/system/tool/autograph/autograph.vue b/src/views/system/tool/autograph/autograph.vue
index ac9f000..d3c6f81 100644
--- a/src/views/system/tool/autograph/autograph.vue
+++ b/src/views/system/tool/autograph/autograph.vue
@@ -15,7 +15,7 @@
   signName: '', // 名称
   signDirector: '', // 负责人
   createTime: '', // 创建时间
-  limit: 10,
+  limit: 20,
   offset: 1,
   signType: '',
 }) // 查询参数
@@ -38,6 +38,9 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.createTime) {
+    searchQuery.createTime = ''
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -168,10 +171,10 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model="searchQuery.signNo" placeholder="签章编号" clearable class="w-50 m-2 normal-input" />
+        <el-input v-model="searchQuery.signNo" placeholder="签名编号" clearable class="w-50 m-2 normal-input" />
       </search-item>
       <search-item>
-        <el-input v-model="searchQuery.signName" placeholder="签章名称" clearable class="w-50 m-2 normal-input" />
+        <el-input v-model="searchQuery.signName" placeholder="签名名称" clearable class="w-50 m-2 normal-input" />
       </search-item>
       <search-item>
         <el-input v-model="searchQuery.signDirector" placeholder="负责人" clearable class="w-50 m-2 normal-input" />
diff --git a/src/views/system/tool/certificate/addDDialog.vue b/src/views/system/tool/certificate/addDDialog.vue
index 2721bf8..0fdec28 100644
--- a/src/views/system/tool/certificate/addDDialog.vue
+++ b/src/views/system/tool/certificate/addDDialog.vue
@@ -185,7 +185,7 @@
         <el-input v-model.trim="ruleForm.templateDesc" placeholder="模板描述" :disabled="title === '详情'" />
       </el-form-item>
       <el-form-item label="可使用人" prop="userIdList">
-        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'">
+        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'" style="width: 100%;">
           <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </el-form-item>
diff --git a/src/views/system/tool/certificate/certificate.vue b/src/views/system/tool/certificate/certificate.vue
index 9787116..a2468de 100644
--- a/src/views/system/tool/certificate/certificate.vue
+++ b/src/views/system/tool/certificate/certificate.vue
@@ -15,7 +15,7 @@
   templateName: '', // 名称
   templateCreator: '', // 负责人
   createTime: '', // 创建时间
-  limit: 10,
+  limit: 20,
   offset: 1,
   templateType: '',
 }) // 查询参数
@@ -38,6 +38,9 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.createTime) {
+    searchQuery.createTime = ''
+  }
   templatePage(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
diff --git a/src/views/system/tool/document/addDDialog.vue b/src/views/system/tool/document/addDDialog.vue
index c440d1d..d5d28d8 100644
--- a/src/views/system/tool/document/addDDialog.vue
+++ b/src/views/system/tool/document/addDDialog.vue
@@ -186,7 +186,7 @@
         <el-input v-model.trim="ruleForm.templateDesc" placeholder="模板描述" :disabled="title === '详情'" />
       </el-form-item>
       <el-form-item label="可使用人" prop="userIdList">
-        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'">
+        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'" style="width: 100%;">
           <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </el-form-item>
diff --git a/src/views/system/tool/document/document.vue b/src/views/system/tool/document/document.vue
index 774e498..ac857ea 100644
--- a/src/views/system/tool/document/document.vue
+++ b/src/views/system/tool/document/document.vue
@@ -14,7 +14,7 @@
   templateName: '', // 名称
   templateCreator: '', // 负责人
   createTime: '', // 创建时间
-  limit: 10,
+  limit: 20,
   offset: 1,
   templateType: '',
 }) // 查询参数
@@ -37,6 +37,9 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.createTime) {
+    searchQuery.createTime = ''
+  }
   templatePage(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
diff --git a/src/views/system/tool/signature/addDDialog.vue b/src/views/system/tool/signature/addDDialog.vue
index 509509c..bb4c177 100644
--- a/src/views/system/tool/signature/addDDialog.vue
+++ b/src/views/system/tool/signature/addDDialog.vue
@@ -185,7 +185,7 @@
         <el-input v-model.trim="ruleForm.signDesc" placeholder="签章描述" :disabled="title === '详情'" />
       </el-form-item>
       <el-form-item label="可使用人" prop="userIdList">
-        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'">
+        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'" style="width: 100%;">
           <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </el-form-item>
diff --git a/src/views/system/tool/signature/signature.vue b/src/views/system/tool/signature/signature.vue
index 4eb6d70..f44f661 100644
--- a/src/views/system/tool/signature/signature.vue
+++ b/src/views/system/tool/signature/signature.vue
@@ -15,7 +15,7 @@
   signName: '', // 名称
   signDirector: '', // 负责人
   createTime: '', // 创建时间
-  limit: 10,
+  limit: 20,
   offset: 1,
   signType: '',
 }) // 查询参数
@@ -38,6 +38,9 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.createTime) {
+    searchQuery.createTime = ''
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows

diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index bb58885..2959118 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -53,3 +53,64 @@
   }
   return true
 }
+
+/**
+ * 验证小写字母
+ * @param str
+ * @returns
+ */
+export function validateLowerCase(str: string) {
+  const reg = /^[a-z]+$/
+  return reg.test(str)
+}
+
+/* 验证大写字母 */
+export function validateUpperCase(str: string) {
+  const reg = /^[A-Z]+$/
+  return reg.test(str)
+}
+
+/* 验证大小写字母 */
+export function validateAlphabets(str: string) {
+  const reg = /^[A-Za-z]+$/
+  return reg.test(str)
+}
+
+/**
+ * 验证邮箱
+ * @param email
+ * @returns {boolean}
+ */
+export function validateEmail(email: string) {
+  const re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
+  return re.test(email)
+}
+
+/**
+ * 验证手机号
+ * @param phone
+ * @returns {boolean}
+ */
+export function validateMobile(phone: string) {
+  const re = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/
+  return re.test(phone)
+}
+
+/**
+ * 校验身份证号
+ * @param value
+ * @returns
+ */
+export function validateIdCardNo(value: string) {
+  const re = /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/
+  return re.test(value)
+}
+/**
+ *
+ * @param value 验证电话号码
+ * @returns
+ */
+export function validatePhone(value: string) {
+  const re = /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/
+  return re.test(value)
+}
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 1c2405e..bca0958 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,13 +1,46 @@
-<script lang="ts" setup name="borrowHandle">
-// 逻辑代码
+<!-- 设备借用处理 -->
+<script lang="ts" setup name="borrowApply">
+import list from './components/handleList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '待借用', comp: list },
+  { name: '已借用', comp: list },
+  { name: '已归还', comp: list },
+])
+const current = ref('待借用')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用处理
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 03d414b..c5771f7 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,13 +1,50 @@
+<!-- 设备借用申请 -->
 <script lang="ts" setup name="borrowApply">
-// 逻辑代码
+import list from './components/applyList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '全部', comp: list },
+  { name: '草稿箱', comp: list },
+  { name: '待审批', comp: list },
+  { name: '审批中', comp: list },
+  { name: '已通过', comp: list },
+  { name: '未通过', comp: list },
+  { name: '已取消', comp: list },
+])
+const current = ref('全部')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用申请
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
new file mode 100644
index 0000000..052f3ce
--- /dev/null
+++ b/src/views/device/borrow/components/applyList.vue
@@ -0,0 +1,328 @@
+<script lang="ts" setup name="borrowApplyList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '文件号',
+    value: 'fileNo',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '类别',
+    value: 'catergory',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '李四',
+      time: '2020-12-14 00:00:00',
+      status: '未通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const approveRef = ref()
+// 同意
+const agree = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '1',
+  })
+}
+// 驳回
+const reject = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '3',
+  })
+}
+// 拒绝
+const refuse = (row: any) => {
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
+}
+// 取消
+const cancel = (rowrow: any) => {
+  ElMessageBox.confirm(
+    '确认取消吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" @click="addBtn" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="agree(row)">
+                  同意
+                </el-button>
+                <el-button size="small" type="primary" link @click="reject(row)">
+                  驳回
+                </el-button>
+                <el-button size="small" type="primary" link @click="refuse(row)">
+                  拒绝
+                </el-button>
+                <el-button size="small" type="primary" link @click="cancel(row)">
+                  取消
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/components/approvalActionDialog.vue b/src/views/device/borrow/components/approvalActionDialog.vue
new file mode 100644
index 0000000..214876c
--- /dev/null
+++ b/src/views/device/borrow/components/approvalActionDialog.vue
@@ -0,0 +1,104 @@
+<!-- 审批操作弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
+const dialogVisibleApprove = ref(false)
+const form = reactive({
+  radio: '1',
+})
+const ruleFormRef = ref<FormInstance>()
+const rules = reactive<FormRules>({
+})
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const approvetime = ref('') // 审批时间
+const initDialog = (row: any) => {
+  dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
+}
+defineExpose({ initDialog })
+
+// 点击保存
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      dialogVisibleApprove.value = false
+      emits('resetData')
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  formEl.resetFields()
+  dialogVisibleApprove.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
+    <el-form
+      ref="ruleFormRef" :model="form"
+      :rules="rules" label-width="110px"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人">
+            <el-input disabled :value="userInfo.$state.name" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间">
+            <el-input disabled :value="approvetime" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
+        <el-button @click="resetForm(ruleFormRef)">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
new file mode 100644
index 0000000..cfda00a
--- /dev/null
+++ b/src/views/device/borrow/components/handleList.vue
@@ -0,0 +1,281 @@
+<script lang="ts" setup name="borrowHandleList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '申请编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'dept',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      dept: '顶级',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      dept: '徐州分中心',
+      user: '里斯',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+const borrow = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="borrow(row)">
+                  借用
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/addRow.vue b/src/views/device/standingBook/components/addRow.vue
index 1678cdb..07b03d1 100644
--- a/src/views/device/standingBook/components/addRow.vue
+++ b/src/views/device/standingBook/components/addRow.vue
@@ -5,7 +5,7 @@
 import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
+const formLabelWidth = '110px'
 const form = ref({})
 const formTable = ref([
   {
@@ -91,108 +91,188 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`">
+  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
     >
       <div v-if="name === '周检记录'">
-        <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录表编号" />
-        </el-form-item>
-        <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录人" />
-        </el-form-item>
-        <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="检定日期"
-          />
-        </el-form-item>
-        <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="有效日期"
-          />
-        </el-form-item>
-        <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="送检人" />
-        </el-form-item>
-        <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录表编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="检定日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="有效日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="送检人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '状态变更记录'">
-        <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="状态类型" clearable>
-            <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="结束日期"
-          />
-        </el-form-item>
-        <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="申请人" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="状态类型" clearable style="width: 100%;">
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="申请人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '使用记录'">
-        <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用人" />
-        </el-form-item>
-        <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用部门" />
-        </el-form-item>
-        <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="使用类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用结束日期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用部门" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="使用类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '检定证书'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="证书类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书出具日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书有效期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
     </el-form>
     <template #footer>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 5f7b347..9a9f798 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -352,7 +352,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -376,7 +376,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -391,7 +391,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -404,14 +404,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -434,7 +434,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -443,20 +443,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -480,23 +480,23 @@
               <com-tree-select
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -507,10 +507,10 @@
             <el-form-item label="检定部门" prop="mesureDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -520,7 +520,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -529,13 +529,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -544,21 +544,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -578,14 +578,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -594,14 +594,14 @@
         <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-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -669,7 +669,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index fc3fd54..d9d4514 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -199,6 +199,8 @@
     useDeptList.value = toTreeList(res.data, '0', true)
   })
 }
+const selectTreeRef1 = ref()
+const selectTreeRef2 = ref()
 // 重置
 const resetDATA = () => {
   ruleForm.value = {
@@ -254,6 +256,10 @@
     isStandardSupportEquipment: '', //		是否标准配套设备
     id: '',
   }
+  if (title.value !== '详情') {
+    selectTreeRef1.value.clearSelected()
+    selectTreeRef2.value.clearSelected()
+  }
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
@@ -378,7 +384,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -402,7 +408,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -416,8 +422,7 @@
             <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"
+                :placeholder="title === '详情' ? '' : '出厂年月'" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -430,14 +435,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -460,7 +465,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -469,20 +474,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -505,24 +510,26 @@
             <el-form-item label="使用部门" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
+                ref="selectTreeRef2"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -536,10 +543,12 @@
               </el-select> -->
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                ref="selectTreeRef1"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -549,7 +558,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -558,13 +567,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -573,21 +582,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -607,14 +616,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -624,14 +633,14 @@
           <el-col :span="6">
             <el-form-item label="资本来源" prop="capitalSource">
               <!-- <el-input v-model.trim="ruleForm.capitalSource" placeholder="资本来源" :disabled="title === '详情'" /> -->
-              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -699,7 +708,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f653095..f4229a6 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -147,19 +147,17 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
-  setTimeout(() => {
-    list.value = [
-      {
-        equipmentNo: 123,
-        equipmentName: 'test',
-        modelNo: '001',
-        usePersonName: '张三',
-        validDate: '2022-12-12 00:00:00',
-        useDeptName: '顶级',
-      },
-    ]
-    total.value = 1
-  }, 1000)
+  list.value = [
+    {
+      equipmentNo: 123,
+      equipmentName: 'test',
+      modelNo: '001',
+      usePersonName: '张三',
+      validDate: '2022-12-12 00:00:00',
+      useDeptName: '顶级',
+    },
+  ] as any
+  total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -220,9 +218,11 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -300,13 +300,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.mesureType" class="m-2 normal-select" placeholder="检定方式" clearable>
+          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable>
             <el-option
               v-for="item in mesureTypeList"
               :key="item.id"
@@ -316,7 +316,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.managerState" class="m-2 normal-select" placeholder="管理状态" clearable>
+          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable>
             <el-option
               v-for="item in managerStateList"
               :key="item.id"
@@ -327,8 +327,9 @@
         </search-item>
         <search-item>
           <com-tree-select
+            ref="selectTreeRef"
             v-model="searchQuery.useDept" :options="useDeptList" placeholder="使用部门"
-            :tree-props="deptProps" style="width: 150px;"
+            :tree-props="deptProps"
           />
         </search-item>
         <search-item>
@@ -336,11 +337,10 @@
             v-model="searchQuery.validDate" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="有效日期"
             class="normal-date"
-            style="width: 150px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.abc" class="m-2 normal-select" placeholder="ABC" clearable>
+          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable>
             <el-option
               v-for="item in abcList"
               :key="item.id"
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 78a3800..4c31a94 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -2,9 +2,10 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/fixedAssetsAdd.vue'
-import type { fixedAssetsType } from './standingBook-interface'
+import type { fixedAssetsType, selectType } from './standingBook-interface'
 import { exportFile } from '@/utils/exportUtils'
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
+import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   assetNo: '', // 固定编号
@@ -50,7 +51,7 @@
   },
   {
     text: '设备类型',
-    value: 'assetTypeName',
+    value: 'equipmentTypeName',
     width: '150',
     align: 'center',
   },
@@ -102,6 +103,7 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+const equipmentCategoryList = ref<selectType[]>([]) // 设备类别
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
@@ -242,6 +244,10 @@
 }
 onMounted(() => {
   getList()
+  // 获取设备类别
+  getDictByCode('equipmentCategory').then((response) => {
+    equipmentCategoryList.value = response.data
+  })
 })
 </script>
 
@@ -265,7 +271,10 @@
           <el-input v-model="searchQuery.equipmentSpecifications" placeholder="设备规格" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-select v-model="searchQuery.equipmentCategory" placeholder="设备类别" clearable>
+            <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+          </el-select>
         </search-item>
       </search-area>
       <table-container>
diff --git a/src/views/device/stateManage/components/addRow.vue b/src/views/device/stateManage/components/addRow.vue
new file mode 100644
index 0000000..3ba82d6
--- /dev/null
+++ b/src/views/device/stateManage/components/addRow.vue
@@ -0,0 +1,160 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { listPageApi } from '@/api/device/standingBook'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  limit: 10,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '出厂编号',
+    value: 'manufacturingNo',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+  },
+])
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listPageApi(listQuery.value as any).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map(item => ({ ...item, checked: '' }))
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    equipmentName: '', // 姓名
+    equipmentNo: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const checkedArr = list.value.filter(item => item.checked !== '')
+  if (checkedArr.length) {
+    console.log(checkedArr, '选中的设备')
+    emits('add', checkedArr)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择设备')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns as any" :query="listQuery"
+        :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-checkbox v-model="scope.row.checked" :label="scope.$index" size="large" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-checkbox__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index 56417d6..214876c 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -47,38 +47,45 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="30%">
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
-      :rules="rules"
+      :rules="rules" label-width="110px"
     >
-      <el-form-item label="审批意见">
-        <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
-        <el-radio-group v-model="form.radio">
-          <el-radio label="1">
-            同意
-          </el-radio>
-          <el-radio label="2">
-            拒绝
-          </el-radio>
-          <el-radio label="3">
-            驳回
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="审批结论">
-        <el-input
-          :rows="4"
-          type="textarea"
-        />
-      </el-form-item>
       <el-row :gutter="24">
-        <el-col :span="10">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="审批人">
             <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
-        <el-col :span="14">
+        <el-col :span="12">
           <el-form-item label="审批时间">
             <el-input disabled :value="approvetime" />
           </el-form-item>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index e74d70e..2003e31 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -1,7 +1,8 @@
 <!-- 新增或详情弹窗 -->
-<script lang="ts" setup name="addNotice">
+<script lang="ts" setup name="add">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
+import addRow from './addRow.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
@@ -16,6 +17,7 @@
 const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const name = ref('')
+const borrowList = ref([])
 const ruleForm = ref({
   assetNo: '', // 资产编号
   assetType: '', // 资产类型
@@ -357,10 +359,86 @@
     isShowCalibration.value = true
   }
 })
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerLevelName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+  },
+])
+const addRowRef = ref()
+// 添加行
+const addRowBtn = () => {
+  addRowRef.value.initDialog({ title: '添加' })
+}
+// 删除行
+const removeRowBtn = () => {
+  const removeArr = borrowList.value.filter(item => item.remove !== '')
+  if (removeArr.length) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      borrowList.value = borrowList.value.filter(item => item.remove === '')
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 借用设备列表添加
+const addRowMethods = (row) => {
+  row.forEach((element) => {
+    borrowList.value.push({ ...element, remove: '' })
+  })
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
     <detail-page :title="`${name}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
@@ -378,15 +456,16 @@
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder="">
+              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -430,7 +509,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -454,28 +533,56 @@
         </el-row>
       </el-form>
     </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>
+    <div>
+      <detail-block title="借用设备列表">
+        <template #btns>
+          <el-button type="primary" @click="addRowBtn">
+            添加行
+          </el-button>
+          <el-button type="info" @click="removeRowBtn">
+            删除行
+          </el-button>
+        </template>
+        <normal-table
+          :data="borrowList" :total="1" :columns="columns as any"
+        >
+          <template #preColumns>
+            <el-table-column label="选择" width="55" align="center">
+              <template #default="scope">
+                <el-checkbox v-model="scope.row.remove" :label="scope.$index" size="large" />
+              </template>
+            </el-table-column>
+            <el-table-column label="序号" width="60" align="center">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </detail-block>
+      <detail-block 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>
+    </div>
   </app-container>
 </template>
 
@@ -484,6 +591,10 @@
   background-color: #fff;
 }
 
+:deep(.el-checkbox__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,
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index aaaaf61..d588b8d 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,6 +1,7 @@
 <script lang="ts" setup name="bench">
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
+import type { trainLogStatistic } from './bench-interface'
 import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
 import { getPlanList } from '@/api/system/plan'
 import { listPageApi } from '@/api/measure/file'
@@ -132,15 +133,19 @@
     account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
+    const result: trainLogStatistic = res.data
+    const notQualified: number = Number(result.trainCount) - result.qualifiedCount
+    const qualifiedRate = ((result.qualifiedCount / result.trainCount) * 100).toFixed(2) // 合格率
+    const notQualifiedRate = ((notQualified / result.trainCount) * 100).toFixed(2) // 不合格率
     TrainLogSList.value = [
-      { name: `合格     ${res.data.qualified}-${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
-      { name: `不合格   ${res.data.notQualified}- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+      { name: `合   格   ${result.qualifiedCount}-${qualifiedRate}%`, value: result.qualifiedCount },
+      { name: `不合格   ${notQualified}- ${notQualifiedRate}%`, value: notQualified },
     ]
     TrainLogTitle.value = res.data.trainCount
   }).catch((_) => {
     // 处理异常
     TrainLogSList.value = [
-      { name: '合格     0 - 50%', value: 0 },
+      { name: '合   格   0 - 50%', value: 0 },
       { name: '不合格   0 - 50%', value: 0 },
     ]
     TrainLogTitle.value = 0
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 9ef0b93..1ad577b 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -270,7 +270,7 @@
               <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="6">
             <el-form-item label="名称" prop="fileName">
               <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
             </el-form-item>
@@ -279,13 +279,14 @@
         <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" class="fill-input" disabled>
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled style="width: 100%;">
                 <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="请选择发布单位"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -295,6 +296,7 @@
                 v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -311,12 +313,13 @@
                 v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人" prop="createUserId">
-              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index b45fbc3..542b284 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -26,7 +26,7 @@
   createUser: '', // 创建人
   createTime: '', // 创建
   approvalStatus: props.value, // 审批状态
-  limit: 10,
+  limit: 20,
   offset: 1,
   fileType: '', // 类型
   formId: '',
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 7d4724b..e54ddf5 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -26,7 +26,7 @@
   fileCode: '', // 文件号
   effectiveTime: '', // 实施时间
   effectiveStatus: '', // 实施状态
-  limit: 10,
+  limit: 20,
   offset: 1,
   fileType: '', // 类型
 }) // 查询参数
@@ -75,13 +75,19 @@
 const getStatus = () => {
   getDictByCode('effectiveStatus').then((res) => {
     if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
+      effectiveStatusSelect.value = [...res.data, { name: '全部', value: '', id: 'quanbu' }]
     }
   })
 }
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.publishTime) {
+    searchQuery.publishTime = ''
+  }
+  if (!searchQuery.effectiveTime) {
+    searchQuery.effectiveTime = ''
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -252,13 +258,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" />
         </search-item>
         <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
@@ -274,20 +280,16 @@
           <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: 185px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
             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: 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" placeholder="实施状态" clearable>
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index 5ca3275..a95c665 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -505,21 +505,21 @@
         <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] === '详情'" @change="directorChange">
+              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;" @change="directorChange">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.name" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
-              <el-select v-model="ruleForm.technologyJob" :placeholder="title.split('-')[2] === '详情' ? '' : '技术职务'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.technologyJob" :placeholder="title.split('-')[2] === '详情' ? '' : '技术职务'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;">
                 <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="administrationJob">
-              <el-select v-model="ruleForm.administrationJob" :placeholder="title.split('-')[2] === '详情' ? '' : '行政职务'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.administrationJob" :placeholder="title.split('-')[2] === '详情' ? '' : '行政职务'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index aac1ef2..11d6d0a 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -22,7 +22,7 @@
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
-  limit: 10,
+  limit: 20,
   offset: 1,
   organizeType: '', // 类型
   createTime: '', // 创建时间
@@ -118,6 +118,9 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.createTime) {
+    searchQuery.createTime = ''
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows.map(item => ({ ...item, createTime: item.createTime.split(' ')[0] }))
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 3f472eb..bc5d9d4 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -7,7 +7,9 @@
 // import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
-import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+// import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const props = defineProps({
   isRemind: {
     type: Boolean,
@@ -78,11 +80,14 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 // 获取所有部门
-const deptList = ref<DeptTreeNode[]>([])
+const deptList = ref([])
 const getDeptList = async () => {
   getDeptTreeList().then((res) => {
-    deptList.value = res.data
+    deptList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
@@ -177,6 +182,7 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   searchQuery.staffNo = ''
@@ -184,6 +190,7 @@
   searchQuery.deptId = ''
   searchQuery.certificateStatus = ''
   searchQuery.verifierCertificateNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -212,10 +219,6 @@
     loading.close()
   })
 }
-// 打印
-const print = () => {
-
-}
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传图片
@@ -268,20 +271,24 @@
           <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+          <!-- <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
             <el-option
               v-for="item in deptList"
               :key="item.id"
               :label="item.name"
               :value="item.id"
             />
-          </el-select>
+          </el-select> -->
+          <com-tree-select
+            ref="selectTreeRef" v-model="searchQuery.deptId" :options="deptList"
+            placeholder="工作部门" :tree-props="deptProps"
+          />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况">
+          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况" clearable>
             <el-option
               v-for="item in certificateStatusList"
               :key="item.id"
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 4352604..5a5f036 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -389,10 +389,10 @@
           关闭
         </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">
-            <el-form-item prop="minioFileName" label-width="70px">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item prop="minioFileName">
               <el-upload
                 class="avatar-uploader"
                 :show-file-list="false"
@@ -423,23 +423,24 @@
               <el-date-picker
                 v-model="ruleForm.birthday" type="date" format="YYYY-MM" value-format="YYYY-MM"
                 placeholder="出生年月" :disabled="title === '详情'"
+                style="width: 100%;"
               />
             </el-form-item>
             <el-form-item label="工作部门" prop="deptId" class="marg-item">
-              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled>
+              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled style="width: 100%;">
                 <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="ruleForm.deptId" :options="PubListTree"
-                placeholder="选择组织机构" :tree-props="deptProps"
+                placeholder="选择组织机构" :tree-props="deptProps" style="width: 100%;"
               />
             </el-form-item>
             <el-form-item label="计量专业" prop="major" class="marg-item">
               <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
             </el-form-item>
             <el-form-item label="是否特操人" prop="specialOperator" class="marg-item">
-              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -449,23 +450,23 @@
               <el-input v-model.trim="ruleForm.staffNo" placeholder="系统自动生成" disabled />
             </el-form-item>
             <el-form-item label="性别" prop="sex" class="marg-item">
-              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="技术职务" prop="technologyJob" class="marg-item">
-              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="从事日期" prop="workDate" class="marg-item">
               <el-date-picker
                 v-model="ruleForm.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-                placeholder="请选择从事日期"
+                placeholder="请选择从事日期" style="width: 100%;"
               />
             </el-form-item>
-            <el-form-item label="是否技术考核" prop="technologyExam" class="marg-item">
-              <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'">
+            <el-form-item label="是否技术考核" prop="technologyExam" class="marg-item" style="width: 100%;">
+              <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -475,17 +476,17 @@
               <el-input ref="cardRef" v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" @blur="getBirthday" />
             </el-form-item>
             <el-form-item label="文化程度" prop="education" class="marg-item">
-              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="行政职务" prop="administrationJob" class="marg-item">
-              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="是否主考人" prop="mainExaminer" class="marg-item">
-              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index 042636e..660f2b0 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -264,7 +264,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="性别" prop="meterStaff.sex">
-              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -273,21 +273,21 @@
         <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-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -296,7 +296,7 @@
         <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-select v-if="title === '详情'" v-model="meterStaff.deptId" disabled style="width: 100%;">
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
               <com-tree-select
@@ -304,6 +304,7 @@
                 ref="selectTreeRef" v-model="meterStaff.deptId" :options="PubListTree"
                 placeholder="选择组织机构"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -316,7 +317,7 @@
             <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="请选择从事日期"
+                placeholder="请选择从事日期" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -347,7 +348,7 @@
             <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="请选择发证日期"
+                placeholder="请选择发证日期" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -355,7 +356,7 @@
             <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="请选择有效日期"
+                placeholder="请选择有效日期" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 178fc12..d0116f3 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -3,7 +3,7 @@
 import type { FormInstance, FormRules } from 'element-plus'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
+const formLabelWidth = '110px'
 const form = reactive({
   certificateNo: '', // 证书号
   certificateName: '', // 证书名称
@@ -71,32 +71,52 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`" width="40%">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
     >
-      <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
-        <el-input v-model="form.certificateNo" placeholder="证书号" />
-      </el-form-item>
-      <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
-        <el-input v-model="form.certificateName" placeholder="证书名称" />
-      </el-form-item>
-      <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
-        <el-input v-model="form.certificateCompany" placeholder="发证单位" />
-      </el-form-item>
-      <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
-        <el-date-picker
-          v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择发证日期"
-        />
-      </el-form-item>
-      <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-        <el-date-picker
-          v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择有效日期"
-        />
-      </el-form-item>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
+            <el-input v-model="form.certificateNo" placeholder="证书号" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
+            <el-input v-model="form.certificateName" placeholder="证书名称" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
+            <el-input v-model="form.certificateCompany" placeholder="发证单位" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
+            <el-date-picker
+              v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择发证日期" style="width: 100%;"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+            <el-date-picker
+              v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择有效日期" style="width: 100%;"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <template #footer>
       <span class="dialog-footer">
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
index 5e20d1b..10b0deb 100644
--- a/src/views/measure/person/components/personListDialog.vue
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -1,8 +1,11 @@
 <!-- 计量人员列表弹窗 -->
 <script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
 import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import { getDeptTreeList } from '@/api/system/dept'
-import type { TreeStructure } from '@/views/system/user/user-interface'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -10,7 +13,7 @@
   staffNo: '', // 人员编号
   name: '', // 姓名
   deptId: '', // 所在部门
-  limit: 5,
+  limit: 10,
   offset: 1,
 })
 const loadingTable = ref<boolean>(false)
@@ -32,20 +35,22 @@
   },
 ])
 // 获取部门
-const deptIdList = ref<TreeStructure[]>([])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const deptIdList = ref([])
 const getDeptList = () => {
   getDeptTreeList().then((res) => {
-    deptIdList.value = res.data
+    deptIdList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
 const fetchData = () => {
-  select.value = ''
+  select.value = -1
   getStaffList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.records
       total.value = Number(res.data.total)
-      console.log(list.value, 'list')
     }
   })
 }
@@ -53,6 +58,7 @@
 const search = () => {
   fetchData()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   listQuery.value = {
@@ -62,6 +68,7 @@
     limit: 10,
     offset: 1,
   }
+  selectTreeRef.value.clearSelected()
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -76,18 +83,24 @@
 }
 // 点击保存
 const submitForm = () => {
-  const person = list.value.filter((item, index) => index == select.value)[0]
-  console.log(person, 'person')
-  getStaffDetail(person).then((res) => {
-    if (res.code === 200) {
-      emits('add', res.data)
-      dialogFormVisible.value = false
-    }
-  })
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    getStaffDetail(person).then((res) => {
+      if (res.code === 200) {
+        emits('add', res.data)
+        dialogFormVisible.value = false
+        reset()
+      }
+    })
+  }
+  else {
+    ElMessage.warning('请先选择人员')
+  }
 }
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
+  reset()
 }
 // 初始化
 const initDialog = () => {
@@ -99,39 +112,45 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员" width="50%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable style="width: 150px;" />
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable style="width: 150px;" />
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
+        <!-- <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
           <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
+        </el-select> -->
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
-    <normal-table
-      :data="list" :total="total" :columns="columns" :query="listQuery"
-      :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>
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :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">
             {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
           </template>
         </el-table-column> -->
-      </template>
-    </normal-table>
+        </template>
+      </normal-table>
+    </div>
     <template #footer>
       <span class="dialog-footer">
         <el-button type="primary" @click="submitForm">确认</el-button>
diff --git a/src/views/measure/person/components/userListDialog.vue b/src/views/measure/person/components/userListDialog.vue
index dcd05b5..cd62a73 100644
--- a/src/views/measure/person/components/userListDialog.vue
+++ b/src/views/measure/person/components/userListDialog.vue
@@ -3,14 +3,16 @@
 import { ElMessage } from 'element-plus'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
-import type { TreeStructure } from '@/views/system/user/user-interface'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
 const listQuery = ref({
   keywords: '', // 姓名
   deptId: '', // 所在部门
-  limit: 5,
+  limit: 10,
   offset: 1,
 })
 const loadingTable = ref<boolean>(false)
@@ -31,11 +33,14 @@
     value: 'deptName',
   },
 ])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 // 获取部门
-const deptIdList = ref<TreeStructure[]>([])
+const deptIdList = ref([])
 const getDeptList = () => {
   getDeptTreeList().then((res) => {
-    deptIdList.value = res.data
+    deptIdList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
@@ -52,6 +57,7 @@
 const search = () => {
   fetchData()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   listQuery.value = {
@@ -60,6 +66,7 @@
     limit: 10,
     offset: 1,
   }
+  selectTreeRef.value.clearSelected()
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -74,11 +81,11 @@
 }
 // 点击保存
 const submitForm = () => {
-  console.log(select.value)
   if (select.value >= 0) {
     const person = list.value.filter((item, index) => index == select.value)[0]
     emits('add', person)
     dialogFormVisible.value = false
+    reset()
   }
   else {
     ElMessage.warning('请先选择人员')
@@ -87,9 +94,11 @@
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
+  reset()
 }
 // 初始化
 const initDialog = () => {
+  // reset()
   dialogFormVisible.value = true
   getDeptList()
   fetchData()
@@ -98,16 +107,20 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+  <el-dialog v-model="dialogFormVisible" title="选择人员" width="50%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
         <el-input v-model.trim="listQuery.keywords" placeholder="真实姓名" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable>
+        <!-- <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable>
           <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
+        </el-select> -->
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 9c6f65d..355473a 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -7,7 +7,9 @@
 // import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
-import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+// import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
@@ -16,7 +18,7 @@
   major: '', // 计量专业
   verifierCertificateNo: '', // 证书号
   certificateStatus: '', // 证书状态
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -52,10 +54,10 @@
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取所有部门
-const deptList = ref<DeptTreeNode[]>([])
+const deptList = ref([])
 const getDeptList = async () => {
   getDeptTreeList().then((res) => {
-    deptList.value = res.data
+    deptList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
@@ -126,6 +128,7 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   searchQuery.staffNo = ''
@@ -133,6 +136,7 @@
   searchQuery.deptId = ''
   searchQuery.major = ''
   searchQuery.verifierCertificateNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -160,10 +164,9 @@
     loading.close()
   })
 }
-// 打印
-const print = () => {
-
-}
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传图片
@@ -216,14 +219,18 @@
           <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+          <!-- <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
             <el-option
               v-for="item in deptList"
               :key="item.id"
               :label="item.name"
               :value="item.id"
             />
-          </el-select>
+          </el-select> -->
+          <com-tree-select
+            ref="selectTreeRef" v-model="searchQuery.deptId" :options="deptList"
+            placeholder="工作部门" :tree-props="deptProps"
+          />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.major" placeholder="计量专业" clearable class="w-50 m-2" />
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index af0a29d..2e0e7af 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -1,12 +1,15 @@
 <script lang="ts" setup name="ListSourceAdd">
-import { reactive, ref } from 'vue'
+/**
+ * 添加/编辑/详情溯源供方
+ */
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions, IformInline } from './list_interface'
+import type { IOptions, IformInline, traceSupplierPerson } from './list_interface'
 import { exportFile } from '@/utils/exportUtils'
 import { UploadFile } from '@/api/measure/file'
 import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+import { validatePhone } from '@/utils/validate'
 const props = defineProps({
   infoId: {
     type: String,
@@ -19,43 +22,45 @@
 })
 const emit = defineEmits(['close'])
 const formInline: Ref<IformInline> = ref({
-  businessContent: null,
-  supplierName: null,
-  supplierNo: null,
-  bankAccount: null,
-  bankAccountNumber: null,
-  bankName: null,
-  briefName: null,
-  businessScope: null,
-  companyAddress: null,
-  companyArea: null,
-  companyCity: null,
-  companyCountry: null,
-  companyProvince: null,
-  createTime: null,
-  director: null,
-  fax: null,
-  invoiceAddress: null,
-  invoiceArea: null,
-  invoiceCity: null,
-  invoiceCountry: null,
-  invoiceProvince: null,
-  mailbox: null,
-  minioFileName: null,
-  mobile: null,
-  phone: null,
-  postalCode: null,
-  remark: null,
-  taxNumber: null,
-  website: null,
+  id: '',
+  businessContent: '',
+  supplierName: '',
+  supplierNo: '',
+  bankAccount: '',
+  bankAccountNumber: '',
+  bankName: '',
+  briefName: '',
+  businessScope: '',
+  companyAddress: '',
+  companyArea: '',
+  companyCity: '',
+  companyCountry: '',
+  companyProvince: '',
+  createTime: '',
+  director: '',
+  fax: '',
+  invoiceAddress: '',
+  invoiceArea: '',
+  invoiceCity: '',
+  invoiceCountry: '',
+  invoiceProvince: '',
+  mailbox: '',
+  minioFileName: '',
+  mobile: '',
+  phone: '',
+  postalCode: '',
+  remark: '',
+  taxNumber: '',
+  website: '',
   traceSupplierPersonList: [],
 })
+const traceSupplierPersonList: Ref<traceSupplierPerson[]> = ref([])
 const columns = ref([
-  { text: '人员编号', value: 'personNo', show: true },
-  { text: '姓名', value: 'name', show: true },
-  { text: '工作部门', value: 'department', show: true },
-  { text: '职务', value: 'job', show: true },
-  { text: '联系方式', value: 'phone', show: true },
+  { text: '人员编号', value: 'personNo', required: false },
+  { text: '姓名', value: 'name', required: true },
+  { text: '工作部门', value: 'department', required: false },
+  { text: '职务', value: 'job', required: false },
+  { text: '联系方式', value: 'phone', required: true, reg: validatePhone },
 ])
 const ruleFormRef = ref<FormInstance>()
 const provinceList = ref<IOptions[]>([])
@@ -66,14 +71,17 @@
 const invoiceCityList = ref<IOptions[]>([])
 const areaInvoiceList = ref<IOptions[]>([])
 const dialogVisible = ref(false)
-const addPersonList = ref({
+// 人员对象
+const addPersonObj: traceSupplierPerson = {
+  id: '',
   personNo: '',
   name: '',
   department: '',
   job: '',
   phone: '',
-})
-const SelectionList = ref([])
+  editable: true,
+}
+const SelectionList: Ref<traceSupplierPerson[]> = ref([])
 const upload = ref<UploadInstance>()
 // 校验规则
 const rules = ref({
@@ -91,7 +99,7 @@
   })
 }
 // 表格选中
-const handleSelectionChange = (e: any) => {
+const handleSelectionChange = (e: traceSupplierPerson[]) => {
   SelectionList.value = e
 }
 // 获取公司地址省级
@@ -142,15 +150,33 @@
   })
 }
 // 点击增加行
-const addRoow = () => {
-  const object = {
-    personNo: '',
-    name: '',
-    department: '',
-    job: '',
-    phone: '',
+const addRow = () => {
+  // 检查上一行必填项
+  if (checkPersonList()) {
+    setAllRowReadable()
+    traceSupplierPersonList.value.push({ ...addPersonObj })
   }
-  formInline.value.traceSupplierPersonList.push(object)
+}
+// 检查人员列表
+function checkPersonList() {
+  for (let index = 0; index < traceSupplierPersonList.value.length; index++) {
+    const item = traceSupplierPersonList.value[index]
+    for (const prop of columns.value) {
+      // 检查必填
+      if (prop.required && !item[prop.value]) {
+        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
+        return false
+      }
+      // 验证正则
+      if (prop.reg && typeof prop.reg === 'function') {
+        if (!prop.reg(item[prop.value])) {
+          ElMessage.warning(`第${index + 1}行中${prop.text}输入不合法`)
+          return false
+        }
+      }
+    }
+  }
+  return true
 }
 // 点击关闭
 const handleClose = () => {
@@ -158,12 +184,12 @@
 }
 // 点击弹窗的完成追加到表格数组中
 const addPushList = () => {
-  formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonList.value)))
+  formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonObj.value)))
   handleClose()
 }
 // 删除行
 const deleteList = () => {
-  formInline.value.traceSupplierPersonList = formInline.value.traceSupplierPersonList.filter((item) => {
+  traceSupplierPersonList.value = traceSupplierPersonList.value.filter((item: traceSupplierPerson) => {
     return !SelectionList.value.includes(item)
   })
 }
@@ -261,10 +287,16 @@
     }
   })
 }
-// 双击表格显示输入框
-const dblclickName = (item: object) => {
-  console.log(item)
-  item.show = false
+// 双击行显示输入框
+const dblclickRow = (row: traceSupplierPerson) => {
+  setAllRowReadable()
+  row.editable = true
+}
+// 将所有人员信息列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of traceSupplierPersonList.value) {
+    item.editable = false
+  }
 }
 if (props.buttonType !== '新建') {
   getInfo()
@@ -273,7 +305,7 @@
 
 <template>
   <app-container>
-    <detail-page :title="`培训计划-${buttonType}`">
+    <detail-page :title="`溯源供方-${buttonType}`">
       <template #btns>
         <el-button
           type="primary"
@@ -617,39 +649,36 @@
       </el-form>
     </detail-page>
     <detail-block title="人员信息">
-      <template #btns>
-        <el-button
-          type="info"
-          :disabled="buttonType === '详情'"
-          @click="deleteList"
-        >
+      <template v-if="buttonType !== '详情'" #btns>
+        <el-button type="info" @click="deleteList">
           删除行
         </el-button>
-        <el-button
-          type="primary"
-          :disabled="buttonType === '详情'"
-          @click="addRoow"
-        >
+        <el-button type="primary" @click="addRow">
           增加行
         </el-button>
       </template>
       <el-table
-        :data="formInline.traceSupplierPersonList"
+        :data="traceSupplierPersonList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
+        @row-dblclick="dblclickRow"
       >
-        <el-table-column type="selection" width="55" />
+        <el-table-column type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column
           v-for="item in columns"
           :key="item.value"
           :prop="item.value"
           :label="item.text"
+          align="center"
         >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
           <template #default="scope">
-            <span v-show="item.show" style="color: gray;" @dblclick="dblclickName(item)">{{ scope.row[item.value] || `双击编辑${item.text}` }}</span>
-            <el-input v-show="!item.show" v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" @blur="item.show = true" />
+            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+            <el-input v-else v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index 530bcc4..c057976 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -24,6 +24,18 @@
   areaName: string
 }
 
+// 溯源供方人员
+export interface traceSupplierPerson {
+  id: number | string // id
+  job: string // 职务
+  department: string// 部门
+  name: string// 信命
+  personNo: string// 人员编号
+  phone: string// 联系方式
+  editable?: boolean // 是否可编辑
+  [key: string]: any
+}
+
 export interface IformInline {
   businessContent: string
   supplierName: string
@@ -55,5 +67,6 @@
   remark: string
   taxNumber: string
   website: string
-  traceSupplierPersonList: []
+  traceSupplierPersonList: traceSupplierPerson []
 }
+
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index e44001a..600eda1 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -32,11 +32,20 @@
   dialogVisible.value = true
   ruleForm.noticePublisher = userInfo.$state.name
   ruleForm.noticeCompany = userInfo.$state.deptName
-  ruleForm.noticeTime = dayjs().format('YYYY-MM-DD')
+  ruleForm.noticeTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
 }
 defineExpose({ initDialog })
+// 重置
+const resetDialog = () => {
+  ruleForm.noticeTime = ''
+  ruleForm.noticeSketch = ''
+  ruleForm.noticeContent = ''
+  ruleForm.minioFileName = ''
+  ruleForm.noticeTitle = ''
+}
 // 关闭弹窗
 const close = () => {
+  resetDialog()
   dialogVisible.value = false
   emits('resetData')
 }
@@ -63,6 +72,7 @@
 const resetForm = (formEl: FormInstance | undefined) => {
   // if (!formEl) { return }
   formEl?.resetFields()
+  resetDialog()
   dialogVisible.value = false
   emits('resetData')
 }
@@ -105,7 +115,7 @@
     uploadImage: {
       server: 'http://111.198.10.15:21409/minio/file/upload', // 配置图片上传地址
       maxFileSize: 2 * 1024 * 1024, // 10M  图片大小限制
-      fieldName: 'img', // 上传类型
+      fieldName: 'multipartFile', // 上传名字
       allowedFileTypes: [], // 选择文件时的类型限制，默认为 ['image/*'] 。如不想限制，则设置为 []
       // 自定义上传参数，传递图片时需要带一些参数过去写在这。参数会被添加到 formData 中，一起上传到服务端。
       // meta: {
@@ -154,9 +164,9 @@
     uploadVideo: {
       server: 'http://111.198.10.15:21409/minio/file/upload', // 配置视频上传地址
       maxFileSize: 5 * 1024 * 1024, // 5M  视频大小限制
-      fieldName: 'your-custom-name', // 上传类型
+      fieldName: 'multipartFile', // 上传名字
       // 最多可上传几个文件，默认为 5
-      maxNumberOfFiles: 3,
+      // maxNumberOfFiles: 1,
       allowedFileTypes: [], // 选择文件时的类型限制，默认为 ['video/*'] 。如不想限制，则设置为 []
       // 自定义上传参数，传递图片时需要带一些参数过去写在这。参数会被添加到 formData 中，一起上传到服务端。
       // meta: {
@@ -167,8 +177,8 @@
       //     Accept: 'text/x-json',
       //     otherKey: 'xxx'
       // },
-      metaWithUrl: false, // 将 meta 拼接到 url 参数中，默认 false
-      withCredentials: true, // 跨域是否传递 cookie ，默认为 false
+      // metaWithUrl: false, // 将 meta 拼接到 url 参数中，默认 false
+      // withCredentials: true, // 跨域是否传递 cookie ，默认为 false
       // 上传之前触发
       onBeforeUpload(file: any) {
         // file 选中的文件，格式如 { key: file }
@@ -222,9 +232,6 @@
     editorRef.value = editor // 一定要用 Object.seal() ，否则会报错
   })
 }
-const look = () => {
-  console.log(ruleForm.noticeContent)
-}
 const minioFileUrl = ref('')
 watch(() => ruleForm.minioFileName, (newVal) => {
   if (newVal) {
@@ -278,7 +285,7 @@
           />
           <editor
             v-model="ruleForm.noticeContent"
-            style="height: 150px; overflow-y: hidden;"
+            style="height: 300px; overflow-y: hidden;"
             :default-config="editorConfig"
             mode="default"
             @onCreated="onCreated"
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index 0926957..a4cdd5e 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -16,7 +16,7 @@
   noticePublisher: '', // 发布人
   noticeTime: '', // 发布时间
   noticeTitle: '', // 标题
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -27,6 +27,7 @@
     text: '编号',
     value: 'noticeNo',
     align: 'center',
+    width: '180',
   },
   {
     text: '标题',
@@ -37,6 +38,7 @@
     text: '发布人',
     value: 'noticePublisher',
     align: 'center',
+    width: '150',
   },
   {
     text: '内容描述',
@@ -47,11 +49,15 @@
     text: '发布时间',
     value: 'noticeTime',
     align: 'center',
+    width: '200',
   },
 ] // 表格
 const list = ref([]) // 表格数据
 // 获取通知公告列表
 const getNoticeList = () => {
+  if (!searchQuery.noticeTime) {
+    searchQuery.noticeTime = ''
+  }
   getNoticeeApi(searchQuery).then((res) => {
     total.value = res.data.total
     list.value = res.data.rows
diff --git a/src/views/system/notice/noticeDetail.vue b/src/views/system/notice/noticeDetail.vue
index 94468d4..da36bd8 100644
--- a/src/views/system/notice/noticeDetail.vue
+++ b/src/views/system/notice/noticeDetail.vue
@@ -1,5 +1,6 @@
 <!-- 通知公告详情弹窗 -->
 <script lang="ts" setup name="noticeDetail">
+import { Editor } from '@wangeditor/editor-for-vue'
 import type { noticeType } from './notice-interface'
 import { getNoticeDetail } from '@/api/system/notice'
 import { getPhotoUrl } from '@/api/system/tool'
@@ -52,6 +53,18 @@
     })
   }
 })
+// 编辑器配置
+const editorConfig = ref({
+  readOnly: true,
+})
+// 富文本实例对象
+const editorRef = shallowRef()
+const onCreated = (editor: any) => {
+  editorRef.value = editor
+  nextTick(() => {
+    editorRef.value = editor // 一定要用 Object.seal() ，否则会报错
+  })
+}
 </script>
 
 <template>
@@ -89,7 +102,18 @@
       </el-form-item>
       <el-form-item label="发布内容" prop="noticeContent">
         <!-- <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" disabled /> -->
-        <div style="border: 1px solid #dcdfe6;width: 100%;border-radius: 4px;padding: 12px;" v-html="ruleForm.noticeContent" />
+        <!-- <div style="border: 1px solid #dcdfe6;width: 100%;border-radius: 4px;padding: 12px;" v-html="ruleForm.noticeContent" ></div> -->
+        <div style="border: 1px solid #dcdfe6;width: 100%;border-radius: 4px;">
+          <editor
+            ref="editorRef"
+            v-model="ruleForm.noticeContent"
+            style="height: 300px; overflow-y: hidden;"
+            :default-config="editorConfig"
+            mode="default"
+            :disabled="true"
+            @onCreated="onCreated"
+          />
+        </div>
       </el-form-item>
       <el-form-item label="查看附件">
         <el-link v-if="ruleForm.minioFileName" :href="minioFileUrl" type="primary" target="_blank">
diff --git a/src/views/system/tool/autograph/addDDialog.vue b/src/views/system/tool/autograph/addDDialog.vue
index e39b706..daadd9b 100644
--- a/src/views/system/tool/autograph/addDDialog.vue
+++ b/src/views/system/tool/autograph/addDDialog.vue
@@ -186,7 +186,7 @@
         <el-input v-model.trim="ruleForm.signDesc" placeholder="签名描述" :disabled="title === '详情'" />
       </el-form-item>
       <el-form-item label="可使用人" prop="userIdList">
-        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'">
+        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'" style="width: 100%;">
           <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </el-form-item>
@@ -198,7 +198,7 @@
         <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px', 'margin-top': ruleForm.minioFileName === '' ? '0px' : '56px' }" @click="upload">
           {{ ruleForm.minioFileName === '' ? '上传' : '更换图片' }}
         </el-button>
-        <input v-show="title === '123'" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <input v-show="title === '123'" ref="fileRef" type="file" accept="image/*" @change="onFileChange">
       </el-form-item>
     </el-form>
     <template #footer>
diff --git a/src/views/system/tool/autograph/autograph.vue b/src/views/system/tool/autograph/autograph.vue
index ac9f000..d3c6f81 100644
--- a/src/views/system/tool/autograph/autograph.vue
+++ b/src/views/system/tool/autograph/autograph.vue
@@ -15,7 +15,7 @@
   signName: '', // 名称
   signDirector: '', // 负责人
   createTime: '', // 创建时间
-  limit: 10,
+  limit: 20,
   offset: 1,
   signType: '',
 }) // 查询参数
@@ -38,6 +38,9 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.createTime) {
+    searchQuery.createTime = ''
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -168,10 +171,10 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model="searchQuery.signNo" placeholder="签章编号" clearable class="w-50 m-2 normal-input" />
+        <el-input v-model="searchQuery.signNo" placeholder="签名编号" clearable class="w-50 m-2 normal-input" />
       </search-item>
       <search-item>
-        <el-input v-model="searchQuery.signName" placeholder="签章名称" clearable class="w-50 m-2 normal-input" />
+        <el-input v-model="searchQuery.signName" placeholder="签名名称" clearable class="w-50 m-2 normal-input" />
       </search-item>
       <search-item>
         <el-input v-model="searchQuery.signDirector" placeholder="负责人" clearable class="w-50 m-2 normal-input" />
diff --git a/src/views/system/tool/certificate/addDDialog.vue b/src/views/system/tool/certificate/addDDialog.vue
index 2721bf8..0fdec28 100644
--- a/src/views/system/tool/certificate/addDDialog.vue
+++ b/src/views/system/tool/certificate/addDDialog.vue
@@ -185,7 +185,7 @@
         <el-input v-model.trim="ruleForm.templateDesc" placeholder="模板描述" :disabled="title === '详情'" />
       </el-form-item>
       <el-form-item label="可使用人" prop="userIdList">
-        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'">
+        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'" style="width: 100%;">
           <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </el-form-item>
diff --git a/src/views/system/tool/certificate/certificate.vue b/src/views/system/tool/certificate/certificate.vue
index 9787116..a2468de 100644
--- a/src/views/system/tool/certificate/certificate.vue
+++ b/src/views/system/tool/certificate/certificate.vue
@@ -15,7 +15,7 @@
   templateName: '', // 名称
   templateCreator: '', // 负责人
   createTime: '', // 创建时间
-  limit: 10,
+  limit: 20,
   offset: 1,
   templateType: '',
 }) // 查询参数
@@ -38,6 +38,9 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.createTime) {
+    searchQuery.createTime = ''
+  }
   templatePage(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
diff --git a/src/views/system/tool/document/addDDialog.vue b/src/views/system/tool/document/addDDialog.vue
index c440d1d..d5d28d8 100644
--- a/src/views/system/tool/document/addDDialog.vue
+++ b/src/views/system/tool/document/addDDialog.vue
@@ -186,7 +186,7 @@
         <el-input v-model.trim="ruleForm.templateDesc" placeholder="模板描述" :disabled="title === '详情'" />
       </el-form-item>
       <el-form-item label="可使用人" prop="userIdList">
-        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'">
+        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'" style="width: 100%;">
           <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </el-form-item>
diff --git a/src/views/system/tool/document/document.vue b/src/views/system/tool/document/document.vue
index 774e498..ac857ea 100644
--- a/src/views/system/tool/document/document.vue
+++ b/src/views/system/tool/document/document.vue
@@ -14,7 +14,7 @@
   templateName: '', // 名称
   templateCreator: '', // 负责人
   createTime: '', // 创建时间
-  limit: 10,
+  limit: 20,
   offset: 1,
   templateType: '',
 }) // 查询参数
@@ -37,6 +37,9 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.createTime) {
+    searchQuery.createTime = ''
+  }
   templatePage(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
diff --git a/src/views/system/tool/signature/addDDialog.vue b/src/views/system/tool/signature/addDDialog.vue
index 509509c..bb4c177 100644
--- a/src/views/system/tool/signature/addDDialog.vue
+++ b/src/views/system/tool/signature/addDDialog.vue
@@ -185,7 +185,7 @@
         <el-input v-model.trim="ruleForm.signDesc" placeholder="签章描述" :disabled="title === '详情'" />
       </el-form-item>
       <el-form-item label="可使用人" prop="userIdList">
-        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'">
+        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'" style="width: 100%;">
           <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </el-form-item>
diff --git a/src/views/system/tool/signature/signature.vue b/src/views/system/tool/signature/signature.vue
index 4eb6d70..f44f661 100644
--- a/src/views/system/tool/signature/signature.vue
+++ b/src/views/system/tool/signature/signature.vue
@@ -15,7 +15,7 @@
   signName: '', // 名称
   signDirector: '', // 负责人
   createTime: '', // 创建时间
-  limit: 10,
+  limit: 20,
   offset: 1,
   signType: '',
 }) // 查询参数
@@ -38,6 +38,9 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.createTime) {
+    searchQuery.createTime = ''
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
diff --git a/src/views/system/user/listUser.vue b/src/views/system/user/listUser.vue
index 1387821..a4d6816 100644
--- a/src/views/system/user/listUser.vue
+++ b/src/views/system/user/listUser.vue
@@ -236,13 +236,13 @@
           </search-item>
           <search-item>
             <el-date-picker
-              v-model="listQuery.beginTime" type="datetime" format="YYYY-MM-DD HH:mm:ss"
+              v-model="listQuery.beginTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
               placeholder="选择开始时间"
             />
           </search-item>
           <search-item>
             <el-date-picker
-              v-model="listQuery.endTime" type="datetime" format="YYYY-MM-DD HH:mm:ss"
+              v-model="listQuery.endTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
               placeholder="选择结束时间"
             />
           </search-item>

diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index bb58885..2959118 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -53,3 +53,64 @@
   }
   return true
 }
+
+/**
+ * 验证小写字母
+ * @param str
+ * @returns
+ */
+export function validateLowerCase(str: string) {
+  const reg = /^[a-z]+$/
+  return reg.test(str)
+}
+
+/* 验证大写字母 */
+export function validateUpperCase(str: string) {
+  const reg = /^[A-Z]+$/
+  return reg.test(str)
+}
+
+/* 验证大小写字母 */
+export function validateAlphabets(str: string) {
+  const reg = /^[A-Za-z]+$/
+  return reg.test(str)
+}
+
+/**
+ * 验证邮箱
+ * @param email
+ * @returns {boolean}
+ */
+export function validateEmail(email: string) {
+  const re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
+  return re.test(email)
+}
+
+/**
+ * 验证手机号
+ * @param phone
+ * @returns {boolean}
+ */
+export function validateMobile(phone: string) {
+  const re = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/
+  return re.test(phone)
+}
+
+/**
+ * 校验身份证号
+ * @param value
+ * @returns
+ */
+export function validateIdCardNo(value: string) {
+  const re = /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/
+  return re.test(value)
+}
+/**
+ *
+ * @param value 验证电话号码
+ * @returns
+ */
+export function validatePhone(value: string) {
+  const re = /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/
+  return re.test(value)
+}
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 1c2405e..bca0958 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,13 +1,46 @@
-<script lang="ts" setup name="borrowHandle">
-// 逻辑代码
+<!-- 设备借用处理 -->
+<script lang="ts" setup name="borrowApply">
+import list from './components/handleList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '待借用', comp: list },
+  { name: '已借用', comp: list },
+  { name: '已归还', comp: list },
+])
+const current = ref('待借用')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用处理
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 03d414b..c5771f7 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,13 +1,50 @@
+<!-- 设备借用申请 -->
 <script lang="ts" setup name="borrowApply">
-// 逻辑代码
+import list from './components/applyList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '全部', comp: list },
+  { name: '草稿箱', comp: list },
+  { name: '待审批', comp: list },
+  { name: '审批中', comp: list },
+  { name: '已通过', comp: list },
+  { name: '未通过', comp: list },
+  { name: '已取消', comp: list },
+])
+const current = ref('全部')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用申请
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
new file mode 100644
index 0000000..052f3ce
--- /dev/null
+++ b/src/views/device/borrow/components/applyList.vue
@@ -0,0 +1,328 @@
+<script lang="ts" setup name="borrowApplyList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '文件号',
+    value: 'fileNo',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '类别',
+    value: 'catergory',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '李四',
+      time: '2020-12-14 00:00:00',
+      status: '未通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const approveRef = ref()
+// 同意
+const agree = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '1',
+  })
+}
+// 驳回
+const reject = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '3',
+  })
+}
+// 拒绝
+const refuse = (row: any) => {
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
+}
+// 取消
+const cancel = (rowrow: any) => {
+  ElMessageBox.confirm(
+    '确认取消吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" @click="addBtn" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="agree(row)">
+                  同意
+                </el-button>
+                <el-button size="small" type="primary" link @click="reject(row)">
+                  驳回
+                </el-button>
+                <el-button size="small" type="primary" link @click="refuse(row)">
+                  拒绝
+                </el-button>
+                <el-button size="small" type="primary" link @click="cancel(row)">
+                  取消
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/components/approvalActionDialog.vue b/src/views/device/borrow/components/approvalActionDialog.vue
new file mode 100644
index 0000000..214876c
--- /dev/null
+++ b/src/views/device/borrow/components/approvalActionDialog.vue
@@ -0,0 +1,104 @@
+<!-- 审批操作弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
+const dialogVisibleApprove = ref(false)
+const form = reactive({
+  radio: '1',
+})
+const ruleFormRef = ref<FormInstance>()
+const rules = reactive<FormRules>({
+})
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const approvetime = ref('') // 审批时间
+const initDialog = (row: any) => {
+  dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
+}
+defineExpose({ initDialog })
+
+// 点击保存
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      dialogVisibleApprove.value = false
+      emits('resetData')
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  formEl.resetFields()
+  dialogVisibleApprove.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
+    <el-form
+      ref="ruleFormRef" :model="form"
+      :rules="rules" label-width="110px"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人">
+            <el-input disabled :value="userInfo.$state.name" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间">
+            <el-input disabled :value="approvetime" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
+        <el-button @click="resetForm(ruleFormRef)">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
new file mode 100644
index 0000000..cfda00a
--- /dev/null
+++ b/src/views/device/borrow/components/handleList.vue
@@ -0,0 +1,281 @@
+<script lang="ts" setup name="borrowHandleList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '申请编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'dept',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      dept: '顶级',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      dept: '徐州分中心',
+      user: '里斯',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+const borrow = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="borrow(row)">
+                  借用
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/addRow.vue b/src/views/device/standingBook/components/addRow.vue
index 1678cdb..07b03d1 100644
--- a/src/views/device/standingBook/components/addRow.vue
+++ b/src/views/device/standingBook/components/addRow.vue
@@ -5,7 +5,7 @@
 import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
+const formLabelWidth = '110px'
 const form = ref({})
 const formTable = ref([
   {
@@ -91,108 +91,188 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`">
+  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
     >
       <div v-if="name === '周检记录'">
-        <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录表编号" />
-        </el-form-item>
-        <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录人" />
-        </el-form-item>
-        <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="检定日期"
-          />
-        </el-form-item>
-        <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="有效日期"
-          />
-        </el-form-item>
-        <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="送检人" />
-        </el-form-item>
-        <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录表编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="检定日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="有效日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="送检人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '状态变更记录'">
-        <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="状态类型" clearable>
-            <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="结束日期"
-          />
-        </el-form-item>
-        <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="申请人" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="状态类型" clearable style="width: 100%;">
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="申请人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '使用记录'">
-        <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用人" />
-        </el-form-item>
-        <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用部门" />
-        </el-form-item>
-        <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="使用类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用结束日期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用部门" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="使用类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '检定证书'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="证书类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书出具日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书有效期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
     </el-form>
     <template #footer>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 5f7b347..9a9f798 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -352,7 +352,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -376,7 +376,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -391,7 +391,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -404,14 +404,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -434,7 +434,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -443,20 +443,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -480,23 +480,23 @@
               <com-tree-select
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -507,10 +507,10 @@
             <el-form-item label="检定部门" prop="mesureDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -520,7 +520,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -529,13 +529,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -544,21 +544,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -578,14 +578,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -594,14 +594,14 @@
         <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-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -669,7 +669,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index fc3fd54..d9d4514 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -199,6 +199,8 @@
     useDeptList.value = toTreeList(res.data, '0', true)
   })
 }
+const selectTreeRef1 = ref()
+const selectTreeRef2 = ref()
 // 重置
 const resetDATA = () => {
   ruleForm.value = {
@@ -254,6 +256,10 @@
     isStandardSupportEquipment: '', //		是否标准配套设备
     id: '',
   }
+  if (title.value !== '详情') {
+    selectTreeRef1.value.clearSelected()
+    selectTreeRef2.value.clearSelected()
+  }
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
@@ -378,7 +384,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -402,7 +408,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -416,8 +422,7 @@
             <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"
+                :placeholder="title === '详情' ? '' : '出厂年月'" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -430,14 +435,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -460,7 +465,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -469,20 +474,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -505,24 +510,26 @@
             <el-form-item label="使用部门" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
+                ref="selectTreeRef2"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -536,10 +543,12 @@
               </el-select> -->
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                ref="selectTreeRef1"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -549,7 +558,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -558,13 +567,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -573,21 +582,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -607,14 +616,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -624,14 +633,14 @@
           <el-col :span="6">
             <el-form-item label="资本来源" prop="capitalSource">
               <!-- <el-input v-model.trim="ruleForm.capitalSource" placeholder="资本来源" :disabled="title === '详情'" /> -->
-              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -699,7 +708,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f653095..f4229a6 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -147,19 +147,17 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
-  setTimeout(() => {
-    list.value = [
-      {
-        equipmentNo: 123,
-        equipmentName: 'test',
-        modelNo: '001',
-        usePersonName: '张三',
-        validDate: '2022-12-12 00:00:00',
-        useDeptName: '顶级',
-      },
-    ]
-    total.value = 1
-  }, 1000)
+  list.value = [
+    {
+      equipmentNo: 123,
+      equipmentName: 'test',
+      modelNo: '001',
+      usePersonName: '张三',
+      validDate: '2022-12-12 00:00:00',
+      useDeptName: '顶级',
+    },
+  ] as any
+  total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -220,9 +218,11 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -300,13 +300,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.mesureType" class="m-2 normal-select" placeholder="检定方式" clearable>
+          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable>
             <el-option
               v-for="item in mesureTypeList"
               :key="item.id"
@@ -316,7 +316,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.managerState" class="m-2 normal-select" placeholder="管理状态" clearable>
+          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable>
             <el-option
               v-for="item in managerStateList"
               :key="item.id"
@@ -327,8 +327,9 @@
         </search-item>
         <search-item>
           <com-tree-select
+            ref="selectTreeRef"
             v-model="searchQuery.useDept" :options="useDeptList" placeholder="使用部门"
-            :tree-props="deptProps" style="width: 150px;"
+            :tree-props="deptProps"
           />
         </search-item>
         <search-item>
@@ -336,11 +337,10 @@
             v-model="searchQuery.validDate" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="有效日期"
             class="normal-date"
-            style="width: 150px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.abc" class="m-2 normal-select" placeholder="ABC" clearable>
+          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable>
             <el-option
               v-for="item in abcList"
               :key="item.id"
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 78a3800..4c31a94 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -2,9 +2,10 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/fixedAssetsAdd.vue'
-import type { fixedAssetsType } from './standingBook-interface'
+import type { fixedAssetsType, selectType } from './standingBook-interface'
 import { exportFile } from '@/utils/exportUtils'
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
+import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   assetNo: '', // 固定编号
@@ -50,7 +51,7 @@
   },
   {
     text: '设备类型',
-    value: 'assetTypeName',
+    value: 'equipmentTypeName',
     width: '150',
     align: 'center',
   },
@@ -102,6 +103,7 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+const equipmentCategoryList = ref<selectType[]>([]) // 设备类别
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
@@ -242,6 +244,10 @@
 }
 onMounted(() => {
   getList()
+  // 获取设备类别
+  getDictByCode('equipmentCategory').then((response) => {
+    equipmentCategoryList.value = response.data
+  })
 })
 </script>
 
@@ -265,7 +271,10 @@
           <el-input v-model="searchQuery.equipmentSpecifications" placeholder="设备规格" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-select v-model="searchQuery.equipmentCategory" placeholder="设备类别" clearable>
+            <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+          </el-select>
         </search-item>
       </search-area>
       <table-container>
diff --git a/src/views/device/stateManage/components/addRow.vue b/src/views/device/stateManage/components/addRow.vue
new file mode 100644
index 0000000..3ba82d6
--- /dev/null
+++ b/src/views/device/stateManage/components/addRow.vue
@@ -0,0 +1,160 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { listPageApi } from '@/api/device/standingBook'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  limit: 10,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '出厂编号',
+    value: 'manufacturingNo',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+  },
+])
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listPageApi(listQuery.value as any).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map(item => ({ ...item, checked: '' }))
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    equipmentName: '', // 姓名
+    equipmentNo: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const checkedArr = list.value.filter(item => item.checked !== '')
+  if (checkedArr.length) {
+    console.log(checkedArr, '选中的设备')
+    emits('add', checkedArr)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择设备')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns as any" :query="listQuery"
+        :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-checkbox v-model="scope.row.checked" :label="scope.$index" size="large" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-checkbox__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index 56417d6..214876c 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -47,38 +47,45 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="30%">
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
-      :rules="rules"
+      :rules="rules" label-width="110px"
     >
-      <el-form-item label="审批意见">
-        <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
-        <el-radio-group v-model="form.radio">
-          <el-radio label="1">
-            同意
-          </el-radio>
-          <el-radio label="2">
-            拒绝
-          </el-radio>
-          <el-radio label="3">
-            驳回
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="审批结论">
-        <el-input
-          :rows="4"
-          type="textarea"
-        />
-      </el-form-item>
       <el-row :gutter="24">
-        <el-col :span="10">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="审批人">
             <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
-        <el-col :span="14">
+        <el-col :span="12">
           <el-form-item label="审批时间">
             <el-input disabled :value="approvetime" />
           </el-form-item>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index e74d70e..2003e31 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -1,7 +1,8 @@
 <!-- 新增或详情弹窗 -->
-<script lang="ts" setup name="addNotice">
+<script lang="ts" setup name="add">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
+import addRow from './addRow.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
@@ -16,6 +17,7 @@
 const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const name = ref('')
+const borrowList = ref([])
 const ruleForm = ref({
   assetNo: '', // 资产编号
   assetType: '', // 资产类型
@@ -357,10 +359,86 @@
     isShowCalibration.value = true
   }
 })
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerLevelName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+  },
+])
+const addRowRef = ref()
+// 添加行
+const addRowBtn = () => {
+  addRowRef.value.initDialog({ title: '添加' })
+}
+// 删除行
+const removeRowBtn = () => {
+  const removeArr = borrowList.value.filter(item => item.remove !== '')
+  if (removeArr.length) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      borrowList.value = borrowList.value.filter(item => item.remove === '')
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 借用设备列表添加
+const addRowMethods = (row) => {
+  row.forEach((element) => {
+    borrowList.value.push({ ...element, remove: '' })
+  })
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
     <detail-page :title="`${name}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
@@ -378,15 +456,16 @@
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder="">
+              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -430,7 +509,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -454,28 +533,56 @@
         </el-row>
       </el-form>
     </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>
+    <div>
+      <detail-block title="借用设备列表">
+        <template #btns>
+          <el-button type="primary" @click="addRowBtn">
+            添加行
+          </el-button>
+          <el-button type="info" @click="removeRowBtn">
+            删除行
+          </el-button>
+        </template>
+        <normal-table
+          :data="borrowList" :total="1" :columns="columns as any"
+        >
+          <template #preColumns>
+            <el-table-column label="选择" width="55" align="center">
+              <template #default="scope">
+                <el-checkbox v-model="scope.row.remove" :label="scope.$index" size="large" />
+              </template>
+            </el-table-column>
+            <el-table-column label="序号" width="60" align="center">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </detail-block>
+      <detail-block 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>
+    </div>
   </app-container>
 </template>
 
@@ -484,6 +591,10 @@
   background-color: #fff;
 }
 
+:deep(.el-checkbox__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,
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index aaaaf61..d588b8d 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,6 +1,7 @@
 <script lang="ts" setup name="bench">
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
+import type { trainLogStatistic } from './bench-interface'
 import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
 import { getPlanList } from '@/api/system/plan'
 import { listPageApi } from '@/api/measure/file'
@@ -132,15 +133,19 @@
     account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
+    const result: trainLogStatistic = res.data
+    const notQualified: number = Number(result.trainCount) - result.qualifiedCount
+    const qualifiedRate = ((result.qualifiedCount / result.trainCount) * 100).toFixed(2) // 合格率
+    const notQualifiedRate = ((notQualified / result.trainCount) * 100).toFixed(2) // 不合格率
     TrainLogSList.value = [
-      { name: `合格     ${res.data.qualified}-${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
-      { name: `不合格   ${res.data.notQualified}- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+      { name: `合   格   ${result.qualifiedCount}-${qualifiedRate}%`, value: result.qualifiedCount },
+      { name: `不合格   ${notQualified}- ${notQualifiedRate}%`, value: notQualified },
     ]
     TrainLogTitle.value = res.data.trainCount
   }).catch((_) => {
     // 处理异常
     TrainLogSList.value = [
-      { name: '合格     0 - 50%', value: 0 },
+      { name: '合   格   0 - 50%', value: 0 },
       { name: '不合格   0 - 50%', value: 0 },
     ]
     TrainLogTitle.value = 0
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 9ef0b93..1ad577b 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -270,7 +270,7 @@
               <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="6">
             <el-form-item label="名称" prop="fileName">
               <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
             </el-form-item>
@@ -279,13 +279,14 @@
         <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" class="fill-input" disabled>
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled style="width: 100%;">
                 <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="请选择发布单位"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -295,6 +296,7 @@
                 v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -311,12 +313,13 @@
                 v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人" prop="createUserId">
-              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index b45fbc3..542b284 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -26,7 +26,7 @@
   createUser: '', // 创建人
   createTime: '', // 创建
   approvalStatus: props.value, // 审批状态
-  limit: 10,
+  limit: 20,
   offset: 1,
   fileType: '', // 类型
   formId: '',
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 7d4724b..e54ddf5 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -26,7 +26,7 @@
   fileCode: '', // 文件号
   effectiveTime: '', // 实施时间
   effectiveStatus: '', // 实施状态
-  limit: 10,
+  limit: 20,
   offset: 1,
   fileType: '', // 类型
 }) // 查询参数
@@ -75,13 +75,19 @@
 const getStatus = () => {
   getDictByCode('effectiveStatus').then((res) => {
     if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
+      effectiveStatusSelect.value = [...res.data, { name: '全部', value: '', id: 'quanbu' }]
     }
   })
 }
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.publishTime) {
+    searchQuery.publishTime = ''
+  }
+  if (!searchQuery.effectiveTime) {
+    searchQuery.effectiveTime = ''
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -252,13 +258,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" />
         </search-item>
         <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
@@ -274,20 +280,16 @@
           <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: 185px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
             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: 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" placeholder="实施状态" clearable>
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index 5ca3275..a95c665 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -505,21 +505,21 @@
         <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] === '详情'" @change="directorChange">
+              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;" @change="directorChange">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.name" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
-              <el-select v-model="ruleForm.technologyJob" :placeholder="title.split('-')[2] === '详情' ? '' : '技术职务'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.technologyJob" :placeholder="title.split('-')[2] === '详情' ? '' : '技术职务'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;">
                 <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="administrationJob">
-              <el-select v-model="ruleForm.administrationJob" :placeholder="title.split('-')[2] === '详情' ? '' : '行政职务'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.administrationJob" :placeholder="title.split('-')[2] === '详情' ? '' : '行政职务'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index aac1ef2..11d6d0a 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -22,7 +22,7 @@
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
-  limit: 10,
+  limit: 20,
   offset: 1,
   organizeType: '', // 类型
   createTime: '', // 创建时间
@@ -118,6 +118,9 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.createTime) {
+    searchQuery.createTime = ''
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows.map(item => ({ ...item, createTime: item.createTime.split(' ')[0] }))
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 3f472eb..bc5d9d4 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -7,7 +7,9 @@
 // import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
-import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+// import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const props = defineProps({
   isRemind: {
     type: Boolean,
@@ -78,11 +80,14 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 // 获取所有部门
-const deptList = ref<DeptTreeNode[]>([])
+const deptList = ref([])
 const getDeptList = async () => {
   getDeptTreeList().then((res) => {
-    deptList.value = res.data
+    deptList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
@@ -177,6 +182,7 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   searchQuery.staffNo = ''
@@ -184,6 +190,7 @@
   searchQuery.deptId = ''
   searchQuery.certificateStatus = ''
   searchQuery.verifierCertificateNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -212,10 +219,6 @@
     loading.close()
   })
 }
-// 打印
-const print = () => {
-
-}
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传图片
@@ -268,20 +271,24 @@
           <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+          <!-- <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
             <el-option
               v-for="item in deptList"
               :key="item.id"
               :label="item.name"
               :value="item.id"
             />
-          </el-select>
+          </el-select> -->
+          <com-tree-select
+            ref="selectTreeRef" v-model="searchQuery.deptId" :options="deptList"
+            placeholder="工作部门" :tree-props="deptProps"
+          />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况">
+          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况" clearable>
             <el-option
               v-for="item in certificateStatusList"
               :key="item.id"
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 4352604..5a5f036 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -389,10 +389,10 @@
           关闭
         </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">
-            <el-form-item prop="minioFileName" label-width="70px">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item prop="minioFileName">
               <el-upload
                 class="avatar-uploader"
                 :show-file-list="false"
@@ -423,23 +423,24 @@
               <el-date-picker
                 v-model="ruleForm.birthday" type="date" format="YYYY-MM" value-format="YYYY-MM"
                 placeholder="出生年月" :disabled="title === '详情'"
+                style="width: 100%;"
               />
             </el-form-item>
             <el-form-item label="工作部门" prop="deptId" class="marg-item">
-              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled>
+              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled style="width: 100%;">
                 <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="ruleForm.deptId" :options="PubListTree"
-                placeholder="选择组织机构" :tree-props="deptProps"
+                placeholder="选择组织机构" :tree-props="deptProps" style="width: 100%;"
               />
             </el-form-item>
             <el-form-item label="计量专业" prop="major" class="marg-item">
               <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
             </el-form-item>
             <el-form-item label="是否特操人" prop="specialOperator" class="marg-item">
-              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -449,23 +450,23 @@
               <el-input v-model.trim="ruleForm.staffNo" placeholder="系统自动生成" disabled />
             </el-form-item>
             <el-form-item label="性别" prop="sex" class="marg-item">
-              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="技术职务" prop="technologyJob" class="marg-item">
-              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="从事日期" prop="workDate" class="marg-item">
               <el-date-picker
                 v-model="ruleForm.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-                placeholder="请选择从事日期"
+                placeholder="请选择从事日期" style="width: 100%;"
               />
             </el-form-item>
-            <el-form-item label="是否技术考核" prop="technologyExam" class="marg-item">
-              <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'">
+            <el-form-item label="是否技术考核" prop="technologyExam" class="marg-item" style="width: 100%;">
+              <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -475,17 +476,17 @@
               <el-input ref="cardRef" v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" @blur="getBirthday" />
             </el-form-item>
             <el-form-item label="文化程度" prop="education" class="marg-item">
-              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="行政职务" prop="administrationJob" class="marg-item">
-              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="是否主考人" prop="mainExaminer" class="marg-item">
-              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index 042636e..660f2b0 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -264,7 +264,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="性别" prop="meterStaff.sex">
-              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -273,21 +273,21 @@
         <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-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -296,7 +296,7 @@
         <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-select v-if="title === '详情'" v-model="meterStaff.deptId" disabled style="width: 100%;">
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
               <com-tree-select
@@ -304,6 +304,7 @@
                 ref="selectTreeRef" v-model="meterStaff.deptId" :options="PubListTree"
                 placeholder="选择组织机构"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -316,7 +317,7 @@
             <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="请选择从事日期"
+                placeholder="请选择从事日期" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -347,7 +348,7 @@
             <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="请选择发证日期"
+                placeholder="请选择发证日期" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -355,7 +356,7 @@
             <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="请选择有效日期"
+                placeholder="请选择有效日期" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 178fc12..d0116f3 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -3,7 +3,7 @@
 import type { FormInstance, FormRules } from 'element-plus'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
+const formLabelWidth = '110px'
 const form = reactive({
   certificateNo: '', // 证书号
   certificateName: '', // 证书名称
@@ -71,32 +71,52 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`" width="40%">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
     >
-      <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
-        <el-input v-model="form.certificateNo" placeholder="证书号" />
-      </el-form-item>
-      <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
-        <el-input v-model="form.certificateName" placeholder="证书名称" />
-      </el-form-item>
-      <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
-        <el-input v-model="form.certificateCompany" placeholder="发证单位" />
-      </el-form-item>
-      <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
-        <el-date-picker
-          v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择发证日期"
-        />
-      </el-form-item>
-      <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-        <el-date-picker
-          v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择有效日期"
-        />
-      </el-form-item>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
+            <el-input v-model="form.certificateNo" placeholder="证书号" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
+            <el-input v-model="form.certificateName" placeholder="证书名称" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
+            <el-input v-model="form.certificateCompany" placeholder="发证单位" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
+            <el-date-picker
+              v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择发证日期" style="width: 100%;"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+            <el-date-picker
+              v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择有效日期" style="width: 100%;"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <template #footer>
       <span class="dialog-footer">
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
index 5e20d1b..10b0deb 100644
--- a/src/views/measure/person/components/personListDialog.vue
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -1,8 +1,11 @@
 <!-- 计量人员列表弹窗 -->
 <script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
 import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import { getDeptTreeList } from '@/api/system/dept'
-import type { TreeStructure } from '@/views/system/user/user-interface'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -10,7 +13,7 @@
   staffNo: '', // 人员编号
   name: '', // 姓名
   deptId: '', // 所在部门
-  limit: 5,
+  limit: 10,
   offset: 1,
 })
 const loadingTable = ref<boolean>(false)
@@ -32,20 +35,22 @@
   },
 ])
 // 获取部门
-const deptIdList = ref<TreeStructure[]>([])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const deptIdList = ref([])
 const getDeptList = () => {
   getDeptTreeList().then((res) => {
-    deptIdList.value = res.data
+    deptIdList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
 const fetchData = () => {
-  select.value = ''
+  select.value = -1
   getStaffList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.records
       total.value = Number(res.data.total)
-      console.log(list.value, 'list')
     }
   })
 }
@@ -53,6 +58,7 @@
 const search = () => {
   fetchData()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   listQuery.value = {
@@ -62,6 +68,7 @@
     limit: 10,
     offset: 1,
   }
+  selectTreeRef.value.clearSelected()
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -76,18 +83,24 @@
 }
 // 点击保存
 const submitForm = () => {
-  const person = list.value.filter((item, index) => index == select.value)[0]
-  console.log(person, 'person')
-  getStaffDetail(person).then((res) => {
-    if (res.code === 200) {
-      emits('add', res.data)
-      dialogFormVisible.value = false
-    }
-  })
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    getStaffDetail(person).then((res) => {
+      if (res.code === 200) {
+        emits('add', res.data)
+        dialogFormVisible.value = false
+        reset()
+      }
+    })
+  }
+  else {
+    ElMessage.warning('请先选择人员')
+  }
 }
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
+  reset()
 }
 // 初始化
 const initDialog = () => {
@@ -99,39 +112,45 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员" width="50%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable style="width: 150px;" />
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable style="width: 150px;" />
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
+        <!-- <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
           <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
+        </el-select> -->
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
-    <normal-table
-      :data="list" :total="total" :columns="columns" :query="listQuery"
-      :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>
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :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">
             {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
           </template>
         </el-table-column> -->
-      </template>
-    </normal-table>
+        </template>
+      </normal-table>
+    </div>
     <template #footer>
       <span class="dialog-footer">
         <el-button type="primary" @click="submitForm">确认</el-button>
diff --git a/src/views/measure/person/components/userListDialog.vue b/src/views/measure/person/components/userListDialog.vue
index dcd05b5..cd62a73 100644
--- a/src/views/measure/person/components/userListDialog.vue
+++ b/src/views/measure/person/components/userListDialog.vue
@@ -3,14 +3,16 @@
 import { ElMessage } from 'element-plus'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
-import type { TreeStructure } from '@/views/system/user/user-interface'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
 const listQuery = ref({
   keywords: '', // 姓名
   deptId: '', // 所在部门
-  limit: 5,
+  limit: 10,
   offset: 1,
 })
 const loadingTable = ref<boolean>(false)
@@ -31,11 +33,14 @@
     value: 'deptName',
   },
 ])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 // 获取部门
-const deptIdList = ref<TreeStructure[]>([])
+const deptIdList = ref([])
 const getDeptList = () => {
   getDeptTreeList().then((res) => {
-    deptIdList.value = res.data
+    deptIdList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
@@ -52,6 +57,7 @@
 const search = () => {
   fetchData()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   listQuery.value = {
@@ -60,6 +66,7 @@
     limit: 10,
     offset: 1,
   }
+  selectTreeRef.value.clearSelected()
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -74,11 +81,11 @@
 }
 // 点击保存
 const submitForm = () => {
-  console.log(select.value)
   if (select.value >= 0) {
     const person = list.value.filter((item, index) => index == select.value)[0]
     emits('add', person)
     dialogFormVisible.value = false
+    reset()
   }
   else {
     ElMessage.warning('请先选择人员')
@@ -87,9 +94,11 @@
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
+  reset()
 }
 // 初始化
 const initDialog = () => {
+  // reset()
   dialogFormVisible.value = true
   getDeptList()
   fetchData()
@@ -98,16 +107,20 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+  <el-dialog v-model="dialogFormVisible" title="选择人员" width="50%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
         <el-input v-model.trim="listQuery.keywords" placeholder="真实姓名" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable>
+        <!-- <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable>
           <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
+        </el-select> -->
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 9c6f65d..355473a 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -7,7 +7,9 @@
 // import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
-import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+// import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
@@ -16,7 +18,7 @@
   major: '', // 计量专业
   verifierCertificateNo: '', // 证书号
   certificateStatus: '', // 证书状态
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -52,10 +54,10 @@
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取所有部门
-const deptList = ref<DeptTreeNode[]>([])
+const deptList = ref([])
 const getDeptList = async () => {
   getDeptTreeList().then((res) => {
-    deptList.value = res.data
+    deptList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
@@ -126,6 +128,7 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   searchQuery.staffNo = ''
@@ -133,6 +136,7 @@
   searchQuery.deptId = ''
   searchQuery.major = ''
   searchQuery.verifierCertificateNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -160,10 +164,9 @@
     loading.close()
   })
 }
-// 打印
-const print = () => {
-
-}
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传图片
@@ -216,14 +219,18 @@
           <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+          <!-- <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
             <el-option
               v-for="item in deptList"
               :key="item.id"
               :label="item.name"
               :value="item.id"
             />
-          </el-select>
+          </el-select> -->
+          <com-tree-select
+            ref="selectTreeRef" v-model="searchQuery.deptId" :options="deptList"
+            placeholder="工作部门" :tree-props="deptProps"
+          />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.major" placeholder="计量专业" clearable class="w-50 m-2" />
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index af0a29d..2e0e7af 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -1,12 +1,15 @@
 <script lang="ts" setup name="ListSourceAdd">
-import { reactive, ref } from 'vue'
+/**
+ * 添加/编辑/详情溯源供方
+ */
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions, IformInline } from './list_interface'
+import type { IOptions, IformInline, traceSupplierPerson } from './list_interface'
 import { exportFile } from '@/utils/exportUtils'
 import { UploadFile } from '@/api/measure/file'
 import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+import { validatePhone } from '@/utils/validate'
 const props = defineProps({
   infoId: {
     type: String,
@@ -19,43 +22,45 @@
 })
 const emit = defineEmits(['close'])
 const formInline: Ref<IformInline> = ref({
-  businessContent: null,
-  supplierName: null,
-  supplierNo: null,
-  bankAccount: null,
-  bankAccountNumber: null,
-  bankName: null,
-  briefName: null,
-  businessScope: null,
-  companyAddress: null,
-  companyArea: null,
-  companyCity: null,
-  companyCountry: null,
-  companyProvince: null,
-  createTime: null,
-  director: null,
-  fax: null,
-  invoiceAddress: null,
-  invoiceArea: null,
-  invoiceCity: null,
-  invoiceCountry: null,
-  invoiceProvince: null,
-  mailbox: null,
-  minioFileName: null,
-  mobile: null,
-  phone: null,
-  postalCode: null,
-  remark: null,
-  taxNumber: null,
-  website: null,
+  id: '',
+  businessContent: '',
+  supplierName: '',
+  supplierNo: '',
+  bankAccount: '',
+  bankAccountNumber: '',
+  bankName: '',
+  briefName: '',
+  businessScope: '',
+  companyAddress: '',
+  companyArea: '',
+  companyCity: '',
+  companyCountry: '',
+  companyProvince: '',
+  createTime: '',
+  director: '',
+  fax: '',
+  invoiceAddress: '',
+  invoiceArea: '',
+  invoiceCity: '',
+  invoiceCountry: '',
+  invoiceProvince: '',
+  mailbox: '',
+  minioFileName: '',
+  mobile: '',
+  phone: '',
+  postalCode: '',
+  remark: '',
+  taxNumber: '',
+  website: '',
   traceSupplierPersonList: [],
 })
+const traceSupplierPersonList: Ref<traceSupplierPerson[]> = ref([])
 const columns = ref([
-  { text: '人员编号', value: 'personNo', show: true },
-  { text: '姓名', value: 'name', show: true },
-  { text: '工作部门', value: 'department', show: true },
-  { text: '职务', value: 'job', show: true },
-  { text: '联系方式', value: 'phone', show: true },
+  { text: '人员编号', value: 'personNo', required: false },
+  { text: '姓名', value: 'name', required: true },
+  { text: '工作部门', value: 'department', required: false },
+  { text: '职务', value: 'job', required: false },
+  { text: '联系方式', value: 'phone', required: true, reg: validatePhone },
 ])
 const ruleFormRef = ref<FormInstance>()
 const provinceList = ref<IOptions[]>([])
@@ -66,14 +71,17 @@
 const invoiceCityList = ref<IOptions[]>([])
 const areaInvoiceList = ref<IOptions[]>([])
 const dialogVisible = ref(false)
-const addPersonList = ref({
+// 人员对象
+const addPersonObj: traceSupplierPerson = {
+  id: '',
   personNo: '',
   name: '',
   department: '',
   job: '',
   phone: '',
-})
-const SelectionList = ref([])
+  editable: true,
+}
+const SelectionList: Ref<traceSupplierPerson[]> = ref([])
 const upload = ref<UploadInstance>()
 // 校验规则
 const rules = ref({
@@ -91,7 +99,7 @@
   })
 }
 // 表格选中
-const handleSelectionChange = (e: any) => {
+const handleSelectionChange = (e: traceSupplierPerson[]) => {
   SelectionList.value = e
 }
 // 获取公司地址省级
@@ -142,15 +150,33 @@
   })
 }
 // 点击增加行
-const addRoow = () => {
-  const object = {
-    personNo: '',
-    name: '',
-    department: '',
-    job: '',
-    phone: '',
+const addRow = () => {
+  // 检查上一行必填项
+  if (checkPersonList()) {
+    setAllRowReadable()
+    traceSupplierPersonList.value.push({ ...addPersonObj })
   }
-  formInline.value.traceSupplierPersonList.push(object)
+}
+// 检查人员列表
+function checkPersonList() {
+  for (let index = 0; index < traceSupplierPersonList.value.length; index++) {
+    const item = traceSupplierPersonList.value[index]
+    for (const prop of columns.value) {
+      // 检查必填
+      if (prop.required && !item[prop.value]) {
+        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
+        return false
+      }
+      // 验证正则
+      if (prop.reg && typeof prop.reg === 'function') {
+        if (!prop.reg(item[prop.value])) {
+          ElMessage.warning(`第${index + 1}行中${prop.text}输入不合法`)
+          return false
+        }
+      }
+    }
+  }
+  return true
 }
 // 点击关闭
 const handleClose = () => {
@@ -158,12 +184,12 @@
 }
 // 点击弹窗的完成追加到表格数组中
 const addPushList = () => {
-  formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonList.value)))
+  formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonObj.value)))
   handleClose()
 }
 // 删除行
 const deleteList = () => {
-  formInline.value.traceSupplierPersonList = formInline.value.traceSupplierPersonList.filter((item) => {
+  traceSupplierPersonList.value = traceSupplierPersonList.value.filter((item: traceSupplierPerson) => {
     return !SelectionList.value.includes(item)
   })
 }
@@ -261,10 +287,16 @@
     }
   })
 }
-// 双击表格显示输入框
-const dblclickName = (item: object) => {
-  console.log(item)
-  item.show = false
+// 双击行显示输入框
+const dblclickRow = (row: traceSupplierPerson) => {
+  setAllRowReadable()
+  row.editable = true
+}
+// 将所有人员信息列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of traceSupplierPersonList.value) {
+    item.editable = false
+  }
 }
 if (props.buttonType !== '新建') {
   getInfo()
@@ -273,7 +305,7 @@
 
 <template>
   <app-container>
-    <detail-page :title="`培训计划-${buttonType}`">
+    <detail-page :title="`溯源供方-${buttonType}`">
       <template #btns>
         <el-button
           type="primary"
@@ -617,39 +649,36 @@
       </el-form>
     </detail-page>
     <detail-block title="人员信息">
-      <template #btns>
-        <el-button
-          type="info"
-          :disabled="buttonType === '详情'"
-          @click="deleteList"
-        >
+      <template v-if="buttonType !== '详情'" #btns>
+        <el-button type="info" @click="deleteList">
           删除行
         </el-button>
-        <el-button
-          type="primary"
-          :disabled="buttonType === '详情'"
-          @click="addRoow"
-        >
+        <el-button type="primary" @click="addRow">
           增加行
         </el-button>
       </template>
       <el-table
-        :data="formInline.traceSupplierPersonList"
+        :data="traceSupplierPersonList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
+        @row-dblclick="dblclickRow"
       >
-        <el-table-column type="selection" width="55" />
+        <el-table-column type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column
           v-for="item in columns"
           :key="item.value"
           :prop="item.value"
           :label="item.text"
+          align="center"
         >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
           <template #default="scope">
-            <span v-show="item.show" style="color: gray;" @dblclick="dblclickName(item)">{{ scope.row[item.value] || `双击编辑${item.text}` }}</span>
-            <el-input v-show="!item.show" v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" @blur="item.show = true" />
+            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+            <el-input v-else v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index 530bcc4..c057976 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -24,6 +24,18 @@
   areaName: string
 }
 
+// 溯源供方人员
+export interface traceSupplierPerson {
+  id: number | string // id
+  job: string // 职务
+  department: string// 部门
+  name: string// 信命
+  personNo: string// 人员编号
+  phone: string// 联系方式
+  editable?: boolean // 是否可编辑
+  [key: string]: any
+}
+
 export interface IformInline {
   businessContent: string
   supplierName: string
@@ -55,5 +67,6 @@
   remark: string
   taxNumber: string
   website: string
-  traceSupplierPersonList: []
+  traceSupplierPersonList: traceSupplierPerson []
 }
+
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index e44001a..600eda1 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -32,11 +32,20 @@
   dialogVisible.value = true
   ruleForm.noticePublisher = userInfo.$state.name
   ruleForm.noticeCompany = userInfo.$state.deptName
-  ruleForm.noticeTime = dayjs().format('YYYY-MM-DD')
+  ruleForm.noticeTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
 }
 defineExpose({ initDialog })
+// 重置
+const resetDialog = () => {
+  ruleForm.noticeTime = ''
+  ruleForm.noticeSketch = ''
+  ruleForm.noticeContent = ''
+  ruleForm.minioFileName = ''
+  ruleForm.noticeTitle = ''
+}
 // 关闭弹窗
 const close = () => {
+  resetDialog()
   dialogVisible.value = false
   emits('resetData')
 }
@@ -63,6 +72,7 @@
 const resetForm = (formEl: FormInstance | undefined) => {
   // if (!formEl) { return }
   formEl?.resetFields()
+  resetDialog()
   dialogVisible.value = false
   emits('resetData')
 }
@@ -105,7 +115,7 @@
     uploadImage: {
       server: 'http://111.198.10.15:21409/minio/file/upload', // 配置图片上传地址
       maxFileSize: 2 * 1024 * 1024, // 10M  图片大小限制
-      fieldName: 'img', // 上传类型
+      fieldName: 'multipartFile', // 上传名字
       allowedFileTypes: [], // 选择文件时的类型限制，默认为 ['image/*'] 。如不想限制，则设置为 []
       // 自定义上传参数，传递图片时需要带一些参数过去写在这。参数会被添加到 formData 中，一起上传到服务端。
       // meta: {
@@ -154,9 +164,9 @@
     uploadVideo: {
       server: 'http://111.198.10.15:21409/minio/file/upload', // 配置视频上传地址
       maxFileSize: 5 * 1024 * 1024, // 5M  视频大小限制
-      fieldName: 'your-custom-name', // 上传类型
+      fieldName: 'multipartFile', // 上传名字
       // 最多可上传几个文件，默认为 5
-      maxNumberOfFiles: 3,
+      // maxNumberOfFiles: 1,
       allowedFileTypes: [], // 选择文件时的类型限制，默认为 ['video/*'] 。如不想限制，则设置为 []
       // 自定义上传参数，传递图片时需要带一些参数过去写在这。参数会被添加到 formData 中，一起上传到服务端。
       // meta: {
@@ -167,8 +177,8 @@
       //     Accept: 'text/x-json',
       //     otherKey: 'xxx'
       // },
-      metaWithUrl: false, // 将 meta 拼接到 url 参数中，默认 false
-      withCredentials: true, // 跨域是否传递 cookie ，默认为 false
+      // metaWithUrl: false, // 将 meta 拼接到 url 参数中，默认 false
+      // withCredentials: true, // 跨域是否传递 cookie ，默认为 false
       // 上传之前触发
       onBeforeUpload(file: any) {
         // file 选中的文件，格式如 { key: file }
@@ -222,9 +232,6 @@
     editorRef.value = editor // 一定要用 Object.seal() ，否则会报错
   })
 }
-const look = () => {
-  console.log(ruleForm.noticeContent)
-}
 const minioFileUrl = ref('')
 watch(() => ruleForm.minioFileName, (newVal) => {
   if (newVal) {
@@ -278,7 +285,7 @@
           />
           <editor
             v-model="ruleForm.noticeContent"
-            style="height: 150px; overflow-y: hidden;"
+            style="height: 300px; overflow-y: hidden;"
             :default-config="editorConfig"
             mode="default"
             @onCreated="onCreated"
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index 0926957..a4cdd5e 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -16,7 +16,7 @@
   noticePublisher: '', // 发布人
   noticeTime: '', // 发布时间
   noticeTitle: '', // 标题
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -27,6 +27,7 @@
     text: '编号',
     value: 'noticeNo',
     align: 'center',
+    width: '180',
   },
   {
     text: '标题',
@@ -37,6 +38,7 @@
     text: '发布人',
     value: 'noticePublisher',
     align: 'center',
+    width: '150',
   },
   {
     text: '内容描述',
@@ -47,11 +49,15 @@
     text: '发布时间',
     value: 'noticeTime',
     align: 'center',
+    width: '200',
   },
 ] // 表格
 const list = ref([]) // 表格数据
 // 获取通知公告列表
 const getNoticeList = () => {
+  if (!searchQuery.noticeTime) {
+    searchQuery.noticeTime = ''
+  }
   getNoticeeApi(searchQuery).then((res) => {
     total.value = res.data.total
     list.value = res.data.rows
diff --git a/src/views/system/notice/noticeDetail.vue b/src/views/system/notice/noticeDetail.vue
index 94468d4..da36bd8 100644
--- a/src/views/system/notice/noticeDetail.vue
+++ b/src/views/system/notice/noticeDetail.vue
@@ -1,5 +1,6 @@
 <!-- 通知公告详情弹窗 -->
 <script lang="ts" setup name="noticeDetail">
+import { Editor } from '@wangeditor/editor-for-vue'
 import type { noticeType } from './notice-interface'
 import { getNoticeDetail } from '@/api/system/notice'
 import { getPhotoUrl } from '@/api/system/tool'
@@ -52,6 +53,18 @@
     })
   }
 })
+// 编辑器配置
+const editorConfig = ref({
+  readOnly: true,
+})
+// 富文本实例对象
+const editorRef = shallowRef()
+const onCreated = (editor: any) => {
+  editorRef.value = editor
+  nextTick(() => {
+    editorRef.value = editor // 一定要用 Object.seal() ，否则会报错
+  })
+}
 </script>
 
 <template>
@@ -89,7 +102,18 @@
       </el-form-item>
       <el-form-item label="发布内容" prop="noticeContent">
         <!-- <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" disabled /> -->
-        <div style="border: 1px solid #dcdfe6;width: 100%;border-radius: 4px;padding: 12px;" v-html="ruleForm.noticeContent" />
+        <!-- <div style="border: 1px solid #dcdfe6;width: 100%;border-radius: 4px;padding: 12px;" v-html="ruleForm.noticeContent" ></div> -->
+        <div style="border: 1px solid #dcdfe6;width: 100%;border-radius: 4px;">
+          <editor
+            ref="editorRef"
+            v-model="ruleForm.noticeContent"
+            style="height: 300px; overflow-y: hidden;"
+            :default-config="editorConfig"
+            mode="default"
+            :disabled="true"
+            @onCreated="onCreated"
+          />
+        </div>
       </el-form-item>
       <el-form-item label="查看附件">
         <el-link v-if="ruleForm.minioFileName" :href="minioFileUrl" type="primary" target="_blank">
diff --git a/src/views/system/tool/autograph/addDDialog.vue b/src/views/system/tool/autograph/addDDialog.vue
index e39b706..daadd9b 100644
--- a/src/views/system/tool/autograph/addDDialog.vue
+++ b/src/views/system/tool/autograph/addDDialog.vue
@@ -186,7 +186,7 @@
         <el-input v-model.trim="ruleForm.signDesc" placeholder="签名描述" :disabled="title === '详情'" />
       </el-form-item>
       <el-form-item label="可使用人" prop="userIdList">
-        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'">
+        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'" style="width: 100%;">
           <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </el-form-item>
@@ -198,7 +198,7 @@
         <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px', 'margin-top': ruleForm.minioFileName === '' ? '0px' : '56px' }" @click="upload">
           {{ ruleForm.minioFileName === '' ? '上传' : '更换图片' }}
         </el-button>
-        <input v-show="title === '123'" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <input v-show="title === '123'" ref="fileRef" type="file" accept="image/*" @change="onFileChange">
       </el-form-item>
     </el-form>
     <template #footer>
diff --git a/src/views/system/tool/autograph/autograph.vue b/src/views/system/tool/autograph/autograph.vue
index ac9f000..d3c6f81 100644
--- a/src/views/system/tool/autograph/autograph.vue
+++ b/src/views/system/tool/autograph/autograph.vue
@@ -15,7 +15,7 @@
   signName: '', // 名称
   signDirector: '', // 负责人
   createTime: '', // 创建时间
-  limit: 10,
+  limit: 20,
   offset: 1,
   signType: '',
 }) // 查询参数
@@ -38,6 +38,9 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.createTime) {
+    searchQuery.createTime = ''
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -168,10 +171,10 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model="searchQuery.signNo" placeholder="签章编号" clearable class="w-50 m-2 normal-input" />
+        <el-input v-model="searchQuery.signNo" placeholder="签名编号" clearable class="w-50 m-2 normal-input" />
       </search-item>
       <search-item>
-        <el-input v-model="searchQuery.signName" placeholder="签章名称" clearable class="w-50 m-2 normal-input" />
+        <el-input v-model="searchQuery.signName" placeholder="签名名称" clearable class="w-50 m-2 normal-input" />
       </search-item>
       <search-item>
         <el-input v-model="searchQuery.signDirector" placeholder="负责人" clearable class="w-50 m-2 normal-input" />
diff --git a/src/views/system/tool/certificate/addDDialog.vue b/src/views/system/tool/certificate/addDDialog.vue
index 2721bf8..0fdec28 100644
--- a/src/views/system/tool/certificate/addDDialog.vue
+++ b/src/views/system/tool/certificate/addDDialog.vue
@@ -185,7 +185,7 @@
         <el-input v-model.trim="ruleForm.templateDesc" placeholder="模板描述" :disabled="title === '详情'" />
       </el-form-item>
       <el-form-item label="可使用人" prop="userIdList">
-        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'">
+        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'" style="width: 100%;">
           <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </el-form-item>
diff --git a/src/views/system/tool/certificate/certificate.vue b/src/views/system/tool/certificate/certificate.vue
index 9787116..a2468de 100644
--- a/src/views/system/tool/certificate/certificate.vue
+++ b/src/views/system/tool/certificate/certificate.vue
@@ -15,7 +15,7 @@
   templateName: '', // 名称
   templateCreator: '', // 负责人
   createTime: '', // 创建时间
-  limit: 10,
+  limit: 20,
   offset: 1,
   templateType: '',
 }) // 查询参数
@@ -38,6 +38,9 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.createTime) {
+    searchQuery.createTime = ''
+  }
   templatePage(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
diff --git a/src/views/system/tool/document/addDDialog.vue b/src/views/system/tool/document/addDDialog.vue
index c440d1d..d5d28d8 100644
--- a/src/views/system/tool/document/addDDialog.vue
+++ b/src/views/system/tool/document/addDDialog.vue
@@ -186,7 +186,7 @@
         <el-input v-model.trim="ruleForm.templateDesc" placeholder="模板描述" :disabled="title === '详情'" />
       </el-form-item>
       <el-form-item label="可使用人" prop="userIdList">
-        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'">
+        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'" style="width: 100%;">
           <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </el-form-item>
diff --git a/src/views/system/tool/document/document.vue b/src/views/system/tool/document/document.vue
index 774e498..ac857ea 100644
--- a/src/views/system/tool/document/document.vue
+++ b/src/views/system/tool/document/document.vue
@@ -14,7 +14,7 @@
   templateName: '', // 名称
   templateCreator: '', // 负责人
   createTime: '', // 创建时间
-  limit: 10,
+  limit: 20,
   offset: 1,
   templateType: '',
 }) // 查询参数
@@ -37,6 +37,9 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.createTime) {
+    searchQuery.createTime = ''
+  }
   templatePage(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
diff --git a/src/views/system/tool/signature/addDDialog.vue b/src/views/system/tool/signature/addDDialog.vue
index 509509c..bb4c177 100644
--- a/src/views/system/tool/signature/addDDialog.vue
+++ b/src/views/system/tool/signature/addDDialog.vue
@@ -185,7 +185,7 @@
         <el-input v-model.trim="ruleForm.signDesc" placeholder="签章描述" :disabled="title === '详情'" />
       </el-form-item>
       <el-form-item label="可使用人" prop="userIdList">
-        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'">
+        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'" style="width: 100%;">
           <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </el-form-item>
diff --git a/src/views/system/tool/signature/signature.vue b/src/views/system/tool/signature/signature.vue
index 4eb6d70..f44f661 100644
--- a/src/views/system/tool/signature/signature.vue
+++ b/src/views/system/tool/signature/signature.vue
@@ -15,7 +15,7 @@
   signName: '', // 名称
   signDirector: '', // 负责人
   createTime: '', // 创建时间
-  limit: 10,
+  limit: 20,
   offset: 1,
   signType: '',
 }) // 查询参数
@@ -38,6 +38,9 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.createTime) {
+    searchQuery.createTime = ''
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
diff --git a/src/views/system/user/listUser.vue b/src/views/system/user/listUser.vue
index 1387821..a4d6816 100644
--- a/src/views/system/user/listUser.vue
+++ b/src/views/system/user/listUser.vue
@@ -236,13 +236,13 @@
           </search-item>
           <search-item>
             <el-date-picker
-              v-model="listQuery.beginTime" type="datetime" format="YYYY-MM-DD HH:mm:ss"
+              v-model="listQuery.beginTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
               placeholder="选择开始时间"
             />
           </search-item>
           <search-item>
             <el-date-picker
-              v-model="listQuery.endTime" type="datetime" format="YYYY-MM-DD HH:mm:ss"
+              v-model="listQuery.endTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
               placeholder="选择结束时间"
             />
           </search-item>
diff --git a/src/views/system/user/roleAssignment.vue b/src/views/system/user/roleAssignment.vue
index 4b09678..be67b63 100644
--- a/src/views/system/user/roleAssignment.vue
+++ b/src/views/system/user/roleAssignment.vue
@@ -88,7 +88,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="titleText" width="330px" append-to-body>
+  <el-dialog v-model="dialogFormVisible" :title="titleText" width="30%" append-to-body>
     <el-scrollbar>
       <el-tree
         ref="treeRef" v-loading="loading" :props="defaultProps" :data="roleTreeList"

diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index bb58885..2959118 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -53,3 +53,64 @@
   }
   return true
 }
+
+/**
+ * 验证小写字母
+ * @param str
+ * @returns
+ */
+export function validateLowerCase(str: string) {
+  const reg = /^[a-z]+$/
+  return reg.test(str)
+}
+
+/* 验证大写字母 */
+export function validateUpperCase(str: string) {
+  const reg = /^[A-Z]+$/
+  return reg.test(str)
+}
+
+/* 验证大小写字母 */
+export function validateAlphabets(str: string) {
+  const reg = /^[A-Za-z]+$/
+  return reg.test(str)
+}
+
+/**
+ * 验证邮箱
+ * @param email
+ * @returns {boolean}
+ */
+export function validateEmail(email: string) {
+  const re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
+  return re.test(email)
+}
+
+/**
+ * 验证手机号
+ * @param phone
+ * @returns {boolean}
+ */
+export function validateMobile(phone: string) {
+  const re = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/
+  return re.test(phone)
+}
+
+/**
+ * 校验身份证号
+ * @param value
+ * @returns
+ */
+export function validateIdCardNo(value: string) {
+  const re = /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/
+  return re.test(value)
+}
+/**
+ *
+ * @param value 验证电话号码
+ * @returns
+ */
+export function validatePhone(value: string) {
+  const re = /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/
+  return re.test(value)
+}
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 1c2405e..bca0958 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,13 +1,46 @@
-<script lang="ts" setup name="borrowHandle">
-// 逻辑代码
+<!-- 设备借用处理 -->
+<script lang="ts" setup name="borrowApply">
+import list from './components/handleList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '待借用', comp: list },
+  { name: '已借用', comp: list },
+  { name: '已归还', comp: list },
+])
+const current = ref('待借用')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用处理
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 03d414b..c5771f7 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,13 +1,50 @@
+<!-- 设备借用申请 -->
 <script lang="ts" setup name="borrowApply">
-// 逻辑代码
+import list from './components/applyList.vue'
+export interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '全部', comp: list },
+  { name: '草稿箱', comp: list },
+  { name: '待审批', comp: list },
+  { name: '审批中', comp: list },
+  { name: '已通过', comp: list },
+  { name: '未通过', comp: list },
+  { name: '已取消', comp: list },
+])
+const current = ref('全部')
+const currentComp = shallowRef(list)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
 </script>
 
 <template>
-  <app-container>
-    设备借用申请
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <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>
+    <!-- 展示区域 -->
+    <component :is="currentComp" :name="current" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
-// 样式
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 67px;
+    right: 15px;
+    z-index: 999;
+  }
+}
 </style>
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
new file mode 100644
index 0000000..052f3ce
--- /dev/null
+++ b/src/views/device/borrow/components/applyList.vue
@@ -0,0 +1,328 @@
+<script lang="ts" setup name="borrowApplyList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '文件号',
+    value: 'fileNo',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '类别',
+    value: 'catergory',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '创建时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      fileNo: '1234',
+      catergory: '测量设备',
+      user: '李四',
+      time: '2020-12-14 00:00:00',
+      status: '未通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const approveRef = ref()
+// 同意
+const agree = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '1',
+  })
+}
+// 驳回
+const reject = (row: any) => {
+  approveRef.value.initDialog({
+    radio: '3',
+  })
+}
+// 拒绝
+const refuse = (row: any) => {
+  approveRef.value.initDialog(
+    {
+      radio: '2',
+    },
+  )
+}
+// 取消
+const cancel = (rowrow: any) => {
+  ElMessageBox.confirm(
+    '确认取消吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" @click="addBtn" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="agree(row)">
+                  同意
+                </el-button>
+                <el-button size="small" type="primary" link @click="reject(row)">
+                  驳回
+                </el-button>
+                <el-button size="small" type="primary" link @click="refuse(row)">
+                  拒绝
+                </el-button>
+                <el-button size="small" type="primary" link @click="cancel(row)">
+                  取消
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/components/approvalActionDialog.vue b/src/views/device/borrow/components/approvalActionDialog.vue
new file mode 100644
index 0000000..214876c
--- /dev/null
+++ b/src/views/device/borrow/components/approvalActionDialog.vue
@@ -0,0 +1,104 @@
+<!-- 审批操作弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+const emits = defineEmits(['resetData'])
+const userInfo = useUserStore()
+const dialogVisibleApprove = ref(false)
+const form = reactive({
+  radio: '1',
+})
+const ruleFormRef = ref<FormInstance>()
+const rules = reactive<FormRules>({
+})
+// 重置
+const resetData = () => {
+  form.certificateNo = ''
+  form.certificateName = ''
+  form.certificateCompany = ''
+  form.certificateDate = ''
+  form.validDate = ''
+}
+const approvetime = ref('') // 审批时间
+const initDialog = (row: any) => {
+  dialogVisibleApprove.value = true
+  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  form.radio = row.radio
+}
+defineExpose({ initDialog })
+
+// 点击保存
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      dialogVisibleApprove.value = false
+      emits('resetData')
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  formEl.resetFields()
+  dialogVisibleApprove.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
+    <el-form
+      ref="ruleFormRef" :model="form"
+      :rules="rules" label-width="110px"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人">
+            <el-input disabled :value="userInfo.$state.name" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间">
+            <el-input disabled :value="approvetime" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
+        <el-button @click="resetForm(ruleFormRef)">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
new file mode 100644
index 0000000..cfda00a
--- /dev/null
+++ b/src/views/device/borrow/components/handleList.vue
@@ -0,0 +1,281 @@
+<script lang="ts" setup name="borrowHandleList">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import approveAction from './approvalActionDialog.vue'
+import add from '@/views/device/stateManage/components/templateAdd.vue'
+const { proxy } = getCurrentInstance() as any
+const searchQuery = reactive({
+  limit: 10,
+  offset: 1,
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  {
+    text: '申请编号',
+    value: 'no',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请名称',
+    value: 'name',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'dept',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'user',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'time',
+    width: '200',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'status',
+    align: 'center',
+  },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '固定资产', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取数据列表
+const getList = () => {
+  // loadingTable.value = true
+  // listPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      name: 'test1',
+      no: '1234',
+      dept: '顶级',
+      user: '张三',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+    {
+      name: 'test2',
+      no: '1234',
+      dept: '徐州分中心',
+      user: '里斯',
+      time: '2020-12-12 00:00:00',
+      status: '已通过',
+    },
+  ] as any
+  total.value = 2
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+// 详情
+const detail = (row) => {
+  console.log(row, 'row')
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '详情',
+    ...row,
+  })
+}
+// 编辑
+const update = (row) => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    `确认删除${row.equipmentName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // assetsDeleteApi({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     getList()
+      //   }
+      // })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const reset = () => {
+  // searchQuery.equipmentCategory = ''
+  getList()
+}
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+const borrow = () => {
+
+}
+// 新增
+const addBtn = () => {
+  dialogVisible.value = true
+  addRef.value.initDialog({
+    title: '新建',
+  })
+}
+// 导出
+const exportExcelBtn = () => {
+  // const loading = ElLoading.service({
+  //   lock: true,
+  //   text: 'Loading',
+  //   background: 'rgba(255, 255, 255, 0.8)',
+  // })
+
+  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  //   exportFile(res.data, '固定资产列表')
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+}
+const refreshDta = () => {
+  getList()
+  dialogVisible.value = false
+}
+onMounted(() => {
+  getList()
+  // 获取设备类别
+  // getDictByCode('equipmentCategory').then((response) => {
+  //   equipmentCategoryList.value = response.data
+  // })
+})
+</script>
+
+<template>
+  <div>
+    <!-- 添加/编辑/查看 -->
+    <add v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <app-container v-show="!dialogVisible">
+      <!-- 审批操作 -->
+      <approve-action ref="approveRef" />
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+        </search-item>
+        <search-item>
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+        </search-item>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <icon-button icon="icon-device" title="标签识别" @click="identify" />
+          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" />
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :is-showmulti-select="true"
+          :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">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="300" fixed="right">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="borrow(row)">
+                  借用
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/standingBook/components/addRow.vue b/src/views/device/standingBook/components/addRow.vue
index 1678cdb..07b03d1 100644
--- a/src/views/device/standingBook/components/addRow.vue
+++ b/src/views/device/standingBook/components/addRow.vue
@@ -5,7 +5,7 @@
 import { getDictByCode } from '@/api/system/dict'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
+const formLabelWidth = '110px'
 const form = ref({})
 const formTable = ref([
   {
@@ -91,108 +91,188 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`">
+  <el-dialog v-model="dialogFormVisible" :title="`${name}-${title}`" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
     >
       <div v-if="name === '周检记录'">
-        <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录表编号" />
-        </el-form-item>
-        <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="记录人" />
-        </el-form-item>
-        <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="检定日期"
-          />
-        </el-form-item>
-        <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="有效日期"
-          />
-        </el-form-item>
-        <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="送检人" />
-        </el-form-item>
-        <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录表编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录表编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="记录人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="记录人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="检定日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="检定日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="有效日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="送检人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="送检人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="计量确认结论" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="计量确认结论" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '状态变更记录'">
-        <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="状态类型" clearable>
-            <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="结束日期"
-          />
-        </el-form-item>
-        <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="申请人" />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="状态类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="状态类型" clearable style="width: 100%;">
+                <el-option v-for="item in managerStateList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="申请人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="申请人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '使用记录'">
-        <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用人" />
-        </el-form-item>
-        <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="使用部门" />
-        </el-form-item>
-        <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="使用类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用开始日期"
-          />
-        </el-form-item>
-        <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="使用结束日期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用人" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用部门" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="使用部门" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="使用类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用开始日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用开始日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="使用结束日期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="使用结束日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
       <div v-if="name === '检定证书'">
-        <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="证书名称" />
-        </el-form-item>
-        <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
-          <el-select v-model="form.certificateNo" placeholder="证书类型" clearable>
-            <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书出具日期"
-          />
-        </el-form-item>
-        <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
-          <el-date-picker
-            v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="证书有效期"
-          />
-        </el-form-item>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书编号" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateNo">
+              <el-input v-model="form.certificateNo" placeholder="证书名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书类型" :label-width="formLabelWidth" prop="certificateNo">
+              <el-select v-model="form.certificateNo" placeholder="证书类型" clearable style="width: 100%;">
+                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书出具日期" :label-width="formLabelWidth" prop="certificateNo">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书出具日期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="18">
+            <el-form-item label="证书有效期" :label-width="formLabelWidth" prop="validDate">
+              <el-date-picker
+                v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="证书有效期" style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
     </el-form>
     <template #footer>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 5f7b347..9a9f798 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -352,7 +352,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -376,7 +376,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -391,7 +391,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -404,14 +404,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -434,7 +434,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -443,20 +443,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -480,23 +480,23 @@
               <com-tree-select
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -507,10 +507,10 @@
             <el-form-item label="检定部门" prop="mesureDept">
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
-                :tree-props="deptProps"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
+                :tree-props="deptProps" style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -520,7 +520,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -529,13 +529,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -544,21 +544,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -578,14 +578,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -594,14 +594,14 @@
         <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-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -669,7 +669,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/fixedAssetsAdd.vue b/src/views/device/standingBook/components/fixedAssetsAdd.vue
index fc3fd54..d9d4514 100644
--- a/src/views/device/standingBook/components/fixedAssetsAdd.vue
+++ b/src/views/device/standingBook/components/fixedAssetsAdd.vue
@@ -199,6 +199,8 @@
     useDeptList.value = toTreeList(res.data, '0', true)
   })
 }
+const selectTreeRef1 = ref()
+const selectTreeRef2 = ref()
 // 重置
 const resetDATA = () => {
   ruleForm.value = {
@@ -254,6 +256,10 @@
     isStandardSupportEquipment: '', //		是否标准配套设备
     id: '',
   }
+  if (title.value !== '详情') {
+    selectTreeRef1.value.clearSelected()
+    selectTreeRef2.value.clearSelected()
+  }
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
@@ -378,7 +384,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="资产类型" prop="assetType">
-              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.assetType" :placeholder="title === '详情' ? '' : '资产类型'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in assetTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -402,7 +408,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="厂家国别" prop="manufacturerCountry">
-              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.manufacturerCountry" :placeholder="title === '详情' ? '' : '厂家国别'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -416,8 +422,7 @@
             <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"
+                :placeholder="title === '详情' ? '' : '出厂年月'" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -430,14 +435,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="管理状态" prop="managerState">
-              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable>
+              <el-select v-model="ruleForm.managerState" :placeholder="title === '详情' ? '' : '管理状态'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <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-select v-model="ruleForm.abc" :placeholder="title === '详情' ? '' : 'ABC'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in ABCList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -460,7 +465,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -469,20 +474,20 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureType" :placeholder="title === '详情' ? '' : '检定方式'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.mesureCycle" :placeholder="title === '详情' ? '' : '检定周期'" :disabled="title === '详情'" clearable style="width: 100%;">
                 <el-option v-for="item in mesureCycleList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -505,24 +510,26 @@
             <el-form-item label="使用部门" prop="useDept">
               <com-tree-select
                 v-if="title !== '详情'"
+                ref="selectTreeRef2"
                 v-model="ruleForm.useDept" :options="useDeptList as any" placeholder="使用部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="''" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '使用人'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.majorCategory" :placeholder="title === '详情' ? '' : '专业分类'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in majorCategoryList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -536,10 +543,12 @@
               </el-select> -->
               <com-tree-select
                 v-if="title !== '详情'"
-                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="使用部门"
+                ref="selectTreeRef1"
+                v-model="ruleForm.mesureDept" :options="useDeptList as any" placeholder="检定部门"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" placeholder="" :disabled="title === '详情'">
+              <el-select v-else v-model="ruleForm.useDept" placeholder=" " :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in useDeptList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -549,7 +558,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -558,13 +567,13 @@
               <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"
+                style="width: 100%;"
               />
             </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-select v-model="ruleForm.mesureResult" :placeholder="title === '详情' ? '' : '检定结果'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in mesureResultList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -573,21 +582,21 @@
         <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-select v-model="ruleForm.isCalibrationTestEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isMeasureAccount" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.isStandardSupportEquipment" :placeholder="title === '详情' ? '' : '是/否'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in isWhether" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -607,14 +616,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备类别" prop="equipmentCategory">
-              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.equipmentCategory" :placeholder="title === '详情' ? '' : '设备类别'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.equipmentType" :placeholder="title === '详情' ? '' : '设备类型'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -624,14 +633,14 @@
           <el-col :span="6">
             <el-form-item label="资本来源" prop="capitalSource">
               <!-- <el-input v-model.trim="ruleForm.capitalSource" placeholder="资本来源" :disabled="title === '详情'" /> -->
-              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.capitalSource" :placeholder="title === '详情' ? '' : '资本来源'" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="ruleForm.managerLevel" :placeholder="title === '详情' ? '' : '管理级别'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in managerLevelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -699,7 +708,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="折旧方法" prop="depreciationMethod">
-              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.depreciationMethod" placeholder="折旧方法" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in depreciationMethodList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index f653095..f4229a6 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -147,19 +147,17 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
-  setTimeout(() => {
-    list.value = [
-      {
-        equipmentNo: 123,
-        equipmentName: 'test',
-        modelNo: '001',
-        usePersonName: '张三',
-        validDate: '2022-12-12 00:00:00',
-        useDeptName: '顶级',
-      },
-    ]
-    total.value = 1
-  }, 1000)
+  list.value = [
+    {
+      equipmentNo: 123,
+      equipmentName: 'test',
+      modelNo: '001',
+      usePersonName: '张三',
+      validDate: '2022-12-12 00:00:00',
+      useDeptName: '顶级',
+    },
+  ] as any
+  total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -220,9 +218,11 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -300,13 +300,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.mesureType" class="m-2 normal-select" placeholder="检定方式" clearable>
+          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable>
             <el-option
               v-for="item in mesureTypeList"
               :key="item.id"
@@ -316,7 +316,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.managerState" class="m-2 normal-select" placeholder="管理状态" clearable>
+          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable>
             <el-option
               v-for="item in managerStateList"
               :key="item.id"
@@ -327,8 +327,9 @@
         </search-item>
         <search-item>
           <com-tree-select
+            ref="selectTreeRef"
             v-model="searchQuery.useDept" :options="useDeptList" placeholder="使用部门"
-            :tree-props="deptProps" style="width: 150px;"
+            :tree-props="deptProps"
           />
         </search-item>
         <search-item>
@@ -336,11 +337,10 @@
             v-model="searchQuery.validDate" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="有效日期"
             class="normal-date"
-            style="width: 150px;"
           />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.abc" class="m-2 normal-select" placeholder="ABC" clearable>
+          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable>
             <el-option
               v-for="item in abcList"
               :key="item.id"
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 78a3800..4c31a94 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -2,9 +2,10 @@
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import addDialog from './components/fixedAssetsAdd.vue'
-import type { fixedAssetsType } from './standingBook-interface'
+import type { fixedAssetsType, selectType } from './standingBook-interface'
 import { exportFile } from '@/utils/exportUtils'
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
+import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   assetNo: '', // 固定编号
@@ -50,7 +51,7 @@
   },
   {
     text: '设备类型',
-    value: 'assetTypeName',
+    value: 'equipmentTypeName',
     width: '150',
     align: 'center',
   },
@@ -102,6 +103,7 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+const equipmentCategoryList = ref<selectType[]>([]) // 设备类别
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
@@ -242,6 +244,10 @@
 }
 onMounted(() => {
   getList()
+  // 获取设备类别
+  getDictByCode('equipmentCategory').then((response) => {
+    equipmentCategoryList.value = response.data
+  })
 })
 </script>
 
@@ -265,7 +271,10 @@
           <el-input v-model="searchQuery.equipmentSpecifications" placeholder="设备规格" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
+          <el-select v-model="searchQuery.equipmentCategory" placeholder="设备类别" clearable>
+            <el-option v-for="item in equipmentCategoryList" :key="item.id" :label="item.name" :value="item.value" />
+          </el-select>
         </search-item>
       </search-area>
       <table-container>
diff --git a/src/views/device/stateManage/components/addRow.vue b/src/views/device/stateManage/components/addRow.vue
new file mode 100644
index 0000000..3ba82d6
--- /dev/null
+++ b/src/views/device/stateManage/components/addRow.vue
@@ -0,0 +1,160 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { listPageApi } from '@/api/device/standingBook'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  limit: 10,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '出厂编号',
+    value: 'manufacturingNo',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+  },
+])
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listPageApi(listQuery.value as any).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map(item => ({ ...item, checked: '' }))
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    equipmentName: '', // 姓名
+    equipmentNo: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  const checkedArr = list.value.filter(item => item.checked !== '')
+  if (checkedArr.length) {
+    console.log(checkedArr, '选中的设备')
+    emits('add', checkedArr)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择设备')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns as any" :query="listQuery"
+        :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-checkbox v-model="scope.row.checked" :label="scope.$index" size="large" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-checkbox__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/stateManage/components/approvalActionDialog.vue b/src/views/device/stateManage/components/approvalActionDialog.vue
index 56417d6..214876c 100644
--- a/src/views/device/stateManage/components/approvalActionDialog.vue
+++ b/src/views/device/stateManage/components/approvalActionDialog.vue
@@ -47,38 +47,45 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="30%">
+  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
     <el-form
       ref="ruleFormRef" :model="form"
-      :rules="rules"
+      :rules="rules" label-width="110px"
     >
-      <el-form-item label="审批意见">
-        <!-- <el-input v-model="form.certificateNo" placeholder="证书号" /> -->
-        <el-radio-group v-model="form.radio">
-          <el-radio label="1">
-            同意
-          </el-radio>
-          <el-radio label="2">
-            拒绝
-          </el-radio>
-          <el-radio label="3">
-            驳回
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="审批结论">
-        <el-input
-          :rows="4"
-          type="textarea"
-        />
-      </el-form-item>
       <el-row :gutter="24">
-        <el-col :span="10">
+        <el-col :span="24">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="form.radio" style="width: 100%;">
+              <el-radio label="1">
+                同意
+              </el-radio>
+              <el-radio label="2">
+                拒绝
+              </el-radio>
+              <el-radio label="3">
+                驳回
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论">
+            <el-input
+              :rows="4"
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="审批人">
             <el-input disabled :value="userInfo.$state.name" />
           </el-form-item>
         </el-col>
-        <el-col :span="14">
+        <el-col :span="12">
           <el-form-item label="审批时间">
             <el-input disabled :value="approvetime" />
           </el-form-item>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index e74d70e..2003e31 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -1,7 +1,8 @@
 <!-- 新增或详情弹窗 -->
-<script lang="ts" setup name="addNotice">
+<script lang="ts" setup name="add">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
+import addRow from './addRow.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
@@ -16,6 +17,7 @@
 const dialogVisible = ref<boolean>(true)
 const title = ref('')
 const name = ref('')
+const borrowList = ref([])
 const ruleForm = ref({
   assetNo: '', // 资产编号
   assetType: '', // 资产类型
@@ -357,10 +359,86 @@
     isShowCalibration.value = true
   }
 })
+const columns = ref([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerLevelName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+  },
+])
+const addRowRef = ref()
+// 添加行
+const addRowBtn = () => {
+  addRowRef.value.initDialog({ title: '添加' })
+}
+// 删除行
+const removeRowBtn = () => {
+  const removeArr = borrowList.value.filter(item => item.remove !== '')
+  if (removeArr.length) {
+    ElMessageBox.confirm(
+      '确认删除选中的数据吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      borrowList.value = borrowList.value.filter(item => item.remove === '')
+      ElMessage.success('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 借用设备列表添加
+const addRowMethods = (row) => {
+  row.forEach((element) => {
+    borrowList.value.push({ ...element, remove: '' })
+  })
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="addRowMethods" />
     <detail-page :title="`${name}-${title}`">
       <template #btns>
         <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef, '提交')">
@@ -378,15 +456,16 @@
                 v-if="title !== '详情'"
                 v-model="ruleForm.useDept" :options="useDeptList as any" :placeholder="title === '详情' ? '' : '申请单位'"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
-              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder="">
+              <el-select v-else v-model="ruleForm.useDept" :disabled="title === '详情'" placeholder=" " style="width: 100%;">
                 <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-select v-model="ruleForm.usePerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -430,7 +509,7 @@
               <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"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -454,28 +533,56 @@
         </el-row>
       </el-form>
     </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>
+    <div>
+      <detail-block title="借用设备列表">
+        <template #btns>
+          <el-button type="primary" @click="addRowBtn">
+            添加行
+          </el-button>
+          <el-button type="info" @click="removeRowBtn">
+            删除行
+          </el-button>
+        </template>
+        <normal-table
+          :data="borrowList" :total="1" :columns="columns as any"
+        >
+          <template #preColumns>
+            <el-table-column label="选择" width="55" align="center">
+              <template #default="scope">
+                <el-checkbox v-model="scope.row.remove" :label="scope.$index" size="large" />
+              </template>
+            </el-table-column>
+            <el-table-column label="序号" width="60" align="center">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </detail-block>
+      <detail-block 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>
+    </div>
   </app-container>
 </template>
 
@@ -484,6 +591,10 @@
   background-color: #fff;
 }
 
+:deep(.el-checkbox__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,
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index aaaaf61..d588b8d 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -1,6 +1,7 @@
 <script lang="ts" setup name="bench">
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
+import type { trainLogStatistic } from './bench-interface'
 import { getCertificateStatistic, getStaffSStatistic, getStatistic, getTrainLogSStatistic } from '@/api/system/bench'
 import { getPlanList } from '@/api/system/plan'
 import { listPageApi } from '@/api/measure/file'
@@ -132,15 +133,19 @@
     account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
+    const result: trainLogStatistic = res.data
+    const notQualified: number = Number(result.trainCount) - result.qualifiedCount
+    const qualifiedRate = ((result.qualifiedCount / result.trainCount) * 100).toFixed(2) // 合格率
+    const notQualifiedRate = ((notQualified / result.trainCount) * 100).toFixed(2) // 不合格率
     TrainLogSList.value = [
-      { name: `合格     ${res.data.qualified}-${(res.data.qualifiedCount / res.data.trainCount) * 100}%`, value: res.data.qualified },
-      { name: `不合格   ${res.data.notQualified}- ${((res.data.notQualified / res.data.trainCount) * 100)}%`, value: res.data.notQualified },
+      { name: `合   格   ${result.qualifiedCount}-${qualifiedRate}%`, value: result.qualifiedCount },
+      { name: `不合格   ${notQualified}- ${notQualifiedRate}%`, value: notQualified },
     ]
     TrainLogTitle.value = res.data.trainCount
   }).catch((_) => {
     // 处理异常
     TrainLogSList.value = [
-      { name: '合格     0 - 50%', value: 0 },
+      { name: '合   格   0 - 50%', value: 0 },
       { name: '不合格   0 - 50%', value: 0 },
     ]
     TrainLogTitle.value = 0
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 9ef0b93..1ad577b 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -270,7 +270,7 @@
               <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="6">
             <el-form-item label="名称" prop="fileName">
               <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
             </el-form-item>
@@ -279,13 +279,14 @@
         <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" class="fill-input" disabled>
+              <el-select v-if="title === '详情'" v-model="ruleForm.publisher" class="fill-input" disabled style="width: 100%;">
                 <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="请选择发布单位"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -295,6 +296,7 @@
                 v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
                 placeholder="请选择实施时间"
                 class="normal-date"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -311,12 +313,13 @@
                 v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
                 placeholder="请选择创建时间"
                 class="normal-date"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建人" prop="createUserId">
-              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index b45fbc3..542b284 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -26,7 +26,7 @@
   createUser: '', // 创建人
   createTime: '', // 创建
   approvalStatus: props.value, // 审批状态
-  limit: 10,
+  limit: 20,
   offset: 1,
   fileType: '', // 类型
   formId: '',
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 7d4724b..e54ddf5 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -26,7 +26,7 @@
   fileCode: '', // 文件号
   effectiveTime: '', // 实施时间
   effectiveStatus: '', // 实施状态
-  limit: 10,
+  limit: 20,
   offset: 1,
   fileType: '', // 类型
 }) // 查询参数
@@ -75,13 +75,19 @@
 const getStatus = () => {
   getDictByCode('effectiveStatus').then((res) => {
     if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
+      effectiveStatusSelect.value = [...res.data, { name: '全部', value: '', id: 'quanbu' }]
     }
   })
 }
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.publishTime) {
+    searchQuery.publishTime = ''
+  }
+  if (!searchQuery.effectiveTime) {
+    searchQuery.effectiveTime = ''
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -252,13 +258,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" />
         </search-item>
         <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
@@ -274,20 +280,16 @@
           <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: 185px;"
           />
         </search-item>
         <search-item>
           <el-date-picker
             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: 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" placeholder="实施状态" clearable>
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index 5ca3275..a95c665 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -505,21 +505,21 @@
         <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] === '详情'" @change="directorChange">
+              <el-select v-model="ruleForm.director" :placeholder="title.split('-')[2] === '详情' ? '' : '负责人'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;" @change="directorChange">
                 <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.name" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="technologyJob">
-              <el-select v-model="ruleForm.technologyJob" :placeholder="title.split('-')[2] === '详情' ? '' : '技术职务'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.technologyJob" :placeholder="title.split('-')[2] === '详情' ? '' : '技术职务'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;">
                 <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="administrationJob">
-              <el-select v-model="ruleForm.administrationJob" :placeholder="title.split('-')[2] === '详情' ? '' : '行政职务'" :disabled="title.split('-')[2] === '详情'">
+              <el-select v-model="ruleForm.administrationJob" :placeholder="title.split('-')[2] === '详情' ? '' : '行政职务'" :disabled="title.split('-')[2] === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index aac1ef2..11d6d0a 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -22,7 +22,7 @@
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
-  limit: 10,
+  limit: 20,
   offset: 1,
   organizeType: '', // 类型
   createTime: '', // 创建时间
@@ -118,6 +118,9 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.createTime) {
+    searchQuery.createTime = ''
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows.map(item => ({ ...item, createTime: item.createTime.split(' ')[0] }))
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 3f472eb..bc5d9d4 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -7,7 +7,9 @@
 // import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
-import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+// import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const props = defineProps({
   isRemind: {
     type: Boolean,
@@ -78,11 +80,14 @@
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 // 获取所有部门
-const deptList = ref<DeptTreeNode[]>([])
+const deptList = ref([])
 const getDeptList = async () => {
   getDeptTreeList().then((res) => {
-    deptList.value = res.data
+    deptList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
@@ -177,6 +182,7 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   searchQuery.staffNo = ''
@@ -184,6 +190,7 @@
   searchQuery.deptId = ''
   searchQuery.certificateStatus = ''
   searchQuery.verifierCertificateNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -212,10 +219,6 @@
     loading.close()
   })
 }
-// 打印
-const print = () => {
-
-}
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传图片
@@ -268,20 +271,24 @@
           <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+          <!-- <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
             <el-option
               v-for="item in deptList"
               :key="item.id"
               :label="item.name"
               :value="item.id"
             />
-          </el-select>
+          </el-select> -->
+          <com-tree-select
+            ref="selectTreeRef" v-model="searchQuery.deptId" :options="deptList"
+            placeholder="工作部门" :tree-props="deptProps"
+          />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况">
+          <el-select v-model="searchQuery.certificateStatus" class="m-2" placeholder="证书状况" clearable>
             <el-option
               v-for="item in certificateStatusList"
               :key="item.id"
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 4352604..5a5f036 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -389,10 +389,10 @@
           关闭
         </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">
-            <el-form-item prop="minioFileName" label-width="70px">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" :class="[title === '详情' ? 'isDetail' : '']" border stripe>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item prop="minioFileName">
               <el-upload
                 class="avatar-uploader"
                 :show-file-list="false"
@@ -423,23 +423,24 @@
               <el-date-picker
                 v-model="ruleForm.birthday" type="date" format="YYYY-MM" value-format="YYYY-MM"
                 placeholder="出生年月" :disabled="title === '详情'"
+                style="width: 100%;"
               />
             </el-form-item>
             <el-form-item label="工作部门" prop="deptId" class="marg-item">
-              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled>
+              <el-select v-if="title === '详情'" v-model="ruleForm.deptId" disabled style="width: 100%;">
                 <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="ruleForm.deptId" :options="PubListTree"
-                placeholder="选择组织机构" :tree-props="deptProps"
+                placeholder="选择组织机构" :tree-props="deptProps" style="width: 100%;"
               />
             </el-form-item>
             <el-form-item label="计量专业" prop="major" class="marg-item">
               <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
             </el-form-item>
             <el-form-item label="是否特操人" prop="specialOperator" class="marg-item">
-              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -449,23 +450,23 @@
               <el-input v-model.trim="ruleForm.staffNo" placeholder="系统自动生成" disabled />
             </el-form-item>
             <el-form-item label="性别" prop="sex" class="marg-item">
-              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.sex" placeholder="请选择性别" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="技术职务" prop="technologyJob" class="marg-item">
-              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.technologyJob" placeholder="技术职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="从事日期" prop="workDate" class="marg-item">
               <el-date-picker
                 v-model="ruleForm.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-                placeholder="请选择从事日期"
+                placeholder="请选择从事日期" style="width: 100%;"
               />
             </el-form-item>
-            <el-form-item label="是否技术考核" prop="technologyExam" class="marg-item">
-              <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'">
+            <el-form-item label="是否技术考核" prop="technologyExam" class="marg-item" style="width: 100%;">
+              <el-select v-model="ruleForm.technologyExam" placeholder="技术考核" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -475,17 +476,17 @@
               <el-input ref="cardRef" v-model.trim="ruleForm.idCard" placeholder="身份证号" :disabled="title === '详情'" @blur="getBirthday" />
             </el-form-item>
             <el-form-item label="文化程度" prop="education" class="marg-item">
-              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.education" placeholder="文化程度" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="行政职务" prop="administrationJob" class="marg-item">
-              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.administrationJob" placeholder="行政职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="是否主考人" prop="mainExaminer" class="marg-item">
-              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'">
+              <el-select v-model="ruleForm.mainExaminer" placeholder="是否主考人" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in selectWhether" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index 042636e..660f2b0 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -264,7 +264,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="性别" prop="meterStaff.sex">
-              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -273,21 +273,21 @@
         <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-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'" style="width: 100%;">
                 <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-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -296,7 +296,7 @@
         <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-select v-if="title === '详情'" v-model="meterStaff.deptId" disabled style="width: 100%;">
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
               <com-tree-select
@@ -304,6 +304,7 @@
                 ref="selectTreeRef" v-model="meterStaff.deptId" :options="PubListTree"
                 placeholder="选择组织机构"
                 :tree-props="deptProps"
+                style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -316,7 +317,7 @@
             <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="请选择从事日期"
+                placeholder="请选择从事日期" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -347,7 +348,7 @@
             <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="请选择发证日期"
+                placeholder="请选择发证日期" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
@@ -355,7 +356,7 @@
             <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="请选择有效日期"
+                placeholder="请选择有效日期" style="width: 100%;"
               />
             </el-form-item>
           </el-col>
diff --git a/src/views/measure/person/components/certificateAddDialog.vue b/src/views/measure/person/components/certificateAddDialog.vue
index 178fc12..d0116f3 100644
--- a/src/views/measure/person/components/certificateAddDialog.vue
+++ b/src/views/measure/person/components/certificateAddDialog.vue
@@ -3,7 +3,7 @@
 import type { FormInstance, FormRules } from 'element-plus'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
+const formLabelWidth = '110px'
 const form = reactive({
   certificateNo: '', // 证书号
   certificateName: '', // 证书名称
@@ -71,32 +71,52 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`">
+  <el-dialog v-model="dialogFormVisible" :title="`${title}证书信息`" width="40%">
     <el-form
       ref="ruleFormRef" :model="form"
       :rules="rules"
     >
-      <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
-        <el-input v-model="form.certificateNo" placeholder="证书号" />
-      </el-form-item>
-      <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
-        <el-input v-model="form.certificateName" placeholder="证书名称" />
-      </el-form-item>
-      <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
-        <el-input v-model="form.certificateCompany" placeholder="发证单位" />
-      </el-form-item>
-      <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
-        <el-date-picker
-          v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择发证日期"
-        />
-      </el-form-item>
-      <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-        <el-date-picker
-          v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择有效日期"
-        />
-      </el-form-item>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
+            <el-input v-model="form.certificateNo" placeholder="证书号" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
+            <el-input v-model="form.certificateName" placeholder="证书名称" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
+            <el-input v-model="form.certificateCompany" placeholder="发证单位" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
+            <el-date-picker
+              v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择发证日期" style="width: 100%;"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="18">
+          <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
+            <el-date-picker
+              v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择有效日期" style="width: 100%;"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <template #footer>
       <span class="dialog-footer">
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
index 5e20d1b..10b0deb 100644
--- a/src/views/measure/person/components/personListDialog.vue
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -1,8 +1,11 @@
 <!-- 计量人员列表弹窗 -->
 <script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
 import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import { getDeptTreeList } from '@/api/system/dept'
-import type { TreeStructure } from '@/views/system/user/user-interface'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -10,7 +13,7 @@
   staffNo: '', // 人员编号
   name: '', // 姓名
   deptId: '', // 所在部门
-  limit: 5,
+  limit: 10,
   offset: 1,
 })
 const loadingTable = ref<boolean>(false)
@@ -32,20 +35,22 @@
   },
 ])
 // 获取部门
-const deptIdList = ref<TreeStructure[]>([])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+const deptIdList = ref([])
 const getDeptList = () => {
   getDeptTreeList().then((res) => {
-    deptIdList.value = res.data
+    deptIdList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
 const fetchData = () => {
-  select.value = ''
+  select.value = -1
   getStaffList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.records
       total.value = Number(res.data.total)
-      console.log(list.value, 'list')
     }
   })
 }
@@ -53,6 +58,7 @@
 const search = () => {
   fetchData()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   listQuery.value = {
@@ -62,6 +68,7 @@
     limit: 10,
     offset: 1,
   }
+  selectTreeRef.value.clearSelected()
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -76,18 +83,24 @@
 }
 // 点击保存
 const submitForm = () => {
-  const person = list.value.filter((item, index) => index == select.value)[0]
-  console.log(person, 'person')
-  getStaffDetail(person).then((res) => {
-    if (res.code === 200) {
-      emits('add', res.data)
-      dialogFormVisible.value = false
-    }
-  })
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    getStaffDetail(person).then((res) => {
+      if (res.code === 200) {
+        emits('add', res.data)
+        dialogFormVisible.value = false
+        reset()
+      }
+    })
+  }
+  else {
+    ElMessage.warning('请先选择人员')
+  }
 }
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
+  reset()
 }
 // 初始化
 const initDialog = () => {
@@ -99,39 +112,45 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员" width="50%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable style="width: 150px;" />
+        <el-input v-model.trim="listQuery.staffNo" placeholder="人员编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable style="width: 150px;" />
+        <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
+        <!-- <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable style="width: 150px;">
           <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
+        </el-select> -->
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
-    <normal-table
-      :data="list" :total="total" :columns="columns" :query="listQuery"
-      :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>
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :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">
             {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
           </template>
         </el-table-column> -->
-      </template>
-    </normal-table>
+        </template>
+      </normal-table>
+    </div>
     <template #footer>
       <span class="dialog-footer">
         <el-button type="primary" @click="submitForm">确认</el-button>
diff --git a/src/views/measure/person/components/userListDialog.vue b/src/views/measure/person/components/userListDialog.vue
index dcd05b5..cd62a73 100644
--- a/src/views/measure/person/components/userListDialog.vue
+++ b/src/views/measure/person/components/userListDialog.vue
@@ -3,14 +3,16 @@
 import { ElMessage } from 'element-plus'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
-import type { TreeStructure } from '@/views/system/user/user-interface'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
 const listQuery = ref({
   keywords: '', // 姓名
   deptId: '', // 所在部门
-  limit: 5,
+  limit: 10,
   offset: 1,
 })
 const loadingTable = ref<boolean>(false)
@@ -31,11 +33,14 @@
     value: 'deptName',
   },
 ])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 // 获取部门
-const deptIdList = ref<TreeStructure[]>([])
+const deptIdList = ref([])
 const getDeptList = () => {
   getDeptTreeList().then((res) => {
-    deptIdList.value = res.data
+    deptIdList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
@@ -52,6 +57,7 @@
 const search = () => {
   fetchData()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   listQuery.value = {
@@ -60,6 +66,7 @@
     limit: 10,
     offset: 1,
   }
+  selectTreeRef.value.clearSelected()
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -74,11 +81,11 @@
 }
 // 点击保存
 const submitForm = () => {
-  console.log(select.value)
   if (select.value >= 0) {
     const person = list.value.filter((item, index) => index == select.value)[0]
     emits('add', person)
     dialogFormVisible.value = false
+    reset()
   }
   else {
     ElMessage.warning('请先选择人员')
@@ -87,9 +94,11 @@
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
+  reset()
 }
 // 初始化
 const initDialog = () => {
+  // reset()
   dialogFormVisible.value = true
   getDeptList()
   fetchData()
@@ -98,16 +107,20 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+  <el-dialog v-model="dialogFormVisible" title="选择人员" width="50%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
         <el-input v-model.trim="listQuery.keywords" placeholder="真实姓名" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable>
+        <!-- <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable>
           <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
+        </el-select> -->
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 9c6f65d..355473a 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -7,7 +7,9 @@
 // import { uploadApi } from '@/api/system/notice'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
-import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+// import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
@@ -16,7 +18,7 @@
   major: '', // 计量专业
   verifierCertificateNo: '', // 证书号
   certificateStatus: '', // 证书状态
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -52,10 +54,10 @@
 const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取所有部门
-const deptList = ref<DeptTreeNode[]>([])
+const deptList = ref([])
 const getDeptList = async () => {
   getDeptTreeList().then((res) => {
-    deptList.value = res.data
+    deptList.value = toTreeList(res.data, '0', true)
   })
 }
 // 获取数据列表
@@ -126,6 +128,7 @@
 const search = () => {
   getList()
 }
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   searchQuery.staffNo = ''
@@ -133,6 +136,7 @@
   searchQuery.deptId = ''
   searchQuery.major = ''
   searchQuery.verifierCertificateNo = ''
+  selectTreeRef.value.clearSelected()
   getList()
 }
 // 模板下载
@@ -160,10 +164,9 @@
     loading.close()
   })
 }
-// 打印
-const print = () => {
-
-}
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传图片
@@ -216,14 +219,18 @@
           <el-input v-model="searchQuery.name" placeholder="姓名" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
+          <!-- <el-select v-model="searchQuery.deptId" class="m-2" placeholder="工作部门">
             <el-option
               v-for="item in deptList"
               :key="item.id"
               :label="item.name"
               :value="item.id"
             />
-          </el-select>
+          </el-select> -->
+          <com-tree-select
+            ref="selectTreeRef" v-model="searchQuery.deptId" :options="deptList"
+            placeholder="工作部门" :tree-props="deptProps"
+          />
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.major" placeholder="计量专业" clearable class="w-50 m-2" />
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index af0a29d..2e0e7af 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -1,12 +1,15 @@
 <script lang="ts" setup name="ListSourceAdd">
-import { reactive, ref } from 'vue'
+/**
+ * 添加/编辑/详情溯源供方
+ */
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions, IformInline } from './list_interface'
+import type { IOptions, IformInline, traceSupplierPerson } from './list_interface'
 import { exportFile } from '@/utils/exportUtils'
 import { UploadFile } from '@/api/measure/file'
 import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+import { validatePhone } from '@/utils/validate'
 const props = defineProps({
   infoId: {
     type: String,
@@ -19,43 +22,45 @@
 })
 const emit = defineEmits(['close'])
 const formInline: Ref<IformInline> = ref({
-  businessContent: null,
-  supplierName: null,
-  supplierNo: null,
-  bankAccount: null,
-  bankAccountNumber: null,
-  bankName: null,
-  briefName: null,
-  businessScope: null,
-  companyAddress: null,
-  companyArea: null,
-  companyCity: null,
-  companyCountry: null,
-  companyProvince: null,
-  createTime: null,
-  director: null,
-  fax: null,
-  invoiceAddress: null,
-  invoiceArea: null,
-  invoiceCity: null,
-  invoiceCountry: null,
-  invoiceProvince: null,
-  mailbox: null,
-  minioFileName: null,
-  mobile: null,
-  phone: null,
-  postalCode: null,
-  remark: null,
-  taxNumber: null,
-  website: null,
+  id: '',
+  businessContent: '',
+  supplierName: '',
+  supplierNo: '',
+  bankAccount: '',
+  bankAccountNumber: '',
+  bankName: '',
+  briefName: '',
+  businessScope: '',
+  companyAddress: '',
+  companyArea: '',
+  companyCity: '',
+  companyCountry: '',
+  companyProvince: '',
+  createTime: '',
+  director: '',
+  fax: '',
+  invoiceAddress: '',
+  invoiceArea: '',
+  invoiceCity: '',
+  invoiceCountry: '',
+  invoiceProvince: '',
+  mailbox: '',
+  minioFileName: '',
+  mobile: '',
+  phone: '',
+  postalCode: '',
+  remark: '',
+  taxNumber: '',
+  website: '',
   traceSupplierPersonList: [],
 })
+const traceSupplierPersonList: Ref<traceSupplierPerson[]> = ref([])
 const columns = ref([
-  { text: '人员编号', value: 'personNo', show: true },
-  { text: '姓名', value: 'name', show: true },
-  { text: '工作部门', value: 'department', show: true },
-  { text: '职务', value: 'job', show: true },
-  { text: '联系方式', value: 'phone', show: true },
+  { text: '人员编号', value: 'personNo', required: false },
+  { text: '姓名', value: 'name', required: true },
+  { text: '工作部门', value: 'department', required: false },
+  { text: '职务', value: 'job', required: false },
+  { text: '联系方式', value: 'phone', required: true, reg: validatePhone },
 ])
 const ruleFormRef = ref<FormInstance>()
 const provinceList = ref<IOptions[]>([])
@@ -66,14 +71,17 @@
 const invoiceCityList = ref<IOptions[]>([])
 const areaInvoiceList = ref<IOptions[]>([])
 const dialogVisible = ref(false)
-const addPersonList = ref({
+// 人员对象
+const addPersonObj: traceSupplierPerson = {
+  id: '',
   personNo: '',
   name: '',
   department: '',
   job: '',
   phone: '',
-})
-const SelectionList = ref([])
+  editable: true,
+}
+const SelectionList: Ref<traceSupplierPerson[]> = ref([])
 const upload = ref<UploadInstance>()
 // 校验规则
 const rules = ref({
@@ -91,7 +99,7 @@
   })
 }
 // 表格选中
-const handleSelectionChange = (e: any) => {
+const handleSelectionChange = (e: traceSupplierPerson[]) => {
   SelectionList.value = e
 }
 // 获取公司地址省级
@@ -142,15 +150,33 @@
   })
 }
 // 点击增加行
-const addRoow = () => {
-  const object = {
-    personNo: '',
-    name: '',
-    department: '',
-    job: '',
-    phone: '',
+const addRow = () => {
+  // 检查上一行必填项
+  if (checkPersonList()) {
+    setAllRowReadable()
+    traceSupplierPersonList.value.push({ ...addPersonObj })
   }
-  formInline.value.traceSupplierPersonList.push(object)
+}
+// 检查人员列表
+function checkPersonList() {
+  for (let index = 0; index < traceSupplierPersonList.value.length; index++) {
+    const item = traceSupplierPersonList.value[index]
+    for (const prop of columns.value) {
+      // 检查必填
+      if (prop.required && !item[prop.value]) {
+        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
+        return false
+      }
+      // 验证正则
+      if (prop.reg && typeof prop.reg === 'function') {
+        if (!prop.reg(item[prop.value])) {
+          ElMessage.warning(`第${index + 1}行中${prop.text}输入不合法`)
+          return false
+        }
+      }
+    }
+  }
+  return true
 }
 // 点击关闭
 const handleClose = () => {
@@ -158,12 +184,12 @@
 }
 // 点击弹窗的完成追加到表格数组中
 const addPushList = () => {
-  formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonList.value)))
+  formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonObj.value)))
   handleClose()
 }
 // 删除行
 const deleteList = () => {
-  formInline.value.traceSupplierPersonList = formInline.value.traceSupplierPersonList.filter((item) => {
+  traceSupplierPersonList.value = traceSupplierPersonList.value.filter((item: traceSupplierPerson) => {
     return !SelectionList.value.includes(item)
   })
 }
@@ -261,10 +287,16 @@
     }
   })
 }
-// 双击表格显示输入框
-const dblclickName = (item: object) => {
-  console.log(item)
-  item.show = false
+// 双击行显示输入框
+const dblclickRow = (row: traceSupplierPerson) => {
+  setAllRowReadable()
+  row.editable = true
+}
+// 将所有人员信息列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of traceSupplierPersonList.value) {
+    item.editable = false
+  }
 }
 if (props.buttonType !== '新建') {
   getInfo()
@@ -273,7 +305,7 @@
 
 <template>
   <app-container>
-    <detail-page :title="`培训计划-${buttonType}`">
+    <detail-page :title="`溯源供方-${buttonType}`">
       <template #btns>
         <el-button
           type="primary"
@@ -617,39 +649,36 @@
       </el-form>
     </detail-page>
     <detail-block title="人员信息">
-      <template #btns>
-        <el-button
-          type="info"
-          :disabled="buttonType === '详情'"
-          @click="deleteList"
-        >
+      <template v-if="buttonType !== '详情'" #btns>
+        <el-button type="info" @click="deleteList">
           删除行
         </el-button>
-        <el-button
-          type="primary"
-          :disabled="buttonType === '详情'"
-          @click="addRoow"
-        >
+        <el-button type="primary" @click="addRow">
           增加行
         </el-button>
       </template>
       <el-table
-        :data="formInline.traceSupplierPersonList"
+        :data="traceSupplierPersonList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
+        @row-dblclick="dblclickRow"
       >
-        <el-table-column type="selection" width="55" />
+        <el-table-column type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column
           v-for="item in columns"
           :key="item.value"
           :prop="item.value"
           :label="item.text"
+          align="center"
         >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
           <template #default="scope">
-            <span v-show="item.show" style="color: gray;" @dblclick="dblclickName(item)">{{ scope.row[item.value] || `双击编辑${item.text}` }}</span>
-            <el-input v-show="!item.show" v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" @blur="item.show = true" />
+            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+            <el-input v-else v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index 530bcc4..c057976 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -24,6 +24,18 @@
   areaName: string
 }
 
+// 溯源供方人员
+export interface traceSupplierPerson {
+  id: number | string // id
+  job: string // 职务
+  department: string// 部门
+  name: string// 信命
+  personNo: string// 人员编号
+  phone: string// 联系方式
+  editable?: boolean // 是否可编辑
+  [key: string]: any
+}
+
 export interface IformInline {
   businessContent: string
   supplierName: string
@@ -55,5 +67,6 @@
   remark: string
   taxNumber: string
   website: string
-  traceSupplierPersonList: []
+  traceSupplierPersonList: traceSupplierPerson []
 }
+
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index e44001a..600eda1 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -32,11 +32,20 @@
   dialogVisible.value = true
   ruleForm.noticePublisher = userInfo.$state.name
   ruleForm.noticeCompany = userInfo.$state.deptName
-  ruleForm.noticeTime = dayjs().format('YYYY-MM-DD')
+  ruleForm.noticeTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
 }
 defineExpose({ initDialog })
+// 重置
+const resetDialog = () => {
+  ruleForm.noticeTime = ''
+  ruleForm.noticeSketch = ''
+  ruleForm.noticeContent = ''
+  ruleForm.minioFileName = ''
+  ruleForm.noticeTitle = ''
+}
 // 关闭弹窗
 const close = () => {
+  resetDialog()
   dialogVisible.value = false
   emits('resetData')
 }
@@ -63,6 +72,7 @@
 const resetForm = (formEl: FormInstance | undefined) => {
   // if (!formEl) { return }
   formEl?.resetFields()
+  resetDialog()
   dialogVisible.value = false
   emits('resetData')
 }
@@ -105,7 +115,7 @@
     uploadImage: {
       server: 'http://111.198.10.15:21409/minio/file/upload', // 配置图片上传地址
       maxFileSize: 2 * 1024 * 1024, // 10M  图片大小限制
-      fieldName: 'img', // 上传类型
+      fieldName: 'multipartFile', // 上传名字
       allowedFileTypes: [], // 选择文件时的类型限制，默认为 ['image/*'] 。如不想限制，则设置为 []
       // 自定义上传参数，传递图片时需要带一些参数过去写在这。参数会被添加到 formData 中，一起上传到服务端。
       // meta: {
@@ -154,9 +164,9 @@
     uploadVideo: {
       server: 'http://111.198.10.15:21409/minio/file/upload', // 配置视频上传地址
       maxFileSize: 5 * 1024 * 1024, // 5M  视频大小限制
-      fieldName: 'your-custom-name', // 上传类型
+      fieldName: 'multipartFile', // 上传名字
       // 最多可上传几个文件，默认为 5
-      maxNumberOfFiles: 3,
+      // maxNumberOfFiles: 1,
       allowedFileTypes: [], // 选择文件时的类型限制，默认为 ['video/*'] 。如不想限制，则设置为 []
       // 自定义上传参数，传递图片时需要带一些参数过去写在这。参数会被添加到 formData 中，一起上传到服务端。
       // meta: {
@@ -167,8 +177,8 @@
       //     Accept: 'text/x-json',
       //     otherKey: 'xxx'
       // },
-      metaWithUrl: false, // 将 meta 拼接到 url 参数中，默认 false
-      withCredentials: true, // 跨域是否传递 cookie ，默认为 false
+      // metaWithUrl: false, // 将 meta 拼接到 url 参数中，默认 false
+      // withCredentials: true, // 跨域是否传递 cookie ，默认为 false
       // 上传之前触发
       onBeforeUpload(file: any) {
         // file 选中的文件，格式如 { key: file }
@@ -222,9 +232,6 @@
     editorRef.value = editor // 一定要用 Object.seal() ，否则会报错
   })
 }
-const look = () => {
-  console.log(ruleForm.noticeContent)
-}
 const minioFileUrl = ref('')
 watch(() => ruleForm.minioFileName, (newVal) => {
   if (newVal) {
@@ -278,7 +285,7 @@
           />
           <editor
             v-model="ruleForm.noticeContent"
-            style="height: 150px; overflow-y: hidden;"
+            style="height: 300px; overflow-y: hidden;"
             :default-config="editorConfig"
             mode="default"
             @onCreated="onCreated"
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index 0926957..a4cdd5e 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -16,7 +16,7 @@
   noticePublisher: '', // 发布人
   noticeTime: '', // 发布时间
   noticeTitle: '', // 标题
-  limit: 10,
+  limit: 20,
   offset: 1,
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
@@ -27,6 +27,7 @@
     text: '编号',
     value: 'noticeNo',
     align: 'center',
+    width: '180',
   },
   {
     text: '标题',
@@ -37,6 +38,7 @@
     text: '发布人',
     value: 'noticePublisher',
     align: 'center',
+    width: '150',
   },
   {
     text: '内容描述',
@@ -47,11 +49,15 @@
     text: '发布时间',
     value: 'noticeTime',
     align: 'center',
+    width: '200',
   },
 ] // 表格
 const list = ref([]) // 表格数据
 // 获取通知公告列表
 const getNoticeList = () => {
+  if (!searchQuery.noticeTime) {
+    searchQuery.noticeTime = ''
+  }
   getNoticeeApi(searchQuery).then((res) => {
     total.value = res.data.total
     list.value = res.data.rows
diff --git a/src/views/system/notice/noticeDetail.vue b/src/views/system/notice/noticeDetail.vue
index 94468d4..da36bd8 100644
--- a/src/views/system/notice/noticeDetail.vue
+++ b/src/views/system/notice/noticeDetail.vue
@@ -1,5 +1,6 @@
 <!-- 通知公告详情弹窗 -->
 <script lang="ts" setup name="noticeDetail">
+import { Editor } from '@wangeditor/editor-for-vue'
 import type { noticeType } from './notice-interface'
 import { getNoticeDetail } from '@/api/system/notice'
 import { getPhotoUrl } from '@/api/system/tool'
@@ -52,6 +53,18 @@
     })
   }
 })
+// 编辑器配置
+const editorConfig = ref({
+  readOnly: true,
+})
+// 富文本实例对象
+const editorRef = shallowRef()
+const onCreated = (editor: any) => {
+  editorRef.value = editor
+  nextTick(() => {
+    editorRef.value = editor // 一定要用 Object.seal() ，否则会报错
+  })
+}
 </script>
 
 <template>
@@ -89,7 +102,18 @@
       </el-form-item>
       <el-form-item label="发布内容" prop="noticeContent">
         <!-- <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" disabled /> -->
-        <div style="border: 1px solid #dcdfe6;width: 100%;border-radius: 4px;padding: 12px;" v-html="ruleForm.noticeContent" />
+        <!-- <div style="border: 1px solid #dcdfe6;width: 100%;border-radius: 4px;padding: 12px;" v-html="ruleForm.noticeContent" ></div> -->
+        <div style="border: 1px solid #dcdfe6;width: 100%;border-radius: 4px;">
+          <editor
+            ref="editorRef"
+            v-model="ruleForm.noticeContent"
+            style="height: 300px; overflow-y: hidden;"
+            :default-config="editorConfig"
+            mode="default"
+            :disabled="true"
+            @onCreated="onCreated"
+          />
+        </div>
       </el-form-item>
       <el-form-item label="查看附件">
         <el-link v-if="ruleForm.minioFileName" :href="minioFileUrl" type="primary" target="_blank">
diff --git a/src/views/system/tool/autograph/addDDialog.vue b/src/views/system/tool/autograph/addDDialog.vue
index e39b706..daadd9b 100644
--- a/src/views/system/tool/autograph/addDDialog.vue
+++ b/src/views/system/tool/autograph/addDDialog.vue
@@ -186,7 +186,7 @@
         <el-input v-model.trim="ruleForm.signDesc" placeholder="签名描述" :disabled="title === '详情'" />
       </el-form-item>
       <el-form-item label="可使用人" prop="userIdList">
-        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'">
+        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'" style="width: 100%;">
           <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </el-form-item>
@@ -198,7 +198,7 @@
         <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px', 'margin-top': ruleForm.minioFileName === '' ? '0px' : '56px' }" @click="upload">
           {{ ruleForm.minioFileName === '' ? '上传' : '更换图片' }}
         </el-button>
-        <input v-show="title === '123'" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <input v-show="title === '123'" ref="fileRef" type="file" accept="image/*" @change="onFileChange">
       </el-form-item>
     </el-form>
     <template #footer>
diff --git a/src/views/system/tool/autograph/autograph.vue b/src/views/system/tool/autograph/autograph.vue
index ac9f000..d3c6f81 100644
--- a/src/views/system/tool/autograph/autograph.vue
+++ b/src/views/system/tool/autograph/autograph.vue
@@ -15,7 +15,7 @@
   signName: '', // 名称
   signDirector: '', // 负责人
   createTime: '', // 创建时间
-  limit: 10,
+  limit: 20,
   offset: 1,
   signType: '',
 }) // 查询参数
@@ -38,6 +38,9 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.createTime) {
+    searchQuery.createTime = ''
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -168,10 +171,10 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model="searchQuery.signNo" placeholder="签章编号" clearable class="w-50 m-2 normal-input" />
+        <el-input v-model="searchQuery.signNo" placeholder="签名编号" clearable class="w-50 m-2 normal-input" />
       </search-item>
       <search-item>
-        <el-input v-model="searchQuery.signName" placeholder="签章名称" clearable class="w-50 m-2 normal-input" />
+        <el-input v-model="searchQuery.signName" placeholder="签名名称" clearable class="w-50 m-2 normal-input" />
       </search-item>
       <search-item>
         <el-input v-model="searchQuery.signDirector" placeholder="负责人" clearable class="w-50 m-2 normal-input" />
diff --git a/src/views/system/tool/certificate/addDDialog.vue b/src/views/system/tool/certificate/addDDialog.vue
index 2721bf8..0fdec28 100644
--- a/src/views/system/tool/certificate/addDDialog.vue
+++ b/src/views/system/tool/certificate/addDDialog.vue
@@ -185,7 +185,7 @@
         <el-input v-model.trim="ruleForm.templateDesc" placeholder="模板描述" :disabled="title === '详情'" />
       </el-form-item>
       <el-form-item label="可使用人" prop="userIdList">
-        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'">
+        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'" style="width: 100%;">
           <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </el-form-item>
diff --git a/src/views/system/tool/certificate/certificate.vue b/src/views/system/tool/certificate/certificate.vue
index 9787116..a2468de 100644
--- a/src/views/system/tool/certificate/certificate.vue
+++ b/src/views/system/tool/certificate/certificate.vue
@@ -15,7 +15,7 @@
   templateName: '', // 名称
   templateCreator: '', // 负责人
   createTime: '', // 创建时间
-  limit: 10,
+  limit: 20,
   offset: 1,
   templateType: '',
 }) // 查询参数
@@ -38,6 +38,9 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.createTime) {
+    searchQuery.createTime = ''
+  }
   templatePage(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
diff --git a/src/views/system/tool/document/addDDialog.vue b/src/views/system/tool/document/addDDialog.vue
index c440d1d..d5d28d8 100644
--- a/src/views/system/tool/document/addDDialog.vue
+++ b/src/views/system/tool/document/addDDialog.vue
@@ -186,7 +186,7 @@
         <el-input v-model.trim="ruleForm.templateDesc" placeholder="模板描述" :disabled="title === '详情'" />
       </el-form-item>
       <el-form-item label="可使用人" prop="userIdList">
-        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'">
+        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'" style="width: 100%;">
           <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </el-form-item>
diff --git a/src/views/system/tool/document/document.vue b/src/views/system/tool/document/document.vue
index 774e498..ac857ea 100644
--- a/src/views/system/tool/document/document.vue
+++ b/src/views/system/tool/document/document.vue
@@ -14,7 +14,7 @@
   templateName: '', // 名称
   templateCreator: '', // 负责人
   createTime: '', // 创建时间
-  limit: 10,
+  limit: 20,
   offset: 1,
   templateType: '',
 }) // 查询参数
@@ -37,6 +37,9 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.createTime) {
+    searchQuery.createTime = ''
+  }
   templatePage(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
diff --git a/src/views/system/tool/signature/addDDialog.vue b/src/views/system/tool/signature/addDDialog.vue
index 509509c..bb4c177 100644
--- a/src/views/system/tool/signature/addDDialog.vue
+++ b/src/views/system/tool/signature/addDDialog.vue
@@ -185,7 +185,7 @@
         <el-input v-model.trim="ruleForm.signDesc" placeholder="签章描述" :disabled="title === '详情'" />
       </el-form-item>
       <el-form-item label="可使用人" prop="userIdList">
-        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'">
+        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'" style="width: 100%;">
           <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </el-form-item>
diff --git a/src/views/system/tool/signature/signature.vue b/src/views/system/tool/signature/signature.vue
index 4eb6d70..f44f661 100644
--- a/src/views/system/tool/signature/signature.vue
+++ b/src/views/system/tool/signature/signature.vue
@@ -15,7 +15,7 @@
   signName: '', // 名称
   signDirector: '', // 负责人
   createTime: '', // 创建时间
-  limit: 10,
+  limit: 20,
   offset: 1,
   signType: '',
 }) // 查询参数
@@ -38,6 +38,9 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
+  if (!searchQuery.createTime) {
+    searchQuery.createTime = ''
+  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
diff --git a/src/views/system/user/listUser.vue b/src/views/system/user/listUser.vue
index 1387821..a4d6816 100644
--- a/src/views/system/user/listUser.vue
+++ b/src/views/system/user/listUser.vue
@@ -236,13 +236,13 @@
           </search-item>
           <search-item>
             <el-date-picker
-              v-model="listQuery.beginTime" type="datetime" format="YYYY-MM-DD HH:mm:ss"
+              v-model="listQuery.beginTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
               placeholder="选择开始时间"
             />
           </search-item>
           <search-item>
             <el-date-picker
-              v-model="listQuery.endTime" type="datetime" format="YYYY-MM-DD HH:mm:ss"
+              v-model="listQuery.endTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
               placeholder="选择结束时间"
             />
           </search-item>
diff --git a/src/views/system/user/roleAssignment.vue b/src/views/system/user/roleAssignment.vue
index 4b09678..be67b63 100644
--- a/src/views/system/user/roleAssignment.vue
+++ b/src/views/system/user/roleAssignment.vue
@@ -88,7 +88,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" :title="titleText" width="330px" append-to-body>
+  <el-dialog v-model="dialogFormVisible" :title="titleText" width="30%" append-to-body>
     <el-scrollbar>
       <el-tree
         ref="treeRef" v-loading="loading" :props="defaultProps" :data="roleTreeList"
diff --git a/src/views/system/user/userAdd.vue b/src/views/system/user/userAdd.vue
index 56e51c7..ad997df 100644
--- a/src/views/system/user/userAdd.vue
+++ b/src/views/system/user/userAdd.vue
@@ -223,8 +223,8 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" width="700" :title="textMap[dialogStatus]" append-to-body>
-    <el-form ref="ruleFormRef" :rules="rules" :model="userForm" label-position="right" label-width="80px">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" width="50%" :title="textMap[dialogStatus]" append-to-body>
+    <el-form ref="ruleFormRef" :rules="rules" :model="userForm" label-position="right" label-width="110px">
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="账号" prop="account">
@@ -243,7 +243,7 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="性别" prop="sex">
-            <el-select v-model="userForm.sex" placeholder="请选择" :style="{ width: '240px' }">
+            <el-select v-model="userForm.sex" placeholder="请选择" :style="{ width: '100%' }">
               <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
@@ -274,7 +274,7 @@
           <el-form-item v-if="dialogStatus === 'create'" label="角色" prop="roleid">
             <com-tree-select
               v-model="userForm.roleid" :options="roleTreeList" placeholder="选择角色"
-              :tree-props="roleProps"
+              :tree-props="roleProps" style="width: 100%;"
             />
           </el-form-item>
           <el-form-item v-else label="角色">
@@ -287,7 +287,7 @@
               placeholder="请选择组织机构" /> -->
             <com-tree-select
               v-model="userForm.deptId" :options="deptTreeList" placeholder="选择组织机构"
-              :tree-props="deptProps"
+              :tree-props="deptProps" style="width: 100%;"
             />
           </el-form-item>
         </el-col>