diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index 94a4246..c30f801 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -35,6 +35,7 @@
     data,
   })
 }
+
 // 设备借用申请编辑
 export function editApply(data: object) {
   return request({
@@ -59,6 +60,14 @@
     data,
   })
 }
+// 设备借用归还提交
+export function returnApply(data: object) {
+  return request({
+    url: '/equipmentApply/returnEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
 // 设备借用申请导出
 export function exportApply(data: object) {
   return request({

diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index 94a4246..c30f801 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -35,6 +35,7 @@
     data,
   })
 }
+
 // 设备借用申请编辑
 export function editApply(data: object) {
   return request({
@@ -59,6 +60,14 @@
     data,
   })
 }
+// 设备借用归还提交
+export function returnApply(data: object) {
+  return request({
+    url: '/equipmentApply/returnEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
 // 设备借用申请导出
 export function exportApply(data: object) {
   return request({
diff --git a/src/api/device/standingBook.ts b/src/api/device/standingBook.ts
index 74e0af0..0f47a88 100644
--- a/src/api/device/standingBook.ts
+++ b/src/api/device/standingBook.ts
@@ -58,3 +58,22 @@
     data,
   })
 }
+
+// 通过设备id查询出状态变更记录
+export function queryStateChangeLogList(data: object) {
+  return request({
+    url: '/meter/assets/queryStateChangeLogList',
+    method: 'post',
+    data,
+  })
+}
+
+// 通过设备id查询出使用记录
+export function queryUseLogList(data: object) {
+  return request({
+    url: '/meter/assets/queryUseLogList',
+    method: 'post',
+    data,
+  })
+}
+

diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index 94a4246..c30f801 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -35,6 +35,7 @@
     data,
   })
 }
+
 // 设备借用申请编辑
 export function editApply(data: object) {
   return request({
@@ -59,6 +60,14 @@
     data,
   })
 }
+// 设备借用归还提交
+export function returnApply(data: object) {
+  return request({
+    url: '/equipmentApply/returnEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
 // 设备借用申请导出
 export function exportApply(data: object) {
   return request({
diff --git a/src/api/device/standingBook.ts b/src/api/device/standingBook.ts
index 74e0af0..0f47a88 100644
--- a/src/api/device/standingBook.ts
+++ b/src/api/device/standingBook.ts
@@ -58,3 +58,22 @@
     data,
   })
 }
+
+// 通过设备id查询出状态变更记录
+export function queryStateChangeLogList(data: object) {
+  return request({
+    url: '/meter/assets/queryStateChangeLogList',
+    method: 'post',
+    data,
+  })
+}
+
+// 通过设备id查询出使用记录
+export function queryUseLogList(data: object) {
+  return request({
+    url: '/meter/assets/queryUseLogList',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 97d660a..9fd6678 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -8,10 +8,11 @@
   createUser?: string // 	创建人
   processResult?: string // 	处置结果
   applyType: string // 申请类型
-  time: string // 	申请日期
+  time?: string // 	申请日期
   limit?: number
   offset?: number
   ids?: string[]
+  id: string
   formId?: string
 }
 // 借用设备类型

diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index 94a4246..c30f801 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -35,6 +35,7 @@
     data,
   })
 }
+
 // 设备借用申请编辑
 export function editApply(data: object) {
   return request({
@@ -59,6 +60,14 @@
     data,
   })
 }
+// 设备借用归还提交
+export function returnApply(data: object) {
+  return request({
+    url: '/equipmentApply/returnEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
 // 设备借用申请导出
 export function exportApply(data: object) {
   return request({
diff --git a/src/api/device/standingBook.ts b/src/api/device/standingBook.ts
index 74e0af0..0f47a88 100644
--- a/src/api/device/standingBook.ts
+++ b/src/api/device/standingBook.ts
@@ -58,3 +58,22 @@
     data,
   })
 }
+
+// 通过设备id查询出状态变更记录
+export function queryStateChangeLogList(data: object) {
+  return request({
+    url: '/meter/assets/queryStateChangeLogList',
+    method: 'post',
+    data,
+  })
+}
+
+// 通过设备id查询出使用记录
+export function queryUseLogList(data: object) {
+  return request({
+    url: '/meter/assets/queryUseLogList',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 97d660a..9fd6678 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -8,10 +8,11 @@
   createUser?: string // 	创建人
   processResult?: string // 	处置结果
   applyType: string // 申请类型
-  time: string // 	申请日期
+  time?: string // 	申请日期
   limit?: number
   offset?: number
   ids?: string[]
+  id: string
   formId?: string
 }
 // 借用设备类型
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index c17034c..0785ce9 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -26,7 +26,8 @@
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const time = ref()
-const searchQuery = reactive<searchType>({
+const list = ref([]) // 表格数据
+const searchQuery = reactive({
   applyName: '', // 申请名称
   applyNo: '', // 申请编号
   applyPerson: '', // 	申请人
@@ -35,22 +36,13 @@
   createUser: '', // 	创建人
   processResult: '', // 	处置结果
   applyType: props.applyType,
-  time: '', // 	申请日期
+  startTime: '', // 开始时间
+  endTime: '', // 结束时间
   ids: [] as string[],
   limit: 20,
   offset: 1,
   formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
 }) // 查询参数
-watch(() => time.value, (newVal) => {
-  if (newVal) {
-    // searchQuery.noticeStartTime = newVal[0]
-    // searchQuery.noticeEndTime = newVal[1]
-  }
-  else {
-    // searchQuery.noticeStartTime = ''
-    // searchQuery.noticeEndTime = ''
-  }
-})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 // 全部状态的表格数据
@@ -154,7 +146,6 @@
   standard: '',
   extarCss: '',
 })
-const list = ref([]) // 表格数据
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
@@ -233,6 +224,8 @@
 }
 // 搜索
 const search = () => {
+  searchQuery.startTime = time.value[0] as string || ''
+  searchQuery.endTime = time.value[1] as string || ''
   getList()
 }
 // 重置
@@ -241,8 +234,9 @@
   searchQuery.applyNo = ''
   searchQuery.applyPerson = ''
   searchQuery.applyUnit = ''
-  searchQuery.time = ''
-  time.value = ''
+  searchQuery.startTime = ''
+  searchQuery.endTime = ''
+  time.value = ['', '']
   getList()
 }
 // 新增

diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index 94a4246..c30f801 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -35,6 +35,7 @@
     data,
   })
 }
+
 // 设备借用申请编辑
 export function editApply(data: object) {
   return request({
@@ -59,6 +60,14 @@
     data,
   })
 }
+// 设备借用归还提交
+export function returnApply(data: object) {
+  return request({
+    url: '/equipmentApply/returnEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
 // 设备借用申请导出
 export function exportApply(data: object) {
   return request({
diff --git a/src/api/device/standingBook.ts b/src/api/device/standingBook.ts
index 74e0af0..0f47a88 100644
--- a/src/api/device/standingBook.ts
+++ b/src/api/device/standingBook.ts
@@ -58,3 +58,22 @@
     data,
   })
 }
+
+// 通过设备id查询出状态变更记录
+export function queryStateChangeLogList(data: object) {
+  return request({
+    url: '/meter/assets/queryStateChangeLogList',
+    method: 'post',
+    data,
+  })
+}
+
+// 通过设备id查询出使用记录
+export function queryUseLogList(data: object) {
+  return request({
+    url: '/meter/assets/queryUseLogList',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 97d660a..9fd6678 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -8,10 +8,11 @@
   createUser?: string // 	创建人
   processResult?: string // 	处置结果
   applyType: string // 申请类型
-  time: string // 	申请日期
+  time?: string // 	申请日期
   limit?: number
   offset?: number
   ids?: string[]
+  id: string
   formId?: string
 }
 // 借用设备类型
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index c17034c..0785ce9 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -26,7 +26,8 @@
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const time = ref()
-const searchQuery = reactive<searchType>({
+const list = ref([]) // 表格数据
+const searchQuery = reactive({
   applyName: '', // 申请名称
   applyNo: '', // 申请编号
   applyPerson: '', // 	申请人
@@ -35,22 +36,13 @@
   createUser: '', // 	创建人
   processResult: '', // 	处置结果
   applyType: props.applyType,
-  time: '', // 	申请日期
+  startTime: '', // 开始时间
+  endTime: '', // 结束时间
   ids: [] as string[],
   limit: 20,
   offset: 1,
   formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
 }) // 查询参数
-watch(() => time.value, (newVal) => {
-  if (newVal) {
-    // searchQuery.noticeStartTime = newVal[0]
-    // searchQuery.noticeEndTime = newVal[1]
-  }
-  else {
-    // searchQuery.noticeStartTime = ''
-    // searchQuery.noticeEndTime = ''
-  }
-})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 // 全部状态的表格数据
@@ -154,7 +146,6 @@
   standard: '',
   extarCss: '',
 })
-const list = ref([]) // 表格数据
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
@@ -233,6 +224,8 @@
 }
 // 搜索
 const search = () => {
+  searchQuery.startTime = time.value[0] as string || ''
+  searchQuery.endTime = time.value[1] as string || ''
   getList()
 }
 // 重置
@@ -241,8 +234,9 @@
   searchQuery.applyNo = ''
   searchQuery.applyPerson = ''
   searchQuery.applyUnit = ''
-  searchQuery.time = ''
-  time.value = ''
+  searchQuery.startTime = ''
+  searchQuery.endTime = ''
+  time.value = ['', '']
   getList()
 }
 // 新增
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index b277758..544ef34 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,10 +1,12 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
-import { deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
+import { deleteApply, exportApply, getApplyList, returnApply, submitApply } from '@/api/device/borrow'
 import type{ searchType } from '@/views/device/borrow/borrow-interface'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
+
 const props = defineProps({
   status: {
     type: String,
@@ -15,34 +17,32 @@
     required: true,
   },
 })
+
+const StatusMap = {
+  待借用: '1',
+  已借用: '2',
+  已归还: '3',
+}
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const time = ref()
-const searchQuery = reactive<searchType>({
+const searchQuery = reactive({
   applyName: '', // 申请名称
   applyNo: '', // 申请编号
   applyPerson: '', // 	申请人
   applyUnit: '', // 	申请单位
   approvalStatus: '4', // 	审批状态
   createUser: '', // 	创建人
-  processResult: '0', // 	处置结果
+  processResult: StatusMap[props.status], // 	处置结果
   applyType: props.applyType,
-  time: '', // 	申请日期
+  startTime: '', // 开始时间
+  endTime: '', // 结束时间
   ids: [] as string[],
   limit: 20,
   offset: 1,
   formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
 }) // 查询参数
-watch(() => time.value, (newVal) => {
-  if (newVal) {
-    // searchQuery.noticeStartTime = newVal[0]
-    // searchQuery.noticeEndTime = newVal[1]
-  }
-  else {
-    // searchQuery.noticeStartTime = ''
-    // searchQuery.noticeEndTime = ''
-  }
-})
+
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
@@ -92,6 +92,14 @@
     loadingTable.value = false
   })
 }
+
+watch(() => props.status, (newVal) => {
+  if (newVal) {
+    searchQuery.processResult = StatusMap[newVal]
+    getList()
+  }
+})
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -103,13 +111,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
-  // console.log(row, 'row')
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   title: '详情',
-  //   ...row,
-  // })
+const detail = (row: searchType) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -118,17 +120,13 @@
     query: {
       title: '详情',
       name: '设备借用处理',
+      id: row.id,
       // approvalStatusName: row.approvalStatusName,
     },
   })
 }
 // 编辑
-const update = (row) => {
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   title: '编辑',
-  //   ...row,
-  // })
+const update = (row: searchType) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -141,7 +139,7 @@
   })
 }
 // 删除
-const remove = (row) => {
+const remove = (row: searchType) => {
   ElMessageBox.confirm(
     `确认删除${row.applyName}吗？`,
     '提示',
@@ -165,6 +163,8 @@
 }
 // 搜索
 const search = () => {
+  searchQuery.startTime = time.value[0] as string || ''
+  searchQuery.endTime = time.value[1] as string || ''
   getList()
 }
 // 重置
@@ -173,7 +173,9 @@
   searchQuery.applyNo = ''
   searchQuery.applyPerson = ''
   searchQuery.applyUnit = ''
-  searchQuery.time = ''
+  searchQuery.startTime = ''
+  searchQuery.endTime = ''
+  time.value = ['', '']
   getList()
 }
 // 模板下载
@@ -185,7 +187,7 @@
 
 }
 // 借用
-const borrow = (row) => {
+const borrow = (row: searchType) => {
   ElMessageBox.confirm(
     `确认借用${row.applyName}吗？`,
     '提示',
@@ -194,10 +196,20 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
+  ).then((res) => {
+    submitApply({ id: row.id as string }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '借用成功',
+        })
+        getList()
+      }
+    })
+  })
 }
 // 归还
-const returnBtn = (row) => {
+const returnBtn = (row: searchType) => {
   ElMessageBox.confirm(
     `确认归还${row.applyName}吗？`,
     '提示',
@@ -206,14 +218,20 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
+  ).then((res) => {
+    returnApply({ id: row.id as string }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '归还成功',
+        })
+        getList()
+      }
+    })
+  })
 }
 // 新增
 const addBtn = () => {
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   title: '新建',
-  // })
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -225,31 +243,33 @@
     },
   })
 }
+
 // 表格被选中的行
-const selectList = ref([])
+const selectList = ref<searchType[]>([])
 // 表格多选
-const multiSelect = (row) => {
+const multiSelect = (row: searchType[]) => {
   selectList.value = row
 }
+
 // 导出
 const exportExcelBtn = () => {
-  // const loading = ElLoading.service({
-  //   lock: true,
-  //   text: 'Loading',
-  //   background: 'rgba(255, 255, 255, 0.8)',
-  // })
-  // if (selectList.value.length) {
-  //   selectList.value.forEach((item) => {
-  //     searchQuery.ids?.push(item.id as string)
-  //   })
-  // }
-  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
-  //   exportFile(res.data, '固定资产列表')
-  //   loading.close()
-  // searchQuery.ids = []
-  // }).catch((_) => {
-  //   loading.close()
-  // })
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  searchQuery.ids = []
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
+  exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+    exportFile(res.data, '设备借用处理')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
 }
 // 打印
 function printList() {
@@ -328,7 +348,7 @@
         <!-- 表格区域 -->
         <normal-table
           id="print"
-          :data="list" :total="total" :columns="columns as any"
+          :data="list" :total="total" :columns="columns"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"

diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index 94a4246..c30f801 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -35,6 +35,7 @@
     data,
   })
 }
+
 // 设备借用申请编辑
 export function editApply(data: object) {
   return request({
@@ -59,6 +60,14 @@
     data,
   })
 }
+// 设备借用归还提交
+export function returnApply(data: object) {
+  return request({
+    url: '/equipmentApply/returnEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
 // 设备借用申请导出
 export function exportApply(data: object) {
   return request({
diff --git a/src/api/device/standingBook.ts b/src/api/device/standingBook.ts
index 74e0af0..0f47a88 100644
--- a/src/api/device/standingBook.ts
+++ b/src/api/device/standingBook.ts
@@ -58,3 +58,22 @@
     data,
   })
 }
+
+// 通过设备id查询出状态变更记录
+export function queryStateChangeLogList(data: object) {
+  return request({
+    url: '/meter/assets/queryStateChangeLogList',
+    method: 'post',
+    data,
+  })
+}
+
+// 通过设备id查询出使用记录
+export function queryUseLogList(data: object) {
+  return request({
+    url: '/meter/assets/queryUseLogList',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 97d660a..9fd6678 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -8,10 +8,11 @@
   createUser?: string // 	创建人
   processResult?: string // 	处置结果
   applyType: string // 申请类型
-  time: string // 	申请日期
+  time?: string // 	申请日期
   limit?: number
   offset?: number
   ids?: string[]
+  id: string
   formId?: string
 }
 // 借用设备类型
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index c17034c..0785ce9 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -26,7 +26,8 @@
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const time = ref()
-const searchQuery = reactive<searchType>({
+const list = ref([]) // 表格数据
+const searchQuery = reactive({
   applyName: '', // 申请名称
   applyNo: '', // 申请编号
   applyPerson: '', // 	申请人
@@ -35,22 +36,13 @@
   createUser: '', // 	创建人
   processResult: '', // 	处置结果
   applyType: props.applyType,
-  time: '', // 	申请日期
+  startTime: '', // 开始时间
+  endTime: '', // 结束时间
   ids: [] as string[],
   limit: 20,
   offset: 1,
   formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
 }) // 查询参数
-watch(() => time.value, (newVal) => {
-  if (newVal) {
-    // searchQuery.noticeStartTime = newVal[0]
-    // searchQuery.noticeEndTime = newVal[1]
-  }
-  else {
-    // searchQuery.noticeStartTime = ''
-    // searchQuery.noticeEndTime = ''
-  }
-})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 // 全部状态的表格数据
@@ -154,7 +146,6 @@
   standard: '',
   extarCss: '',
 })
-const list = ref([]) // 表格数据
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
@@ -233,6 +224,8 @@
 }
 // 搜索
 const search = () => {
+  searchQuery.startTime = time.value[0] as string || ''
+  searchQuery.endTime = time.value[1] as string || ''
   getList()
 }
 // 重置
@@ -241,8 +234,9 @@
   searchQuery.applyNo = ''
   searchQuery.applyPerson = ''
   searchQuery.applyUnit = ''
-  searchQuery.time = ''
-  time.value = ''
+  searchQuery.startTime = ''
+  searchQuery.endTime = ''
+  time.value = ['', '']
   getList()
 }
 // 新增
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index b277758..544ef34 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,10 +1,12 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
-import { deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
+import { deleteApply, exportApply, getApplyList, returnApply, submitApply } from '@/api/device/borrow'
 import type{ searchType } from '@/views/device/borrow/borrow-interface'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
+
 const props = defineProps({
   status: {
     type: String,
@@ -15,34 +17,32 @@
     required: true,
   },
 })
+
+const StatusMap = {
+  待借用: '1',
+  已借用: '2',
+  已归还: '3',
+}
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const time = ref()
-const searchQuery = reactive<searchType>({
+const searchQuery = reactive({
   applyName: '', // 申请名称
   applyNo: '', // 申请编号
   applyPerson: '', // 	申请人
   applyUnit: '', // 	申请单位
   approvalStatus: '4', // 	审批状态
   createUser: '', // 	创建人
-  processResult: '0', // 	处置结果
+  processResult: StatusMap[props.status], // 	处置结果
   applyType: props.applyType,
-  time: '', // 	申请日期
+  startTime: '', // 开始时间
+  endTime: '', // 结束时间
   ids: [] as string[],
   limit: 20,
   offset: 1,
   formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
 }) // 查询参数
-watch(() => time.value, (newVal) => {
-  if (newVal) {
-    // searchQuery.noticeStartTime = newVal[0]
-    // searchQuery.noticeEndTime = newVal[1]
-  }
-  else {
-    // searchQuery.noticeStartTime = ''
-    // searchQuery.noticeEndTime = ''
-  }
-})
+
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
@@ -92,6 +92,14 @@
     loadingTable.value = false
   })
 }
+
+watch(() => props.status, (newVal) => {
+  if (newVal) {
+    searchQuery.processResult = StatusMap[newVal]
+    getList()
+  }
+})
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -103,13 +111,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
-  // console.log(row, 'row')
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   title: '详情',
-  //   ...row,
-  // })
+const detail = (row: searchType) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -118,17 +120,13 @@
     query: {
       title: '详情',
       name: '设备借用处理',
+      id: row.id,
       // approvalStatusName: row.approvalStatusName,
     },
   })
 }
 // 编辑
-const update = (row) => {
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   title: '编辑',
-  //   ...row,
-  // })
+const update = (row: searchType) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -141,7 +139,7 @@
   })
 }
 // 删除
-const remove = (row) => {
+const remove = (row: searchType) => {
   ElMessageBox.confirm(
     `确认删除${row.applyName}吗？`,
     '提示',
@@ -165,6 +163,8 @@
 }
 // 搜索
 const search = () => {
+  searchQuery.startTime = time.value[0] as string || ''
+  searchQuery.endTime = time.value[1] as string || ''
   getList()
 }
 // 重置
@@ -173,7 +173,9 @@
   searchQuery.applyNo = ''
   searchQuery.applyPerson = ''
   searchQuery.applyUnit = ''
-  searchQuery.time = ''
+  searchQuery.startTime = ''
+  searchQuery.endTime = ''
+  time.value = ['', '']
   getList()
 }
 // 模板下载
@@ -185,7 +187,7 @@
 
 }
 // 借用
-const borrow = (row) => {
+const borrow = (row: searchType) => {
   ElMessageBox.confirm(
     `确认借用${row.applyName}吗？`,
     '提示',
@@ -194,10 +196,20 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
+  ).then((res) => {
+    submitApply({ id: row.id as string }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '借用成功',
+        })
+        getList()
+      }
+    })
+  })
 }
 // 归还
-const returnBtn = (row) => {
+const returnBtn = (row: searchType) => {
   ElMessageBox.confirm(
     `确认归还${row.applyName}吗？`,
     '提示',
@@ -206,14 +218,20 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
+  ).then((res) => {
+    returnApply({ id: row.id as string }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '归还成功',
+        })
+        getList()
+      }
+    })
+  })
 }
 // 新增
 const addBtn = () => {
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   title: '新建',
-  // })
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -225,31 +243,33 @@
     },
   })
 }
+
 // 表格被选中的行
-const selectList = ref([])
+const selectList = ref<searchType[]>([])
 // 表格多选
-const multiSelect = (row) => {
+const multiSelect = (row: searchType[]) => {
   selectList.value = row
 }
+
 // 导出
 const exportExcelBtn = () => {
-  // const loading = ElLoading.service({
-  //   lock: true,
-  //   text: 'Loading',
-  //   background: 'rgba(255, 255, 255, 0.8)',
-  // })
-  // if (selectList.value.length) {
-  //   selectList.value.forEach((item) => {
-  //     searchQuery.ids?.push(item.id as string)
-  //   })
-  // }
-  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
-  //   exportFile(res.data, '固定资产列表')
-  //   loading.close()
-  // searchQuery.ids = []
-  // }).catch((_) => {
-  //   loading.close()
-  // })
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  searchQuery.ids = []
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
+  exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+    exportFile(res.data, '设备借用处理')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
 }
 // 打印
 function printList() {
@@ -328,7 +348,7 @@
         <!-- 表格区域 -->
         <normal-table
           id="print"
-          :data="list" :total="total" :columns="columns as any"
+          :data="list" :total="total" :columns="columns"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index ff7153c..9cd3c83 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -3,7 +3,7 @@
 import type { certificate, checkedRecord, fixedAssetsType, menuType, stateChangedRecord, usedRecord } from '../standingBook-interface'
 import baseInfo from './baseInfo.vue' // 基本信息
 import TemplateTable from './templateTable.vue'
-import { assetsDetailApi } from '@/api/device/standingBook'
+import { assetsDetailApi, queryStateChangeLogList, queryUseLogList } from '@/api/device/standingBook'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 
 const $router = useRouter()
@@ -23,6 +23,7 @@
   { name: '使用记录', comp: TemplateTable },
   { name: '检定证书', comp: TemplateTable },
 ])
+
 const current = ref('周检记录')
 
 // 点击取消
@@ -67,47 +68,49 @@
 const checkedRecordsLoading = ref(false)
 function fetchCheckedRecords(query = { ...queryParams }) {
   checkedRecordsLoading.value = true
-  checkedRecords.value = [{
-    text: 'xx',
-  }]
+  checkedRecords.value = []
   checkedRecordsLoading.value = false
 }
 
 // 状态变更记录
 const stateChangedRecordsColumns = ref<TableColumn[]>(
   [
-    { text: '状态类型', value: 'deviceStatusName', align: 'center' },
-    { text: '开始日期', value: 'startTime', align: 'center' },
-    { text: '结束日期', value: 'endTime', align: 'center' },
-    { text: '申请人', value: 'createUserName', align: 'center' },
+    { text: '状态类型', value: 'managerStateName', align: 'center' },
+    { text: '开始日期', value: 'startDate', align: 'center' },
+    { text: '结束日期', value: 'endDate', align: 'center' },
+    { text: '申请人', value: 'applyPerson', align: 'center' },
   ],
 )
 const stateChangedLoading = ref(false)
 const stateChangedRecords = ref<stateChangedRecord[]>([])
 function fetchStateChangedRecords(query = { ...queryParams }) {
   stateChangedLoading.value = true
-  stateChangedRecords.value = [
-    { deviceStatusName: '闲置', startTime: '2022-10-12 08:32:25', endTime: '至今', createUserName: '张三' },
-  ]
+  queryStateChangeLogList({ id: id.value }).then((res) => {
+    if (res.code === 200) {
+      stateChangedRecords.value = res.data
+    }
+  })
   stateChangedLoading.value = false
 }
 // 获取使用记录
 const useRecordsColumns = ref<TableColumn[]>(
   [
-    { text: '使用人', value: '', align: 'center' },
-    { text: '使用部门', value: '', align: 'center' },
-    { text: '使用类型', value: '', align: 'center' },
-    { text: '使用开始日期', value: '', align: 'center' },
-    { text: '使用结束日期', value: '', align: 'center' },
+    { text: '使用人', value: 'usePersonName', align: 'center' },
+    { text: '使用部门', value: 'useDept', align: 'center' },
+    { text: '使用类型', value: 'useType', align: 'center' },
+    { text: '使用开始日期', value: 'startDate', align: 'center' },
+    { text: '使用结束日期', value: 'endDate', align: 'center' },
   ],
 )
 const useRecordsLoading = ref(false)
 const useRecords = ref<usedRecord[]>([])
 function fetchUseRecords(query = { ...queryParams }) {
   useRecordsLoading.value = true
-  useRecords.value = [{
-    text: 'xx',
-  }]
+  queryUseLogList({ id: id.value }).then((res) => {
+    if (res.code === 200) {
+      useRecords.value = res.data
+    }
+  })
   useRecordsLoading.value = false
 }
 // 获取检定证书记录
@@ -138,7 +141,7 @@
     getInfo()
     if (pageType.value === 'detail' && name.value !== '固定资产') {
       fetchCheckedRecords()
-      fetchUseRecords()
+      fetchStateChangedRecords()
       fetchUseRecords()
       fetchCertificationList()
     }
@@ -171,10 +174,10 @@
           </el-radio-button>
         </el-radio-group>
       </template>
-      <template-table v-if="current === '周检记录'" :columns="checkedRecordsColumns" :list="checkedRecords" :loading="checkedRecordsLoading" @change-page="fetchCheckedRecords" />
-      <template-table v-if="current === '状态变更记录'" :columns="stateChangedRecordsColumns" :list="stateChangedRecords" :loading="stateChangedLoading" @change-page="fetchStateChangedRecords" />
-      <template-table v-if="current === '使用记录'" :columns="useRecordsColumns" :list="useRecords" :loading="useRecordsLoading" @change-page="fetchUseRecords" />
-      <template-table v-if="current === '检定证书'" :columns="certificationListColumns" :list="certificationList" :loading="certificationLoading" @change-page="fetchCertificationList" />
+      <template-table v-if="current === '周检记录'" :columns="checkedRecordsColumns" :list="checkedRecords" :loading="checkedRecordsLoading" />
+      <template-table v-if="current === '状态变更记录'" :columns="stateChangedRecordsColumns" :list="stateChangedRecords" :loading="stateChangedLoading" />
+      <template-table v-if="current === '使用记录'" :columns="useRecordsColumns" :list="useRecords" :loading="useRecordsLoading" />
+      <template-table v-if="current === '检定证书'" :columns="certificationListColumns" :list="certificationList" :loading="certificationLoading" />
     </detail-block-switch>
   </app-container>
 </template>

diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index 94a4246..c30f801 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -35,6 +35,7 @@
     data,
   })
 }
+
 // 设备借用申请编辑
 export function editApply(data: object) {
   return request({
@@ -59,6 +60,14 @@
     data,
   })
 }
+// 设备借用归还提交
+export function returnApply(data: object) {
+  return request({
+    url: '/equipmentApply/returnEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
 // 设备借用申请导出
 export function exportApply(data: object) {
   return request({
diff --git a/src/api/device/standingBook.ts b/src/api/device/standingBook.ts
index 74e0af0..0f47a88 100644
--- a/src/api/device/standingBook.ts
+++ b/src/api/device/standingBook.ts
@@ -58,3 +58,22 @@
     data,
   })
 }
+
+// 通过设备id查询出状态变更记录
+export function queryStateChangeLogList(data: object) {
+  return request({
+    url: '/meter/assets/queryStateChangeLogList',
+    method: 'post',
+    data,
+  })
+}
+
+// 通过设备id查询出使用记录
+export function queryUseLogList(data: object) {
+  return request({
+    url: '/meter/assets/queryUseLogList',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 97d660a..9fd6678 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -8,10 +8,11 @@
   createUser?: string // 	创建人
   processResult?: string // 	处置结果
   applyType: string // 申请类型
-  time: string // 	申请日期
+  time?: string // 	申请日期
   limit?: number
   offset?: number
   ids?: string[]
+  id: string
   formId?: string
 }
 // 借用设备类型
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index c17034c..0785ce9 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -26,7 +26,8 @@
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const time = ref()
-const searchQuery = reactive<searchType>({
+const list = ref([]) // 表格数据
+const searchQuery = reactive({
   applyName: '', // 申请名称
   applyNo: '', // 申请编号
   applyPerson: '', // 	申请人
@@ -35,22 +36,13 @@
   createUser: '', // 	创建人
   processResult: '', // 	处置结果
   applyType: props.applyType,
-  time: '', // 	申请日期
+  startTime: '', // 开始时间
+  endTime: '', // 结束时间
   ids: [] as string[],
   limit: 20,
   offset: 1,
   formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
 }) // 查询参数
-watch(() => time.value, (newVal) => {
-  if (newVal) {
-    // searchQuery.noticeStartTime = newVal[0]
-    // searchQuery.noticeEndTime = newVal[1]
-  }
-  else {
-    // searchQuery.noticeStartTime = ''
-    // searchQuery.noticeEndTime = ''
-  }
-})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 // 全部状态的表格数据
@@ -154,7 +146,6 @@
   standard: '',
   extarCss: '',
 })
-const list = ref([]) // 表格数据
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
@@ -233,6 +224,8 @@
 }
 // 搜索
 const search = () => {
+  searchQuery.startTime = time.value[0] as string || ''
+  searchQuery.endTime = time.value[1] as string || ''
   getList()
 }
 // 重置
@@ -241,8 +234,9 @@
   searchQuery.applyNo = ''
   searchQuery.applyPerson = ''
   searchQuery.applyUnit = ''
-  searchQuery.time = ''
-  time.value = ''
+  searchQuery.startTime = ''
+  searchQuery.endTime = ''
+  time.value = ['', '']
   getList()
 }
 // 新增
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index b277758..544ef34 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,10 +1,12 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
-import { deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
+import { deleteApply, exportApply, getApplyList, returnApply, submitApply } from '@/api/device/borrow'
 import type{ searchType } from '@/views/device/borrow/borrow-interface'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
+
 const props = defineProps({
   status: {
     type: String,
@@ -15,34 +17,32 @@
     required: true,
   },
 })
+
+const StatusMap = {
+  待借用: '1',
+  已借用: '2',
+  已归还: '3',
+}
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const time = ref()
-const searchQuery = reactive<searchType>({
+const searchQuery = reactive({
   applyName: '', // 申请名称
   applyNo: '', // 申请编号
   applyPerson: '', // 	申请人
   applyUnit: '', // 	申请单位
   approvalStatus: '4', // 	审批状态
   createUser: '', // 	创建人
-  processResult: '0', // 	处置结果
+  processResult: StatusMap[props.status], // 	处置结果
   applyType: props.applyType,
-  time: '', // 	申请日期
+  startTime: '', // 开始时间
+  endTime: '', // 结束时间
   ids: [] as string[],
   limit: 20,
   offset: 1,
   formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
 }) // 查询参数
-watch(() => time.value, (newVal) => {
-  if (newVal) {
-    // searchQuery.noticeStartTime = newVal[0]
-    // searchQuery.noticeEndTime = newVal[1]
-  }
-  else {
-    // searchQuery.noticeStartTime = ''
-    // searchQuery.noticeEndTime = ''
-  }
-})
+
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
@@ -92,6 +92,14 @@
     loadingTable.value = false
   })
 }
+
+watch(() => props.status, (newVal) => {
+  if (newVal) {
+    searchQuery.processResult = StatusMap[newVal]
+    getList()
+  }
+})
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -103,13 +111,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
-  // console.log(row, 'row')
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   title: '详情',
-  //   ...row,
-  // })
+const detail = (row: searchType) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -118,17 +120,13 @@
     query: {
       title: '详情',
       name: '设备借用处理',
+      id: row.id,
       // approvalStatusName: row.approvalStatusName,
     },
   })
 }
 // 编辑
-const update = (row) => {
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   title: '编辑',
-  //   ...row,
-  // })
+const update = (row: searchType) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -141,7 +139,7 @@
   })
 }
 // 删除
-const remove = (row) => {
+const remove = (row: searchType) => {
   ElMessageBox.confirm(
     `确认删除${row.applyName}吗？`,
     '提示',
@@ -165,6 +163,8 @@
 }
 // 搜索
 const search = () => {
+  searchQuery.startTime = time.value[0] as string || ''
+  searchQuery.endTime = time.value[1] as string || ''
   getList()
 }
 // 重置
@@ -173,7 +173,9 @@
   searchQuery.applyNo = ''
   searchQuery.applyPerson = ''
   searchQuery.applyUnit = ''
-  searchQuery.time = ''
+  searchQuery.startTime = ''
+  searchQuery.endTime = ''
+  time.value = ['', '']
   getList()
 }
 // 模板下载
@@ -185,7 +187,7 @@
 
 }
 // 借用
-const borrow = (row) => {
+const borrow = (row: searchType) => {
   ElMessageBox.confirm(
     `确认借用${row.applyName}吗？`,
     '提示',
@@ -194,10 +196,20 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
+  ).then((res) => {
+    submitApply({ id: row.id as string }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '借用成功',
+        })
+        getList()
+      }
+    })
+  })
 }
 // 归还
-const returnBtn = (row) => {
+const returnBtn = (row: searchType) => {
   ElMessageBox.confirm(
     `确认归还${row.applyName}吗？`,
     '提示',
@@ -206,14 +218,20 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
+  ).then((res) => {
+    returnApply({ id: row.id as string }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '归还成功',
+        })
+        getList()
+      }
+    })
+  })
 }
 // 新增
 const addBtn = () => {
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   title: '新建',
-  // })
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -225,31 +243,33 @@
     },
   })
 }
+
 // 表格被选中的行
-const selectList = ref([])
+const selectList = ref<searchType[]>([])
 // 表格多选
-const multiSelect = (row) => {
+const multiSelect = (row: searchType[]) => {
   selectList.value = row
 }
+
 // 导出
 const exportExcelBtn = () => {
-  // const loading = ElLoading.service({
-  //   lock: true,
-  //   text: 'Loading',
-  //   background: 'rgba(255, 255, 255, 0.8)',
-  // })
-  // if (selectList.value.length) {
-  //   selectList.value.forEach((item) => {
-  //     searchQuery.ids?.push(item.id as string)
-  //   })
-  // }
-  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
-  //   exportFile(res.data, '固定资产列表')
-  //   loading.close()
-  // searchQuery.ids = []
-  // }).catch((_) => {
-  //   loading.close()
-  // })
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  searchQuery.ids = []
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
+  exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+    exportFile(res.data, '设备借用处理')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
 }
 // 打印
 function printList() {
@@ -328,7 +348,7 @@
         <!-- 表格区域 -->
         <normal-table
           id="print"
-          :data="list" :total="total" :columns="columns as any"
+          :data="list" :total="total" :columns="columns"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index ff7153c..9cd3c83 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -3,7 +3,7 @@
 import type { certificate, checkedRecord, fixedAssetsType, menuType, stateChangedRecord, usedRecord } from '../standingBook-interface'
 import baseInfo from './baseInfo.vue' // 基本信息
 import TemplateTable from './templateTable.vue'
-import { assetsDetailApi } from '@/api/device/standingBook'
+import { assetsDetailApi, queryStateChangeLogList, queryUseLogList } from '@/api/device/standingBook'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 
 const $router = useRouter()
@@ -23,6 +23,7 @@
   { name: '使用记录', comp: TemplateTable },
   { name: '检定证书', comp: TemplateTable },
 ])
+
 const current = ref('周检记录')
 
 // 点击取消
@@ -67,47 +68,49 @@
 const checkedRecordsLoading = ref(false)
 function fetchCheckedRecords(query = { ...queryParams }) {
   checkedRecordsLoading.value = true
-  checkedRecords.value = [{
-    text: 'xx',
-  }]
+  checkedRecords.value = []
   checkedRecordsLoading.value = false
 }
 
 // 状态变更记录
 const stateChangedRecordsColumns = ref<TableColumn[]>(
   [
-    { text: '状态类型', value: 'deviceStatusName', align: 'center' },
-    { text: '开始日期', value: 'startTime', align: 'center' },
-    { text: '结束日期', value: 'endTime', align: 'center' },
-    { text: '申请人', value: 'createUserName', align: 'center' },
+    { text: '状态类型', value: 'managerStateName', align: 'center' },
+    { text: '开始日期', value: 'startDate', align: 'center' },
+    { text: '结束日期', value: 'endDate', align: 'center' },
+    { text: '申请人', value: 'applyPerson', align: 'center' },
   ],
 )
 const stateChangedLoading = ref(false)
 const stateChangedRecords = ref<stateChangedRecord[]>([])
 function fetchStateChangedRecords(query = { ...queryParams }) {
   stateChangedLoading.value = true
-  stateChangedRecords.value = [
-    { deviceStatusName: '闲置', startTime: '2022-10-12 08:32:25', endTime: '至今', createUserName: '张三' },
-  ]
+  queryStateChangeLogList({ id: id.value }).then((res) => {
+    if (res.code === 200) {
+      stateChangedRecords.value = res.data
+    }
+  })
   stateChangedLoading.value = false
 }
 // 获取使用记录
 const useRecordsColumns = ref<TableColumn[]>(
   [
-    { text: '使用人', value: '', align: 'center' },
-    { text: '使用部门', value: '', align: 'center' },
-    { text: '使用类型', value: '', align: 'center' },
-    { text: '使用开始日期', value: '', align: 'center' },
-    { text: '使用结束日期', value: '', align: 'center' },
+    { text: '使用人', value: 'usePersonName', align: 'center' },
+    { text: '使用部门', value: 'useDept', align: 'center' },
+    { text: '使用类型', value: 'useType', align: 'center' },
+    { text: '使用开始日期', value: 'startDate', align: 'center' },
+    { text: '使用结束日期', value: 'endDate', align: 'center' },
   ],
 )
 const useRecordsLoading = ref(false)
 const useRecords = ref<usedRecord[]>([])
 function fetchUseRecords(query = { ...queryParams }) {
   useRecordsLoading.value = true
-  useRecords.value = [{
-    text: 'xx',
-  }]
+  queryUseLogList({ id: id.value }).then((res) => {
+    if (res.code === 200) {
+      useRecords.value = res.data
+    }
+  })
   useRecordsLoading.value = false
 }
 // 获取检定证书记录
@@ -138,7 +141,7 @@
     getInfo()
     if (pageType.value === 'detail' && name.value !== '固定资产') {
       fetchCheckedRecords()
-      fetchUseRecords()
+      fetchStateChangedRecords()
       fetchUseRecords()
       fetchCertificationList()
     }
@@ -171,10 +174,10 @@
           </el-radio-button>
         </el-radio-group>
       </template>
-      <template-table v-if="current === '周检记录'" :columns="checkedRecordsColumns" :list="checkedRecords" :loading="checkedRecordsLoading" @change-page="fetchCheckedRecords" />
-      <template-table v-if="current === '状态变更记录'" :columns="stateChangedRecordsColumns" :list="stateChangedRecords" :loading="stateChangedLoading" @change-page="fetchStateChangedRecords" />
-      <template-table v-if="current === '使用记录'" :columns="useRecordsColumns" :list="useRecords" :loading="useRecordsLoading" @change-page="fetchUseRecords" />
-      <template-table v-if="current === '检定证书'" :columns="certificationListColumns" :list="certificationList" :loading="certificationLoading" @change-page="fetchCertificationList" />
+      <template-table v-if="current === '周检记录'" :columns="checkedRecordsColumns" :list="checkedRecords" :loading="checkedRecordsLoading" />
+      <template-table v-if="current === '状态变更记录'" :columns="stateChangedRecordsColumns" :list="stateChangedRecords" :loading="stateChangedLoading" />
+      <template-table v-if="current === '使用记录'" :columns="useRecordsColumns" :list="useRecords" :loading="useRecordsLoading" />
+      <template-table v-if="current === '检定证书'" :columns="certificationListColumns" :list="certificationList" :loading="certificationLoading" />
     </detail-block-switch>
   </app-container>
 </template>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 3c64594..6c6ed79 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -12,10 +12,11 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
-import { addApply, deleteApply, detailApply, editApply } from '@/api/device/borrow'
+import { addApply, deleteApply, detailApply, editApply, submitApply } from '@/api/device/borrow'
 import { addStatus, detailStatus, updateStatus } from '@/api/device/stateManage'
 import type { borrowDeviceType } from '@/views/device/borrow/borrow-interface'
 import useUserStore from '@/store/modules/user'
+import { SCHEDULE } from '@/utils/scheduleDict'
 
 const userInfo = useUserStore()
 const $router = useRouter()
@@ -234,26 +235,39 @@
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      if (borrowList.value.length) {
+      if (borrowList.value.length > 0) {
         // 整理数据
         delete ruleForm2.value.equipmentInfoList // 去除显示的列表
         ruleForm2.value.applyType = '2'
         const params = {
           ...ruleForm2.value,
           equipmentList: borrowList.value.map(item => ({
-            id: ruleForm2.value.id,
             equipmentId: item.id,
           })),
-          // applyType: $route.query.applyType,
         }
-        editApply(params).then((res) => {
-          if (res.code === 200) {
-            // 成功
-            ElMessage.success('操作成功')
-            $router.go(-1)
-          }
-        })
+        if (title.value === '新建') {
+          addApply(params).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+            }
+          })
+        }
+        else {
+          editApply(params).then((res) => {
+            if (res.code === 200) {
+              // 成功
+              ElMessage.success('操作成功')
+              $router.go(-1)
+            }
+          })
+        }
       }
+      else {
+        ElMessage.warning('请选择借用设备列表!')
+      }
+    }
+    else {
+      console.log('表单校验不通过')
     }
   })
 }
@@ -263,64 +277,33 @@
   if (isDevice.value) {
     //  设备借用
     if (!formEl2) { return }
-    await formEl2.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-          '确认提交吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          if (borrowList.value.length) {
-            // 整理数据
-            delete ruleForm2.value.equipmentInfoList // 去除显示的列表
+    if (ruleForm2.value.id) {
+      await formEl2.validate((valid, fields) => {
+        if (valid) {
+          ElMessageBox.confirm(
+            '确认提交吗？',
+            '提示',
+            {
+              confirmButtonText: '确认',
+              cancelButtonText: '取消',
+              type: 'warning',
+            },
+          ).then(() => {
             const params = {
-              ...ruleForm2.value,
-              equipmentList: borrowList.value.map(item => ({
-                id: ruleForm2.value.id,
-                equipmentId: item.id,
-              })),
-              applyType: $route.query.applyType || '1',
+              id: ruleForm2.value.id,
+              formId: SCHEDULE.DEVICE_BORROW_APPROVAL, // 表单id
             }
-            // title.value === '新建'
-
-            // ? addApply(params) : editApply(params)
-            //   .then((res) => {
-            //     console.log(res)
-            //     if (res.code === 200) {
-            //       // 成功
-            //       ElMessage.success('操作成功')
-            //       $router.go(-1)
-            //     }
-            //   })
-            if (title.value === '新建') {
-              addApply(params).then((res) => {
-                if (res.code === 200) {
-                  // 成功
-                  ElMessage.success('操作成功')
-                  $router.go(-1)
-                }
-              })
-            }
-            else {
-              editApply(params).then((res) => {
-                if (res.code === 200) {
-                  // 成功
-                  ElMessage.success('操作成功')
-                  $router.go(-1)
-                }
-              })
-            }
-          }
-          else {
-            ElMessage.warning('请先添加借用设备')
-          }
-        })
-      }
-    })
+            submitApply(params).then(() => {
+              ElMessage.success('操作成功!')
+              $router.go(-1)
+            })
+          })
+        }
+      })
+    }
+    else {
+      ElMessage.info('请先保存再提交！')
+    }
   }
   else {
   // 状态管理
@@ -635,7 +618,7 @@
     <approve-action ref="approveRef" />
     <detail-page :title="`${name}-${title}`">
       <template #btns>
-        <el-button v-if="title !== '详情' && name.search('借用') === -1" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
+        <el-button v-if="title !== '详情' && name.search('借用') !== -1" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
           提交
         </el-button>
         <el-button v-if="title !== '详情' && name.search('借用') !== -1" type="primary" @click="saveForm(ruleFormRef2)">

diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index 94a4246..c30f801 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -35,6 +35,7 @@
     data,
   })
 }
+
 // 设备借用申请编辑
 export function editApply(data: object) {
   return request({
@@ -59,6 +60,14 @@
     data,
   })
 }
+// 设备借用归还提交
+export function returnApply(data: object) {
+  return request({
+    url: '/equipmentApply/returnEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
 // 设备借用申请导出
 export function exportApply(data: object) {
   return request({
diff --git a/src/api/device/standingBook.ts b/src/api/device/standingBook.ts
index 74e0af0..0f47a88 100644
--- a/src/api/device/standingBook.ts
+++ b/src/api/device/standingBook.ts
@@ -58,3 +58,22 @@
     data,
   })
 }
+
+// 通过设备id查询出状态变更记录
+export function queryStateChangeLogList(data: object) {
+  return request({
+    url: '/meter/assets/queryStateChangeLogList',
+    method: 'post',
+    data,
+  })
+}
+
+// 通过设备id查询出使用记录
+export function queryUseLogList(data: object) {
+  return request({
+    url: '/meter/assets/queryUseLogList',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 97d660a..9fd6678 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -8,10 +8,11 @@
   createUser?: string // 	创建人
   processResult?: string // 	处置结果
   applyType: string // 申请类型
-  time: string // 	申请日期
+  time?: string // 	申请日期
   limit?: number
   offset?: number
   ids?: string[]
+  id: string
   formId?: string
 }
 // 借用设备类型
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index c17034c..0785ce9 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -26,7 +26,8 @@
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const time = ref()
-const searchQuery = reactive<searchType>({
+const list = ref([]) // 表格数据
+const searchQuery = reactive({
   applyName: '', // 申请名称
   applyNo: '', // 申请编号
   applyPerson: '', // 	申请人
@@ -35,22 +36,13 @@
   createUser: '', // 	创建人
   processResult: '', // 	处置结果
   applyType: props.applyType,
-  time: '', // 	申请日期
+  startTime: '', // 开始时间
+  endTime: '', // 结束时间
   ids: [] as string[],
   limit: 20,
   offset: 1,
   formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
 }) // 查询参数
-watch(() => time.value, (newVal) => {
-  if (newVal) {
-    // searchQuery.noticeStartTime = newVal[0]
-    // searchQuery.noticeEndTime = newVal[1]
-  }
-  else {
-    // searchQuery.noticeStartTime = ''
-    // searchQuery.noticeEndTime = ''
-  }
-})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 // 全部状态的表格数据
@@ -154,7 +146,6 @@
   standard: '',
   extarCss: '',
 })
-const list = ref([]) // 表格数据
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
@@ -233,6 +224,8 @@
 }
 // 搜索
 const search = () => {
+  searchQuery.startTime = time.value[0] as string || ''
+  searchQuery.endTime = time.value[1] as string || ''
   getList()
 }
 // 重置
@@ -241,8 +234,9 @@
   searchQuery.applyNo = ''
   searchQuery.applyPerson = ''
   searchQuery.applyUnit = ''
-  searchQuery.time = ''
-  time.value = ''
+  searchQuery.startTime = ''
+  searchQuery.endTime = ''
+  time.value = ['', '']
   getList()
 }
 // 新增
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index b277758..544ef34 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,10 +1,12 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
-import { deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
+import { deleteApply, exportApply, getApplyList, returnApply, submitApply } from '@/api/device/borrow'
 import type{ searchType } from '@/views/device/borrow/borrow-interface'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
+
 const props = defineProps({
   status: {
     type: String,
@@ -15,34 +17,32 @@
     required: true,
   },
 })
+
+const StatusMap = {
+  待借用: '1',
+  已借用: '2',
+  已归还: '3',
+}
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const time = ref()
-const searchQuery = reactive<searchType>({
+const searchQuery = reactive({
   applyName: '', // 申请名称
   applyNo: '', // 申请编号
   applyPerson: '', // 	申请人
   applyUnit: '', // 	申请单位
   approvalStatus: '4', // 	审批状态
   createUser: '', // 	创建人
-  processResult: '0', // 	处置结果
+  processResult: StatusMap[props.status], // 	处置结果
   applyType: props.applyType,
-  time: '', // 	申请日期
+  startTime: '', // 开始时间
+  endTime: '', // 结束时间
   ids: [] as string[],
   limit: 20,
   offset: 1,
   formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
 }) // 查询参数
-watch(() => time.value, (newVal) => {
-  if (newVal) {
-    // searchQuery.noticeStartTime = newVal[0]
-    // searchQuery.noticeEndTime = newVal[1]
-  }
-  else {
-    // searchQuery.noticeStartTime = ''
-    // searchQuery.noticeEndTime = ''
-  }
-})
+
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
@@ -92,6 +92,14 @@
     loadingTable.value = false
   })
 }
+
+watch(() => props.status, (newVal) => {
+  if (newVal) {
+    searchQuery.processResult = StatusMap[newVal]
+    getList()
+  }
+})
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -103,13 +111,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
-  // console.log(row, 'row')
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   title: '详情',
-  //   ...row,
-  // })
+const detail = (row: searchType) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -118,17 +120,13 @@
     query: {
       title: '详情',
       name: '设备借用处理',
+      id: row.id,
       // approvalStatusName: row.approvalStatusName,
     },
   })
 }
 // 编辑
-const update = (row) => {
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   title: '编辑',
-  //   ...row,
-  // })
+const update = (row: searchType) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -141,7 +139,7 @@
   })
 }
 // 删除
-const remove = (row) => {
+const remove = (row: searchType) => {
   ElMessageBox.confirm(
     `确认删除${row.applyName}吗？`,
     '提示',
@@ -165,6 +163,8 @@
 }
 // 搜索
 const search = () => {
+  searchQuery.startTime = time.value[0] as string || ''
+  searchQuery.endTime = time.value[1] as string || ''
   getList()
 }
 // 重置
@@ -173,7 +173,9 @@
   searchQuery.applyNo = ''
   searchQuery.applyPerson = ''
   searchQuery.applyUnit = ''
-  searchQuery.time = ''
+  searchQuery.startTime = ''
+  searchQuery.endTime = ''
+  time.value = ['', '']
   getList()
 }
 // 模板下载
@@ -185,7 +187,7 @@
 
 }
 // 借用
-const borrow = (row) => {
+const borrow = (row: searchType) => {
   ElMessageBox.confirm(
     `确认借用${row.applyName}吗？`,
     '提示',
@@ -194,10 +196,20 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
+  ).then((res) => {
+    submitApply({ id: row.id as string }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '借用成功',
+        })
+        getList()
+      }
+    })
+  })
 }
 // 归还
-const returnBtn = (row) => {
+const returnBtn = (row: searchType) => {
   ElMessageBox.confirm(
     `确认归还${row.applyName}吗？`,
     '提示',
@@ -206,14 +218,20 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
+  ).then((res) => {
+    returnApply({ id: row.id as string }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '归还成功',
+        })
+        getList()
+      }
+    })
+  })
 }
 // 新增
 const addBtn = () => {
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   title: '新建',
-  // })
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -225,31 +243,33 @@
     },
   })
 }
+
 // 表格被选中的行
-const selectList = ref([])
+const selectList = ref<searchType[]>([])
 // 表格多选
-const multiSelect = (row) => {
+const multiSelect = (row: searchType[]) => {
   selectList.value = row
 }
+
 // 导出
 const exportExcelBtn = () => {
-  // const loading = ElLoading.service({
-  //   lock: true,
-  //   text: 'Loading',
-  //   background: 'rgba(255, 255, 255, 0.8)',
-  // })
-  // if (selectList.value.length) {
-  //   selectList.value.forEach((item) => {
-  //     searchQuery.ids?.push(item.id as string)
-  //   })
-  // }
-  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
-  //   exportFile(res.data, '固定资产列表')
-  //   loading.close()
-  // searchQuery.ids = []
-  // }).catch((_) => {
-  //   loading.close()
-  // })
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  searchQuery.ids = []
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
+  exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+    exportFile(res.data, '设备借用处理')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
 }
 // 打印
 function printList() {
@@ -328,7 +348,7 @@
         <!-- 表格区域 -->
         <normal-table
           id="print"
-          :data="list" :total="total" :columns="columns as any"
+          :data="list" :total="total" :columns="columns"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index ff7153c..9cd3c83 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -3,7 +3,7 @@
 import type { certificate, checkedRecord, fixedAssetsType, menuType, stateChangedRecord, usedRecord } from '../standingBook-interface'
 import baseInfo from './baseInfo.vue' // 基本信息
 import TemplateTable from './templateTable.vue'
-import { assetsDetailApi } from '@/api/device/standingBook'
+import { assetsDetailApi, queryStateChangeLogList, queryUseLogList } from '@/api/device/standingBook'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 
 const $router = useRouter()
@@ -23,6 +23,7 @@
   { name: '使用记录', comp: TemplateTable },
   { name: '检定证书', comp: TemplateTable },
 ])
+
 const current = ref('周检记录')
 
 // 点击取消
@@ -67,47 +68,49 @@
 const checkedRecordsLoading = ref(false)
 function fetchCheckedRecords(query = { ...queryParams }) {
   checkedRecordsLoading.value = true
-  checkedRecords.value = [{
-    text: 'xx',
-  }]
+  checkedRecords.value = []
   checkedRecordsLoading.value = false
 }
 
 // 状态变更记录
 const stateChangedRecordsColumns = ref<TableColumn[]>(
   [
-    { text: '状态类型', value: 'deviceStatusName', align: 'center' },
-    { text: '开始日期', value: 'startTime', align: 'center' },
-    { text: '结束日期', value: 'endTime', align: 'center' },
-    { text: '申请人', value: 'createUserName', align: 'center' },
+    { text: '状态类型', value: 'managerStateName', align: 'center' },
+    { text: '开始日期', value: 'startDate', align: 'center' },
+    { text: '结束日期', value: 'endDate', align: 'center' },
+    { text: '申请人', value: 'applyPerson', align: 'center' },
   ],
 )
 const stateChangedLoading = ref(false)
 const stateChangedRecords = ref<stateChangedRecord[]>([])
 function fetchStateChangedRecords(query = { ...queryParams }) {
   stateChangedLoading.value = true
-  stateChangedRecords.value = [
-    { deviceStatusName: '闲置', startTime: '2022-10-12 08:32:25', endTime: '至今', createUserName: '张三' },
-  ]
+  queryStateChangeLogList({ id: id.value }).then((res) => {
+    if (res.code === 200) {
+      stateChangedRecords.value = res.data
+    }
+  })
   stateChangedLoading.value = false
 }
 // 获取使用记录
 const useRecordsColumns = ref<TableColumn[]>(
   [
-    { text: '使用人', value: '', align: 'center' },
-    { text: '使用部门', value: '', align: 'center' },
-    { text: '使用类型', value: '', align: 'center' },
-    { text: '使用开始日期', value: '', align: 'center' },
-    { text: '使用结束日期', value: '', align: 'center' },
+    { text: '使用人', value: 'usePersonName', align: 'center' },
+    { text: '使用部门', value: 'useDept', align: 'center' },
+    { text: '使用类型', value: 'useType', align: 'center' },
+    { text: '使用开始日期', value: 'startDate', align: 'center' },
+    { text: '使用结束日期', value: 'endDate', align: 'center' },
   ],
 )
 const useRecordsLoading = ref(false)
 const useRecords = ref<usedRecord[]>([])
 function fetchUseRecords(query = { ...queryParams }) {
   useRecordsLoading.value = true
-  useRecords.value = [{
-    text: 'xx',
-  }]
+  queryUseLogList({ id: id.value }).then((res) => {
+    if (res.code === 200) {
+      useRecords.value = res.data
+    }
+  })
   useRecordsLoading.value = false
 }
 // 获取检定证书记录
@@ -138,7 +141,7 @@
     getInfo()
     if (pageType.value === 'detail' && name.value !== '固定资产') {
       fetchCheckedRecords()
-      fetchUseRecords()
+      fetchStateChangedRecords()
       fetchUseRecords()
       fetchCertificationList()
     }
@@ -171,10 +174,10 @@
           </el-radio-button>
         </el-radio-group>
       </template>
-      <template-table v-if="current === '周检记录'" :columns="checkedRecordsColumns" :list="checkedRecords" :loading="checkedRecordsLoading" @change-page="fetchCheckedRecords" />
-      <template-table v-if="current === '状态变更记录'" :columns="stateChangedRecordsColumns" :list="stateChangedRecords" :loading="stateChangedLoading" @change-page="fetchStateChangedRecords" />
-      <template-table v-if="current === '使用记录'" :columns="useRecordsColumns" :list="useRecords" :loading="useRecordsLoading" @change-page="fetchUseRecords" />
-      <template-table v-if="current === '检定证书'" :columns="certificationListColumns" :list="certificationList" :loading="certificationLoading" @change-page="fetchCertificationList" />
+      <template-table v-if="current === '周检记录'" :columns="checkedRecordsColumns" :list="checkedRecords" :loading="checkedRecordsLoading" />
+      <template-table v-if="current === '状态变更记录'" :columns="stateChangedRecordsColumns" :list="stateChangedRecords" :loading="stateChangedLoading" />
+      <template-table v-if="current === '使用记录'" :columns="useRecordsColumns" :list="useRecords" :loading="useRecordsLoading" />
+      <template-table v-if="current === '检定证书'" :columns="certificationListColumns" :list="certificationList" :loading="certificationLoading" />
     </detail-block-switch>
   </app-container>
 </template>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 3c64594..6c6ed79 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -12,10 +12,11 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
-import { addApply, deleteApply, detailApply, editApply } from '@/api/device/borrow'
+import { addApply, deleteApply, detailApply, editApply, submitApply } from '@/api/device/borrow'
 import { addStatus, detailStatus, updateStatus } from '@/api/device/stateManage'
 import type { borrowDeviceType } from '@/views/device/borrow/borrow-interface'
 import useUserStore from '@/store/modules/user'
+import { SCHEDULE } from '@/utils/scheduleDict'
 
 const userInfo = useUserStore()
 const $router = useRouter()
@@ -234,26 +235,39 @@
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      if (borrowList.value.length) {
+      if (borrowList.value.length > 0) {
         // 整理数据
         delete ruleForm2.value.equipmentInfoList // 去除显示的列表
         ruleForm2.value.applyType = '2'
         const params = {
           ...ruleForm2.value,
           equipmentList: borrowList.value.map(item => ({
-            id: ruleForm2.value.id,
             equipmentId: item.id,
           })),
-          // applyType: $route.query.applyType,
         }
-        editApply(params).then((res) => {
-          if (res.code === 200) {
-            // 成功
-            ElMessage.success('操作成功')
-            $router.go(-1)
-          }
-        })
+        if (title.value === '新建') {
+          addApply(params).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+            }
+          })
+        }
+        else {
+          editApply(params).then((res) => {
+            if (res.code === 200) {
+              // 成功
+              ElMessage.success('操作成功')
+              $router.go(-1)
+            }
+          })
+        }
       }
+      else {
+        ElMessage.warning('请选择借用设备列表!')
+      }
+    }
+    else {
+      console.log('表单校验不通过')
     }
   })
 }
@@ -263,64 +277,33 @@
   if (isDevice.value) {
     //  设备借用
     if (!formEl2) { return }
-    await formEl2.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-          '确认提交吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          if (borrowList.value.length) {
-            // 整理数据
-            delete ruleForm2.value.equipmentInfoList // 去除显示的列表
+    if (ruleForm2.value.id) {
+      await formEl2.validate((valid, fields) => {
+        if (valid) {
+          ElMessageBox.confirm(
+            '确认提交吗？',
+            '提示',
+            {
+              confirmButtonText: '确认',
+              cancelButtonText: '取消',
+              type: 'warning',
+            },
+          ).then(() => {
             const params = {
-              ...ruleForm2.value,
-              equipmentList: borrowList.value.map(item => ({
-                id: ruleForm2.value.id,
-                equipmentId: item.id,
-              })),
-              applyType: $route.query.applyType || '1',
+              id: ruleForm2.value.id,
+              formId: SCHEDULE.DEVICE_BORROW_APPROVAL, // 表单id
             }
-            // title.value === '新建'
-
-            // ? addApply(params) : editApply(params)
-            //   .then((res) => {
-            //     console.log(res)
-            //     if (res.code === 200) {
-            //       // 成功
-            //       ElMessage.success('操作成功')
-            //       $router.go(-1)
-            //     }
-            //   })
-            if (title.value === '新建') {
-              addApply(params).then((res) => {
-                if (res.code === 200) {
-                  // 成功
-                  ElMessage.success('操作成功')
-                  $router.go(-1)
-                }
-              })
-            }
-            else {
-              editApply(params).then((res) => {
-                if (res.code === 200) {
-                  // 成功
-                  ElMessage.success('操作成功')
-                  $router.go(-1)
-                }
-              })
-            }
-          }
-          else {
-            ElMessage.warning('请先添加借用设备')
-          }
-        })
-      }
-    })
+            submitApply(params).then(() => {
+              ElMessage.success('操作成功!')
+              $router.go(-1)
+            })
+          })
+        }
+      })
+    }
+    else {
+      ElMessage.info('请先保存再提交！')
+    }
   }
   else {
   // 状态管理
@@ -635,7 +618,7 @@
     <approve-action ref="approveRef" />
     <detail-page :title="`${name}-${title}`">
       <template #btns>
-        <el-button v-if="title !== '详情' && name.search('借用') === -1" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
+        <el-button v-if="title !== '详情' && name.search('借用') !== -1" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
           提交
         </el-button>
         <el-button v-if="title !== '详情' && name.search('借用') !== -1" type="primary" @click="saveForm(ruleFormRef2)">
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 58f6068..b533114 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -244,15 +244,15 @@
 }
 // 同意
 const agree = (row: TableRow) => {
-  approvalDialog.value.initDialog('agree', row.processId)
+  approvalDialog.value.initDialog('agree', row.taskId)
 }
 // 驳回
 const reject = (row: TableRow) => {
-  approvalDialog.value.initDialog('reject', row.processId)
+  approvalDialog.value.initDialog('reject', row.taskId)
 }
 // 拒绝
 const refuse = (row: TableRow) => {
-  approvalDialog.value.initDialog('refuse', row.processId)
+  approvalDialog.value.initDialog('refuse', row.taskId)
 }
 // 取消
 const cancel = (row: TableRow) => {
@@ -551,7 +551,7 @@
                   提交
                 </el-button>
                 <el-button
-                  v-if="['0', '2', '3'].includes(props.type)"
+                  v-if="['0', '2'].includes(props.type)"
                   size="small"
                   type="primary"
                   link
@@ -564,7 +564,7 @@
                   同意
                 </el-button>
                 <el-button
-                  v-if="['0', '2', '3'].includes(props.type)"
+                  v-if="['0', '2'].includes(props.type)"
                   size="small"
                   type="primary"
                   link
@@ -577,7 +577,7 @@
                   驳回
                 </el-button>
                 <el-button
-                  v-if="['0', '2', '3'].includes(props.type)"
+                  v-if="['0', '2'].includes(props.type)"
                   size="small"
                   type="danger"
                   link

diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index 94a4246..c30f801 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -35,6 +35,7 @@
     data,
   })
 }
+
 // 设备借用申请编辑
 export function editApply(data: object) {
   return request({
@@ -59,6 +60,14 @@
     data,
   })
 }
+// 设备借用归还提交
+export function returnApply(data: object) {
+  return request({
+    url: '/equipmentApply/returnEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
 // 设备借用申请导出
 export function exportApply(data: object) {
   return request({
diff --git a/src/api/device/standingBook.ts b/src/api/device/standingBook.ts
index 74e0af0..0f47a88 100644
--- a/src/api/device/standingBook.ts
+++ b/src/api/device/standingBook.ts
@@ -58,3 +58,22 @@
     data,
   })
 }
+
+// 通过设备id查询出状态变更记录
+export function queryStateChangeLogList(data: object) {
+  return request({
+    url: '/meter/assets/queryStateChangeLogList',
+    method: 'post',
+    data,
+  })
+}
+
+// 通过设备id查询出使用记录
+export function queryUseLogList(data: object) {
+  return request({
+    url: '/meter/assets/queryUseLogList',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 97d660a..9fd6678 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -8,10 +8,11 @@
   createUser?: string // 	创建人
   processResult?: string // 	处置结果
   applyType: string // 申请类型
-  time: string // 	申请日期
+  time?: string // 	申请日期
   limit?: number
   offset?: number
   ids?: string[]
+  id: string
   formId?: string
 }
 // 借用设备类型
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index c17034c..0785ce9 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -26,7 +26,8 @@
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const time = ref()
-const searchQuery = reactive<searchType>({
+const list = ref([]) // 表格数据
+const searchQuery = reactive({
   applyName: '', // 申请名称
   applyNo: '', // 申请编号
   applyPerson: '', // 	申请人
@@ -35,22 +36,13 @@
   createUser: '', // 	创建人
   processResult: '', // 	处置结果
   applyType: props.applyType,
-  time: '', // 	申请日期
+  startTime: '', // 开始时间
+  endTime: '', // 结束时间
   ids: [] as string[],
   limit: 20,
   offset: 1,
   formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
 }) // 查询参数
-watch(() => time.value, (newVal) => {
-  if (newVal) {
-    // searchQuery.noticeStartTime = newVal[0]
-    // searchQuery.noticeEndTime = newVal[1]
-  }
-  else {
-    // searchQuery.noticeStartTime = ''
-    // searchQuery.noticeEndTime = ''
-  }
-})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 // 全部状态的表格数据
@@ -154,7 +146,6 @@
   standard: '',
   extarCss: '',
 })
-const list = ref([]) // 表格数据
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
@@ -233,6 +224,8 @@
 }
 // 搜索
 const search = () => {
+  searchQuery.startTime = time.value[0] as string || ''
+  searchQuery.endTime = time.value[1] as string || ''
   getList()
 }
 // 重置
@@ -241,8 +234,9 @@
   searchQuery.applyNo = ''
   searchQuery.applyPerson = ''
   searchQuery.applyUnit = ''
-  searchQuery.time = ''
-  time.value = ''
+  searchQuery.startTime = ''
+  searchQuery.endTime = ''
+  time.value = ['', '']
   getList()
 }
 // 新增
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index b277758..544ef34 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,10 +1,12 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
-import { deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
+import { deleteApply, exportApply, getApplyList, returnApply, submitApply } from '@/api/device/borrow'
 import type{ searchType } from '@/views/device/borrow/borrow-interface'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
+
 const props = defineProps({
   status: {
     type: String,
@@ -15,34 +17,32 @@
     required: true,
   },
 })
+
+const StatusMap = {
+  待借用: '1',
+  已借用: '2',
+  已归还: '3',
+}
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const time = ref()
-const searchQuery = reactive<searchType>({
+const searchQuery = reactive({
   applyName: '', // 申请名称
   applyNo: '', // 申请编号
   applyPerson: '', // 	申请人
   applyUnit: '', // 	申请单位
   approvalStatus: '4', // 	审批状态
   createUser: '', // 	创建人
-  processResult: '0', // 	处置结果
+  processResult: StatusMap[props.status], // 	处置结果
   applyType: props.applyType,
-  time: '', // 	申请日期
+  startTime: '', // 开始时间
+  endTime: '', // 结束时间
   ids: [] as string[],
   limit: 20,
   offset: 1,
   formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
 }) // 查询参数
-watch(() => time.value, (newVal) => {
-  if (newVal) {
-    // searchQuery.noticeStartTime = newVal[0]
-    // searchQuery.noticeEndTime = newVal[1]
-  }
-  else {
-    // searchQuery.noticeStartTime = ''
-    // searchQuery.noticeEndTime = ''
-  }
-})
+
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
@@ -92,6 +92,14 @@
     loadingTable.value = false
   })
 }
+
+watch(() => props.status, (newVal) => {
+  if (newVal) {
+    searchQuery.processResult = StatusMap[newVal]
+    getList()
+  }
+})
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -103,13 +111,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
-  // console.log(row, 'row')
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   title: '详情',
-  //   ...row,
-  // })
+const detail = (row: searchType) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -118,17 +120,13 @@
     query: {
       title: '详情',
       name: '设备借用处理',
+      id: row.id,
       // approvalStatusName: row.approvalStatusName,
     },
   })
 }
 // 编辑
-const update = (row) => {
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   title: '编辑',
-  //   ...row,
-  // })
+const update = (row: searchType) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -141,7 +139,7 @@
   })
 }
 // 删除
-const remove = (row) => {
+const remove = (row: searchType) => {
   ElMessageBox.confirm(
     `确认删除${row.applyName}吗？`,
     '提示',
@@ -165,6 +163,8 @@
 }
 // 搜索
 const search = () => {
+  searchQuery.startTime = time.value[0] as string || ''
+  searchQuery.endTime = time.value[1] as string || ''
   getList()
 }
 // 重置
@@ -173,7 +173,9 @@
   searchQuery.applyNo = ''
   searchQuery.applyPerson = ''
   searchQuery.applyUnit = ''
-  searchQuery.time = ''
+  searchQuery.startTime = ''
+  searchQuery.endTime = ''
+  time.value = ['', '']
   getList()
 }
 // 模板下载
@@ -185,7 +187,7 @@
 
 }
 // 借用
-const borrow = (row) => {
+const borrow = (row: searchType) => {
   ElMessageBox.confirm(
     `确认借用${row.applyName}吗？`,
     '提示',
@@ -194,10 +196,20 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
+  ).then((res) => {
+    submitApply({ id: row.id as string }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '借用成功',
+        })
+        getList()
+      }
+    })
+  })
 }
 // 归还
-const returnBtn = (row) => {
+const returnBtn = (row: searchType) => {
   ElMessageBox.confirm(
     `确认归还${row.applyName}吗？`,
     '提示',
@@ -206,14 +218,20 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
+  ).then((res) => {
+    returnApply({ id: row.id as string }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '归还成功',
+        })
+        getList()
+      }
+    })
+  })
 }
 // 新增
 const addBtn = () => {
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   title: '新建',
-  // })
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -225,31 +243,33 @@
     },
   })
 }
+
 // 表格被选中的行
-const selectList = ref([])
+const selectList = ref<searchType[]>([])
 // 表格多选
-const multiSelect = (row) => {
+const multiSelect = (row: searchType[]) => {
   selectList.value = row
 }
+
 // 导出
 const exportExcelBtn = () => {
-  // const loading = ElLoading.service({
-  //   lock: true,
-  //   text: 'Loading',
-  //   background: 'rgba(255, 255, 255, 0.8)',
-  // })
-  // if (selectList.value.length) {
-  //   selectList.value.forEach((item) => {
-  //     searchQuery.ids?.push(item.id as string)
-  //   })
-  // }
-  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
-  //   exportFile(res.data, '固定资产列表')
-  //   loading.close()
-  // searchQuery.ids = []
-  // }).catch((_) => {
-  //   loading.close()
-  // })
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  searchQuery.ids = []
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
+  exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+    exportFile(res.data, '设备借用处理')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
 }
 // 打印
 function printList() {
@@ -328,7 +348,7 @@
         <!-- 表格区域 -->
         <normal-table
           id="print"
-          :data="list" :total="total" :columns="columns as any"
+          :data="list" :total="total" :columns="columns"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index ff7153c..9cd3c83 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -3,7 +3,7 @@
 import type { certificate, checkedRecord, fixedAssetsType, menuType, stateChangedRecord, usedRecord } from '../standingBook-interface'
 import baseInfo from './baseInfo.vue' // 基本信息
 import TemplateTable from './templateTable.vue'
-import { assetsDetailApi } from '@/api/device/standingBook'
+import { assetsDetailApi, queryStateChangeLogList, queryUseLogList } from '@/api/device/standingBook'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 
 const $router = useRouter()
@@ -23,6 +23,7 @@
   { name: '使用记录', comp: TemplateTable },
   { name: '检定证书', comp: TemplateTable },
 ])
+
 const current = ref('周检记录')
 
 // 点击取消
@@ -67,47 +68,49 @@
 const checkedRecordsLoading = ref(false)
 function fetchCheckedRecords(query = { ...queryParams }) {
   checkedRecordsLoading.value = true
-  checkedRecords.value = [{
-    text: 'xx',
-  }]
+  checkedRecords.value = []
   checkedRecordsLoading.value = false
 }
 
 // 状态变更记录
 const stateChangedRecordsColumns = ref<TableColumn[]>(
   [
-    { text: '状态类型', value: 'deviceStatusName', align: 'center' },
-    { text: '开始日期', value: 'startTime', align: 'center' },
-    { text: '结束日期', value: 'endTime', align: 'center' },
-    { text: '申请人', value: 'createUserName', align: 'center' },
+    { text: '状态类型', value: 'managerStateName', align: 'center' },
+    { text: '开始日期', value: 'startDate', align: 'center' },
+    { text: '结束日期', value: 'endDate', align: 'center' },
+    { text: '申请人', value: 'applyPerson', align: 'center' },
   ],
 )
 const stateChangedLoading = ref(false)
 const stateChangedRecords = ref<stateChangedRecord[]>([])
 function fetchStateChangedRecords(query = { ...queryParams }) {
   stateChangedLoading.value = true
-  stateChangedRecords.value = [
-    { deviceStatusName: '闲置', startTime: '2022-10-12 08:32:25', endTime: '至今', createUserName: '张三' },
-  ]
+  queryStateChangeLogList({ id: id.value }).then((res) => {
+    if (res.code === 200) {
+      stateChangedRecords.value = res.data
+    }
+  })
   stateChangedLoading.value = false
 }
 // 获取使用记录
 const useRecordsColumns = ref<TableColumn[]>(
   [
-    { text: '使用人', value: '', align: 'center' },
-    { text: '使用部门', value: '', align: 'center' },
-    { text: '使用类型', value: '', align: 'center' },
-    { text: '使用开始日期', value: '', align: 'center' },
-    { text: '使用结束日期', value: '', align: 'center' },
+    { text: '使用人', value: 'usePersonName', align: 'center' },
+    { text: '使用部门', value: 'useDept', align: 'center' },
+    { text: '使用类型', value: 'useType', align: 'center' },
+    { text: '使用开始日期', value: 'startDate', align: 'center' },
+    { text: '使用结束日期', value: 'endDate', align: 'center' },
   ],
 )
 const useRecordsLoading = ref(false)
 const useRecords = ref<usedRecord[]>([])
 function fetchUseRecords(query = { ...queryParams }) {
   useRecordsLoading.value = true
-  useRecords.value = [{
-    text: 'xx',
-  }]
+  queryUseLogList({ id: id.value }).then((res) => {
+    if (res.code === 200) {
+      useRecords.value = res.data
+    }
+  })
   useRecordsLoading.value = false
 }
 // 获取检定证书记录
@@ -138,7 +141,7 @@
     getInfo()
     if (pageType.value === 'detail' && name.value !== '固定资产') {
       fetchCheckedRecords()
-      fetchUseRecords()
+      fetchStateChangedRecords()
       fetchUseRecords()
       fetchCertificationList()
     }
@@ -171,10 +174,10 @@
           </el-radio-button>
         </el-radio-group>
       </template>
-      <template-table v-if="current === '周检记录'" :columns="checkedRecordsColumns" :list="checkedRecords" :loading="checkedRecordsLoading" @change-page="fetchCheckedRecords" />
-      <template-table v-if="current === '状态变更记录'" :columns="stateChangedRecordsColumns" :list="stateChangedRecords" :loading="stateChangedLoading" @change-page="fetchStateChangedRecords" />
-      <template-table v-if="current === '使用记录'" :columns="useRecordsColumns" :list="useRecords" :loading="useRecordsLoading" @change-page="fetchUseRecords" />
-      <template-table v-if="current === '检定证书'" :columns="certificationListColumns" :list="certificationList" :loading="certificationLoading" @change-page="fetchCertificationList" />
+      <template-table v-if="current === '周检记录'" :columns="checkedRecordsColumns" :list="checkedRecords" :loading="checkedRecordsLoading" />
+      <template-table v-if="current === '状态变更记录'" :columns="stateChangedRecordsColumns" :list="stateChangedRecords" :loading="stateChangedLoading" />
+      <template-table v-if="current === '使用记录'" :columns="useRecordsColumns" :list="useRecords" :loading="useRecordsLoading" />
+      <template-table v-if="current === '检定证书'" :columns="certificationListColumns" :list="certificationList" :loading="certificationLoading" />
     </detail-block-switch>
   </app-container>
 </template>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 3c64594..6c6ed79 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -12,10 +12,11 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
-import { addApply, deleteApply, detailApply, editApply } from '@/api/device/borrow'
+import { addApply, deleteApply, detailApply, editApply, submitApply } from '@/api/device/borrow'
 import { addStatus, detailStatus, updateStatus } from '@/api/device/stateManage'
 import type { borrowDeviceType } from '@/views/device/borrow/borrow-interface'
 import useUserStore from '@/store/modules/user'
+import { SCHEDULE } from '@/utils/scheduleDict'
 
 const userInfo = useUserStore()
 const $router = useRouter()
@@ -234,26 +235,39 @@
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      if (borrowList.value.length) {
+      if (borrowList.value.length > 0) {
         // 整理数据
         delete ruleForm2.value.equipmentInfoList // 去除显示的列表
         ruleForm2.value.applyType = '2'
         const params = {
           ...ruleForm2.value,
           equipmentList: borrowList.value.map(item => ({
-            id: ruleForm2.value.id,
             equipmentId: item.id,
           })),
-          // applyType: $route.query.applyType,
         }
-        editApply(params).then((res) => {
-          if (res.code === 200) {
-            // 成功
-            ElMessage.success('操作成功')
-            $router.go(-1)
-          }
-        })
+        if (title.value === '新建') {
+          addApply(params).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+            }
+          })
+        }
+        else {
+          editApply(params).then((res) => {
+            if (res.code === 200) {
+              // 成功
+              ElMessage.success('操作成功')
+              $router.go(-1)
+            }
+          })
+        }
       }
+      else {
+        ElMessage.warning('请选择借用设备列表!')
+      }
+    }
+    else {
+      console.log('表单校验不通过')
     }
   })
 }
@@ -263,64 +277,33 @@
   if (isDevice.value) {
     //  设备借用
     if (!formEl2) { return }
-    await formEl2.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-          '确认提交吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          if (borrowList.value.length) {
-            // 整理数据
-            delete ruleForm2.value.equipmentInfoList // 去除显示的列表
+    if (ruleForm2.value.id) {
+      await formEl2.validate((valid, fields) => {
+        if (valid) {
+          ElMessageBox.confirm(
+            '确认提交吗？',
+            '提示',
+            {
+              confirmButtonText: '确认',
+              cancelButtonText: '取消',
+              type: 'warning',
+            },
+          ).then(() => {
             const params = {
-              ...ruleForm2.value,
-              equipmentList: borrowList.value.map(item => ({
-                id: ruleForm2.value.id,
-                equipmentId: item.id,
-              })),
-              applyType: $route.query.applyType || '1',
+              id: ruleForm2.value.id,
+              formId: SCHEDULE.DEVICE_BORROW_APPROVAL, // 表单id
             }
-            // title.value === '新建'
-
-            // ? addApply(params) : editApply(params)
-            //   .then((res) => {
-            //     console.log(res)
-            //     if (res.code === 200) {
-            //       // 成功
-            //       ElMessage.success('操作成功')
-            //       $router.go(-1)
-            //     }
-            //   })
-            if (title.value === '新建') {
-              addApply(params).then((res) => {
-                if (res.code === 200) {
-                  // 成功
-                  ElMessage.success('操作成功')
-                  $router.go(-1)
-                }
-              })
-            }
-            else {
-              editApply(params).then((res) => {
-                if (res.code === 200) {
-                  // 成功
-                  ElMessage.success('操作成功')
-                  $router.go(-1)
-                }
-              })
-            }
-          }
-          else {
-            ElMessage.warning('请先添加借用设备')
-          }
-        })
-      }
-    })
+            submitApply(params).then(() => {
+              ElMessage.success('操作成功!')
+              $router.go(-1)
+            })
+          })
+        }
+      })
+    }
+    else {
+      ElMessage.info('请先保存再提交！')
+    }
   }
   else {
   // 状态管理
@@ -635,7 +618,7 @@
     <approve-action ref="approveRef" />
     <detail-page :title="`${name}-${title}`">
       <template #btns>
-        <el-button v-if="title !== '详情' && name.search('借用') === -1" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
+        <el-button v-if="title !== '详情' && name.search('借用') !== -1" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
           提交
         </el-button>
         <el-button v-if="title !== '详情' && name.search('借用') !== -1" type="primary" @click="saveForm(ruleFormRef2)">
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 58f6068..b533114 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -244,15 +244,15 @@
 }
 // 同意
 const agree = (row: TableRow) => {
-  approvalDialog.value.initDialog('agree', row.processId)
+  approvalDialog.value.initDialog('agree', row.taskId)
 }
 // 驳回
 const reject = (row: TableRow) => {
-  approvalDialog.value.initDialog('reject', row.processId)
+  approvalDialog.value.initDialog('reject', row.taskId)
 }
 // 拒绝
 const refuse = (row: TableRow) => {
-  approvalDialog.value.initDialog('refuse', row.processId)
+  approvalDialog.value.initDialog('refuse', row.taskId)
 }
 // 取消
 const cancel = (row: TableRow) => {
@@ -551,7 +551,7 @@
                   提交
                 </el-button>
                 <el-button
-                  v-if="['0', '2', '3'].includes(props.type)"
+                  v-if="['0', '2'].includes(props.type)"
                   size="small"
                   type="primary"
                   link
@@ -564,7 +564,7 @@
                   同意
                 </el-button>
                 <el-button
-                  v-if="['0', '2', '3'].includes(props.type)"
+                  v-if="['0', '2'].includes(props.type)"
                   size="small"
                   type="primary"
                   link
@@ -577,7 +577,7 @@
                   驳回
                 </el-button>
                 <el-button
-                  v-if="['0', '2', '3'].includes(props.type)"
+                  v-if="['0', '2'].includes(props.type)"
                   size="small"
                   type="danger"
                   link
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index b81c859..9c56cb1 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -25,7 +25,11 @@
 const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 40 + 24
+  // 审批中状态时候长度返回错误
+  if (props.status === '3' || props.status === '6') {
+    props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度
+  }
+  return props.buttons.length * 40 + 23
 })
 
 // 查询条件
@@ -39,6 +43,7 @@
   trainTime: '', // 培训时间
   offset: 1, // 当前页
   limit: 20, // 每页多少条
+  ids: [], // 导出数据
 })
 // 表格数据
 const list = ref<IPlanList[]>([])
@@ -52,26 +57,31 @@
     text: '计划编号',
     value: 'planNo',
     align: 'center',
+    width: '90',
   },
   {
     text: '培训名称',
     value: 'planName',
     align: 'center',
+    width: '90',
   },
   {
     text: '培训对象',
     value: 'trainPerson',
     align: 'center',
+    width: '90',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
     align: 'center',
+    width: '90',
   },
   {
     text: '培训学时',
     value: 'trainHour',
     align: 'center',
+    width: '90',
   },
   {
     text: '培训时间',
@@ -83,21 +93,25 @@
     text: '主管部门',
     value: 'deptName',
     align: 'center',
+    width: '90',
   },
   {
     text: '实施单位',
     value: 'effectiveCompany',
     align: 'center',
+    width: '90',
   },
   {
     text: '负责人',
     value: 'director',
     align: 'center',
+    width: '90',
   },
   {
     text: '培训内容',
     value: 'trainContent',
     align: 'center',
+    width: '90',
   },
   {
     text: '创建时间',
@@ -122,6 +136,7 @@
 // 获取列表
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
+
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
@@ -220,7 +235,10 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  listQuery.value.ids = []
   if (list.value.length > 0) {
+    console.log(listQuery.value)
+    listQuery.value.ids = checkoutList.value
     exportPlanList(listQuery.value).then((res) => {
       const blob = new Blob([res.data])
       exportFile(blob, '培训计划列表.xlsx')
@@ -423,7 +441,7 @@
                 size="small"
                 link
                 type="primary"
-                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                :disabled="row.approvalStatusName !== '待审批'"
                 @click="clickBtn(row, '同意')"
               >
                 同意
@@ -433,7 +451,7 @@
                 size="small"
                 link
                 type="primary"
-                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                :disabled="row.approvalStatusName !== '待审批'"
                 @click="clickBtn(row, '驳回')"
               >
                 驳回
@@ -443,7 +461,7 @@
                 size="small"
                 link
                 type="danger"
-                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                :disabled="row.approvalStatusName !== '待审批'"
                 @click="clickBtn(row, '拒绝')"
               >
                 拒绝

diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index 94a4246..c30f801 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -35,6 +35,7 @@
     data,
   })
 }
+
 // 设备借用申请编辑
 export function editApply(data: object) {
   return request({
@@ -59,6 +60,14 @@
     data,
   })
 }
+// 设备借用归还提交
+export function returnApply(data: object) {
+  return request({
+    url: '/equipmentApply/returnEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
 // 设备借用申请导出
 export function exportApply(data: object) {
   return request({
diff --git a/src/api/device/standingBook.ts b/src/api/device/standingBook.ts
index 74e0af0..0f47a88 100644
--- a/src/api/device/standingBook.ts
+++ b/src/api/device/standingBook.ts
@@ -58,3 +58,22 @@
     data,
   })
 }
+
+// 通过设备id查询出状态变更记录
+export function queryStateChangeLogList(data: object) {
+  return request({
+    url: '/meter/assets/queryStateChangeLogList',
+    method: 'post',
+    data,
+  })
+}
+
+// 通过设备id查询出使用记录
+export function queryUseLogList(data: object) {
+  return request({
+    url: '/meter/assets/queryUseLogList',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 97d660a..9fd6678 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -8,10 +8,11 @@
   createUser?: string // 	创建人
   processResult?: string // 	处置结果
   applyType: string // 申请类型
-  time: string // 	申请日期
+  time?: string // 	申请日期
   limit?: number
   offset?: number
   ids?: string[]
+  id: string
   formId?: string
 }
 // 借用设备类型
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index c17034c..0785ce9 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -26,7 +26,8 @@
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const time = ref()
-const searchQuery = reactive<searchType>({
+const list = ref([]) // 表格数据
+const searchQuery = reactive({
   applyName: '', // 申请名称
   applyNo: '', // 申请编号
   applyPerson: '', // 	申请人
@@ -35,22 +36,13 @@
   createUser: '', // 	创建人
   processResult: '', // 	处置结果
   applyType: props.applyType,
-  time: '', // 	申请日期
+  startTime: '', // 开始时间
+  endTime: '', // 结束时间
   ids: [] as string[],
   limit: 20,
   offset: 1,
   formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
 }) // 查询参数
-watch(() => time.value, (newVal) => {
-  if (newVal) {
-    // searchQuery.noticeStartTime = newVal[0]
-    // searchQuery.noticeEndTime = newVal[1]
-  }
-  else {
-    // searchQuery.noticeStartTime = ''
-    // searchQuery.noticeEndTime = ''
-  }
-})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 // 全部状态的表格数据
@@ -154,7 +146,6 @@
   standard: '',
   extarCss: '',
 })
-const list = ref([]) // 表格数据
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
@@ -233,6 +224,8 @@
 }
 // 搜索
 const search = () => {
+  searchQuery.startTime = time.value[0] as string || ''
+  searchQuery.endTime = time.value[1] as string || ''
   getList()
 }
 // 重置
@@ -241,8 +234,9 @@
   searchQuery.applyNo = ''
   searchQuery.applyPerson = ''
   searchQuery.applyUnit = ''
-  searchQuery.time = ''
-  time.value = ''
+  searchQuery.startTime = ''
+  searchQuery.endTime = ''
+  time.value = ['', '']
   getList()
 }
 // 新增
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index b277758..544ef34 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,10 +1,12 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
-import { deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
+import { deleteApply, exportApply, getApplyList, returnApply, submitApply } from '@/api/device/borrow'
 import type{ searchType } from '@/views/device/borrow/borrow-interface'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
+
 const props = defineProps({
   status: {
     type: String,
@@ -15,34 +17,32 @@
     required: true,
   },
 })
+
+const StatusMap = {
+  待借用: '1',
+  已借用: '2',
+  已归还: '3',
+}
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const time = ref()
-const searchQuery = reactive<searchType>({
+const searchQuery = reactive({
   applyName: '', // 申请名称
   applyNo: '', // 申请编号
   applyPerson: '', // 	申请人
   applyUnit: '', // 	申请单位
   approvalStatus: '4', // 	审批状态
   createUser: '', // 	创建人
-  processResult: '0', // 	处置结果
+  processResult: StatusMap[props.status], // 	处置结果
   applyType: props.applyType,
-  time: '', // 	申请日期
+  startTime: '', // 开始时间
+  endTime: '', // 结束时间
   ids: [] as string[],
   limit: 20,
   offset: 1,
   formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
 }) // 查询参数
-watch(() => time.value, (newVal) => {
-  if (newVal) {
-    // searchQuery.noticeStartTime = newVal[0]
-    // searchQuery.noticeEndTime = newVal[1]
-  }
-  else {
-    // searchQuery.noticeStartTime = ''
-    // searchQuery.noticeEndTime = ''
-  }
-})
+
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
@@ -92,6 +92,14 @@
     loadingTable.value = false
   })
 }
+
+watch(() => props.status, (newVal) => {
+  if (newVal) {
+    searchQuery.processResult = StatusMap[newVal]
+    getList()
+  }
+})
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -103,13 +111,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
-  // console.log(row, 'row')
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   title: '详情',
-  //   ...row,
-  // })
+const detail = (row: searchType) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -118,17 +120,13 @@
     query: {
       title: '详情',
       name: '设备借用处理',
+      id: row.id,
       // approvalStatusName: row.approvalStatusName,
     },
   })
 }
 // 编辑
-const update = (row) => {
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   title: '编辑',
-  //   ...row,
-  // })
+const update = (row: searchType) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -141,7 +139,7 @@
   })
 }
 // 删除
-const remove = (row) => {
+const remove = (row: searchType) => {
   ElMessageBox.confirm(
     `确认删除${row.applyName}吗？`,
     '提示',
@@ -165,6 +163,8 @@
 }
 // 搜索
 const search = () => {
+  searchQuery.startTime = time.value[0] as string || ''
+  searchQuery.endTime = time.value[1] as string || ''
   getList()
 }
 // 重置
@@ -173,7 +173,9 @@
   searchQuery.applyNo = ''
   searchQuery.applyPerson = ''
   searchQuery.applyUnit = ''
-  searchQuery.time = ''
+  searchQuery.startTime = ''
+  searchQuery.endTime = ''
+  time.value = ['', '']
   getList()
 }
 // 模板下载
@@ -185,7 +187,7 @@
 
 }
 // 借用
-const borrow = (row) => {
+const borrow = (row: searchType) => {
   ElMessageBox.confirm(
     `确认借用${row.applyName}吗？`,
     '提示',
@@ -194,10 +196,20 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
+  ).then((res) => {
+    submitApply({ id: row.id as string }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '借用成功',
+        })
+        getList()
+      }
+    })
+  })
 }
 // 归还
-const returnBtn = (row) => {
+const returnBtn = (row: searchType) => {
   ElMessageBox.confirm(
     `确认归还${row.applyName}吗？`,
     '提示',
@@ -206,14 +218,20 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
+  ).then((res) => {
+    returnApply({ id: row.id as string }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '归还成功',
+        })
+        getList()
+      }
+    })
+  })
 }
 // 新增
 const addBtn = () => {
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   title: '新建',
-  // })
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -225,31 +243,33 @@
     },
   })
 }
+
 // 表格被选中的行
-const selectList = ref([])
+const selectList = ref<searchType[]>([])
 // 表格多选
-const multiSelect = (row) => {
+const multiSelect = (row: searchType[]) => {
   selectList.value = row
 }
+
 // 导出
 const exportExcelBtn = () => {
-  // const loading = ElLoading.service({
-  //   lock: true,
-  //   text: 'Loading',
-  //   background: 'rgba(255, 255, 255, 0.8)',
-  // })
-  // if (selectList.value.length) {
-  //   selectList.value.forEach((item) => {
-  //     searchQuery.ids?.push(item.id as string)
-  //   })
-  // }
-  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
-  //   exportFile(res.data, '固定资产列表')
-  //   loading.close()
-  // searchQuery.ids = []
-  // }).catch((_) => {
-  //   loading.close()
-  // })
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  searchQuery.ids = []
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
+  exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+    exportFile(res.data, '设备借用处理')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
 }
 // 打印
 function printList() {
@@ -328,7 +348,7 @@
         <!-- 表格区域 -->
         <normal-table
           id="print"
-          :data="list" :total="total" :columns="columns as any"
+          :data="list" :total="total" :columns="columns"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index ff7153c..9cd3c83 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -3,7 +3,7 @@
 import type { certificate, checkedRecord, fixedAssetsType, menuType, stateChangedRecord, usedRecord } from '../standingBook-interface'
 import baseInfo from './baseInfo.vue' // 基本信息
 import TemplateTable from './templateTable.vue'
-import { assetsDetailApi } from '@/api/device/standingBook'
+import { assetsDetailApi, queryStateChangeLogList, queryUseLogList } from '@/api/device/standingBook'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 
 const $router = useRouter()
@@ -23,6 +23,7 @@
   { name: '使用记录', comp: TemplateTable },
   { name: '检定证书', comp: TemplateTable },
 ])
+
 const current = ref('周检记录')
 
 // 点击取消
@@ -67,47 +68,49 @@
 const checkedRecordsLoading = ref(false)
 function fetchCheckedRecords(query = { ...queryParams }) {
   checkedRecordsLoading.value = true
-  checkedRecords.value = [{
-    text: 'xx',
-  }]
+  checkedRecords.value = []
   checkedRecordsLoading.value = false
 }
 
 // 状态变更记录
 const stateChangedRecordsColumns = ref<TableColumn[]>(
   [
-    { text: '状态类型', value: 'deviceStatusName', align: 'center' },
-    { text: '开始日期', value: 'startTime', align: 'center' },
-    { text: '结束日期', value: 'endTime', align: 'center' },
-    { text: '申请人', value: 'createUserName', align: 'center' },
+    { text: '状态类型', value: 'managerStateName', align: 'center' },
+    { text: '开始日期', value: 'startDate', align: 'center' },
+    { text: '结束日期', value: 'endDate', align: 'center' },
+    { text: '申请人', value: 'applyPerson', align: 'center' },
   ],
 )
 const stateChangedLoading = ref(false)
 const stateChangedRecords = ref<stateChangedRecord[]>([])
 function fetchStateChangedRecords(query = { ...queryParams }) {
   stateChangedLoading.value = true
-  stateChangedRecords.value = [
-    { deviceStatusName: '闲置', startTime: '2022-10-12 08:32:25', endTime: '至今', createUserName: '张三' },
-  ]
+  queryStateChangeLogList({ id: id.value }).then((res) => {
+    if (res.code === 200) {
+      stateChangedRecords.value = res.data
+    }
+  })
   stateChangedLoading.value = false
 }
 // 获取使用记录
 const useRecordsColumns = ref<TableColumn[]>(
   [
-    { text: '使用人', value: '', align: 'center' },
-    { text: '使用部门', value: '', align: 'center' },
-    { text: '使用类型', value: '', align: 'center' },
-    { text: '使用开始日期', value: '', align: 'center' },
-    { text: '使用结束日期', value: '', align: 'center' },
+    { text: '使用人', value: 'usePersonName', align: 'center' },
+    { text: '使用部门', value: 'useDept', align: 'center' },
+    { text: '使用类型', value: 'useType', align: 'center' },
+    { text: '使用开始日期', value: 'startDate', align: 'center' },
+    { text: '使用结束日期', value: 'endDate', align: 'center' },
   ],
 )
 const useRecordsLoading = ref(false)
 const useRecords = ref<usedRecord[]>([])
 function fetchUseRecords(query = { ...queryParams }) {
   useRecordsLoading.value = true
-  useRecords.value = [{
-    text: 'xx',
-  }]
+  queryUseLogList({ id: id.value }).then((res) => {
+    if (res.code === 200) {
+      useRecords.value = res.data
+    }
+  })
   useRecordsLoading.value = false
 }
 // 获取检定证书记录
@@ -138,7 +141,7 @@
     getInfo()
     if (pageType.value === 'detail' && name.value !== '固定资产') {
       fetchCheckedRecords()
-      fetchUseRecords()
+      fetchStateChangedRecords()
       fetchUseRecords()
       fetchCertificationList()
     }
@@ -171,10 +174,10 @@
           </el-radio-button>
         </el-radio-group>
       </template>
-      <template-table v-if="current === '周检记录'" :columns="checkedRecordsColumns" :list="checkedRecords" :loading="checkedRecordsLoading" @change-page="fetchCheckedRecords" />
-      <template-table v-if="current === '状态变更记录'" :columns="stateChangedRecordsColumns" :list="stateChangedRecords" :loading="stateChangedLoading" @change-page="fetchStateChangedRecords" />
-      <template-table v-if="current === '使用记录'" :columns="useRecordsColumns" :list="useRecords" :loading="useRecordsLoading" @change-page="fetchUseRecords" />
-      <template-table v-if="current === '检定证书'" :columns="certificationListColumns" :list="certificationList" :loading="certificationLoading" @change-page="fetchCertificationList" />
+      <template-table v-if="current === '周检记录'" :columns="checkedRecordsColumns" :list="checkedRecords" :loading="checkedRecordsLoading" />
+      <template-table v-if="current === '状态变更记录'" :columns="stateChangedRecordsColumns" :list="stateChangedRecords" :loading="stateChangedLoading" />
+      <template-table v-if="current === '使用记录'" :columns="useRecordsColumns" :list="useRecords" :loading="useRecordsLoading" />
+      <template-table v-if="current === '检定证书'" :columns="certificationListColumns" :list="certificationList" :loading="certificationLoading" />
     </detail-block-switch>
   </app-container>
 </template>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 3c64594..6c6ed79 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -12,10 +12,11 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
-import { addApply, deleteApply, detailApply, editApply } from '@/api/device/borrow'
+import { addApply, deleteApply, detailApply, editApply, submitApply } from '@/api/device/borrow'
 import { addStatus, detailStatus, updateStatus } from '@/api/device/stateManage'
 import type { borrowDeviceType } from '@/views/device/borrow/borrow-interface'
 import useUserStore from '@/store/modules/user'
+import { SCHEDULE } from '@/utils/scheduleDict'
 
 const userInfo = useUserStore()
 const $router = useRouter()
@@ -234,26 +235,39 @@
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      if (borrowList.value.length) {
+      if (borrowList.value.length > 0) {
         // 整理数据
         delete ruleForm2.value.equipmentInfoList // 去除显示的列表
         ruleForm2.value.applyType = '2'
         const params = {
           ...ruleForm2.value,
           equipmentList: borrowList.value.map(item => ({
-            id: ruleForm2.value.id,
             equipmentId: item.id,
           })),
-          // applyType: $route.query.applyType,
         }
-        editApply(params).then((res) => {
-          if (res.code === 200) {
-            // 成功
-            ElMessage.success('操作成功')
-            $router.go(-1)
-          }
-        })
+        if (title.value === '新建') {
+          addApply(params).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+            }
+          })
+        }
+        else {
+          editApply(params).then((res) => {
+            if (res.code === 200) {
+              // 成功
+              ElMessage.success('操作成功')
+              $router.go(-1)
+            }
+          })
+        }
       }
+      else {
+        ElMessage.warning('请选择借用设备列表!')
+      }
+    }
+    else {
+      console.log('表单校验不通过')
     }
   })
 }
@@ -263,64 +277,33 @@
   if (isDevice.value) {
     //  设备借用
     if (!formEl2) { return }
-    await formEl2.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-          '确认提交吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          if (borrowList.value.length) {
-            // 整理数据
-            delete ruleForm2.value.equipmentInfoList // 去除显示的列表
+    if (ruleForm2.value.id) {
+      await formEl2.validate((valid, fields) => {
+        if (valid) {
+          ElMessageBox.confirm(
+            '确认提交吗？',
+            '提示',
+            {
+              confirmButtonText: '确认',
+              cancelButtonText: '取消',
+              type: 'warning',
+            },
+          ).then(() => {
             const params = {
-              ...ruleForm2.value,
-              equipmentList: borrowList.value.map(item => ({
-                id: ruleForm2.value.id,
-                equipmentId: item.id,
-              })),
-              applyType: $route.query.applyType || '1',
+              id: ruleForm2.value.id,
+              formId: SCHEDULE.DEVICE_BORROW_APPROVAL, // 表单id
             }
-            // title.value === '新建'
-
-            // ? addApply(params) : editApply(params)
-            //   .then((res) => {
-            //     console.log(res)
-            //     if (res.code === 200) {
-            //       // 成功
-            //       ElMessage.success('操作成功')
-            //       $router.go(-1)
-            //     }
-            //   })
-            if (title.value === '新建') {
-              addApply(params).then((res) => {
-                if (res.code === 200) {
-                  // 成功
-                  ElMessage.success('操作成功')
-                  $router.go(-1)
-                }
-              })
-            }
-            else {
-              editApply(params).then((res) => {
-                if (res.code === 200) {
-                  // 成功
-                  ElMessage.success('操作成功')
-                  $router.go(-1)
-                }
-              })
-            }
-          }
-          else {
-            ElMessage.warning('请先添加借用设备')
-          }
-        })
-      }
-    })
+            submitApply(params).then(() => {
+              ElMessage.success('操作成功!')
+              $router.go(-1)
+            })
+          })
+        }
+      })
+    }
+    else {
+      ElMessage.info('请先保存再提交！')
+    }
   }
   else {
   // 状态管理
@@ -635,7 +618,7 @@
     <approve-action ref="approveRef" />
     <detail-page :title="`${name}-${title}`">
       <template #btns>
-        <el-button v-if="title !== '详情' && name.search('借用') === -1" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
+        <el-button v-if="title !== '详情' && name.search('借用') !== -1" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
           提交
         </el-button>
         <el-button v-if="title !== '详情' && name.search('借用') !== -1" type="primary" @click="saveForm(ruleFormRef2)">
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 58f6068..b533114 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -244,15 +244,15 @@
 }
 // 同意
 const agree = (row: TableRow) => {
-  approvalDialog.value.initDialog('agree', row.processId)
+  approvalDialog.value.initDialog('agree', row.taskId)
 }
 // 驳回
 const reject = (row: TableRow) => {
-  approvalDialog.value.initDialog('reject', row.processId)
+  approvalDialog.value.initDialog('reject', row.taskId)
 }
 // 拒绝
 const refuse = (row: TableRow) => {
-  approvalDialog.value.initDialog('refuse', row.processId)
+  approvalDialog.value.initDialog('refuse', row.taskId)
 }
 // 取消
 const cancel = (row: TableRow) => {
@@ -551,7 +551,7 @@
                   提交
                 </el-button>
                 <el-button
-                  v-if="['0', '2', '3'].includes(props.type)"
+                  v-if="['0', '2'].includes(props.type)"
                   size="small"
                   type="primary"
                   link
@@ -564,7 +564,7 @@
                   同意
                 </el-button>
                 <el-button
-                  v-if="['0', '2', '3'].includes(props.type)"
+                  v-if="['0', '2'].includes(props.type)"
                   size="small"
                   type="primary"
                   link
@@ -577,7 +577,7 @@
                   驳回
                 </el-button>
                 <el-button
-                  v-if="['0', '2', '3'].includes(props.type)"
+                  v-if="['0', '2'].includes(props.type)"
                   size="small"
                   type="danger"
                   link
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index b81c859..9c56cb1 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -25,7 +25,11 @@
 const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 40 + 24
+  // 审批中状态时候长度返回错误
+  if (props.status === '3' || props.status === '6') {
+    props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度
+  }
+  return props.buttons.length * 40 + 23
 })
 
 // 查询条件
@@ -39,6 +43,7 @@
   trainTime: '', // 培训时间
   offset: 1, // 当前页
   limit: 20, // 每页多少条
+  ids: [], // 导出数据
 })
 // 表格数据
 const list = ref<IPlanList[]>([])
@@ -52,26 +57,31 @@
     text: '计划编号',
     value: 'planNo',
     align: 'center',
+    width: '90',
   },
   {
     text: '培训名称',
     value: 'planName',
     align: 'center',
+    width: '90',
   },
   {
     text: '培训对象',
     value: 'trainPerson',
     align: 'center',
+    width: '90',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
     align: 'center',
+    width: '90',
   },
   {
     text: '培训学时',
     value: 'trainHour',
     align: 'center',
+    width: '90',
   },
   {
     text: '培训时间',
@@ -83,21 +93,25 @@
     text: '主管部门',
     value: 'deptName',
     align: 'center',
+    width: '90',
   },
   {
     text: '实施单位',
     value: 'effectiveCompany',
     align: 'center',
+    width: '90',
   },
   {
     text: '负责人',
     value: 'director',
     align: 'center',
+    width: '90',
   },
   {
     text: '培训内容',
     value: 'trainContent',
     align: 'center',
+    width: '90',
   },
   {
     text: '创建时间',
@@ -122,6 +136,7 @@
 // 获取列表
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
+
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
@@ -220,7 +235,10 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  listQuery.value.ids = []
   if (list.value.length > 0) {
+    console.log(listQuery.value)
+    listQuery.value.ids = checkoutList.value
     exportPlanList(listQuery.value).then((res) => {
       const blob = new Blob([res.data])
       exportFile(blob, '培训计划列表.xlsx')
@@ -423,7 +441,7 @@
                 size="small"
                 link
                 type="primary"
-                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                :disabled="row.approvalStatusName !== '待审批'"
                 @click="clickBtn(row, '同意')"
               >
                 同意
@@ -433,7 +451,7 @@
                 size="small"
                 link
                 type="primary"
-                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                :disabled="row.approvalStatusName !== '待审批'"
                 @click="clickBtn(row, '驳回')"
               >
                 驳回
@@ -443,7 +461,7 @@
                 size="small"
                 link
                 type="danger"
-                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                :disabled="row.approvalStatusName !== '待审批'"
                 @click="clickBtn(row, '拒绝')"
               >
                 拒绝
diff --git a/src/views/measure/train/plan_interface.ts b/src/views/measure/train/plan_interface.ts
index 7d5f791..1e81f2c 100644
--- a/src/views/measure/train/plan_interface.ts
+++ b/src/views/measure/train/plan_interface.ts
@@ -43,11 +43,13 @@
 }
 // 培训计划审批列表查询条件
 export interface IlistApprovalQuery {
+  ids: never[]
   approvalStatus: string // 审批状态
   formId: string // 表单id
   createTime: string // 创建时间
   deptId: string // 部门id
   director: string // 负责人
+  ids?: [] // 导出列表
   effectiveCompany: string // 实施单位
   trainTime: string // 培训时间
   offset: number // 当前页

diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index 94a4246..c30f801 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -35,6 +35,7 @@
     data,
   })
 }
+
 // 设备借用申请编辑
 export function editApply(data: object) {
   return request({
@@ -59,6 +60,14 @@
     data,
   })
 }
+// 设备借用归还提交
+export function returnApply(data: object) {
+  return request({
+    url: '/equipmentApply/returnEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
 // 设备借用申请导出
 export function exportApply(data: object) {
   return request({
diff --git a/src/api/device/standingBook.ts b/src/api/device/standingBook.ts
index 74e0af0..0f47a88 100644
--- a/src/api/device/standingBook.ts
+++ b/src/api/device/standingBook.ts
@@ -58,3 +58,22 @@
     data,
   })
 }
+
+// 通过设备id查询出状态变更记录
+export function queryStateChangeLogList(data: object) {
+  return request({
+    url: '/meter/assets/queryStateChangeLogList',
+    method: 'post',
+    data,
+  })
+}
+
+// 通过设备id查询出使用记录
+export function queryUseLogList(data: object) {
+  return request({
+    url: '/meter/assets/queryUseLogList',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 97d660a..9fd6678 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -8,10 +8,11 @@
   createUser?: string // 	创建人
   processResult?: string // 	处置结果
   applyType: string // 申请类型
-  time: string // 	申请日期
+  time?: string // 	申请日期
   limit?: number
   offset?: number
   ids?: string[]
+  id: string
   formId?: string
 }
 // 借用设备类型
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index c17034c..0785ce9 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -26,7 +26,8 @@
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const time = ref()
-const searchQuery = reactive<searchType>({
+const list = ref([]) // 表格数据
+const searchQuery = reactive({
   applyName: '', // 申请名称
   applyNo: '', // 申请编号
   applyPerson: '', // 	申请人
@@ -35,22 +36,13 @@
   createUser: '', // 	创建人
   processResult: '', // 	处置结果
   applyType: props.applyType,
-  time: '', // 	申请日期
+  startTime: '', // 开始时间
+  endTime: '', // 结束时间
   ids: [] as string[],
   limit: 20,
   offset: 1,
   formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
 }) // 查询参数
-watch(() => time.value, (newVal) => {
-  if (newVal) {
-    // searchQuery.noticeStartTime = newVal[0]
-    // searchQuery.noticeEndTime = newVal[1]
-  }
-  else {
-    // searchQuery.noticeStartTime = ''
-    // searchQuery.noticeEndTime = ''
-  }
-})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 // 全部状态的表格数据
@@ -154,7 +146,6 @@
   standard: '',
   extarCss: '',
 })
-const list = ref([]) // 表格数据
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
@@ -233,6 +224,8 @@
 }
 // 搜索
 const search = () => {
+  searchQuery.startTime = time.value[0] as string || ''
+  searchQuery.endTime = time.value[1] as string || ''
   getList()
 }
 // 重置
@@ -241,8 +234,9 @@
   searchQuery.applyNo = ''
   searchQuery.applyPerson = ''
   searchQuery.applyUnit = ''
-  searchQuery.time = ''
-  time.value = ''
+  searchQuery.startTime = ''
+  searchQuery.endTime = ''
+  time.value = ['', '']
   getList()
 }
 // 新增
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index b277758..544ef34 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,10 +1,12 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
-import { deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
+import { deleteApply, exportApply, getApplyList, returnApply, submitApply } from '@/api/device/borrow'
 import type{ searchType } from '@/views/device/borrow/borrow-interface'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
+
 const props = defineProps({
   status: {
     type: String,
@@ -15,34 +17,32 @@
     required: true,
   },
 })
+
+const StatusMap = {
+  待借用: '1',
+  已借用: '2',
+  已归还: '3',
+}
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const time = ref()
-const searchQuery = reactive<searchType>({
+const searchQuery = reactive({
   applyName: '', // 申请名称
   applyNo: '', // 申请编号
   applyPerson: '', // 	申请人
   applyUnit: '', // 	申请单位
   approvalStatus: '4', // 	审批状态
   createUser: '', // 	创建人
-  processResult: '0', // 	处置结果
+  processResult: StatusMap[props.status], // 	处置结果
   applyType: props.applyType,
-  time: '', // 	申请日期
+  startTime: '', // 开始时间
+  endTime: '', // 结束时间
   ids: [] as string[],
   limit: 20,
   offset: 1,
   formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
 }) // 查询参数
-watch(() => time.value, (newVal) => {
-  if (newVal) {
-    // searchQuery.noticeStartTime = newVal[0]
-    // searchQuery.noticeEndTime = newVal[1]
-  }
-  else {
-    // searchQuery.noticeStartTime = ''
-    // searchQuery.noticeEndTime = ''
-  }
-})
+
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
@@ -92,6 +92,14 @@
     loadingTable.value = false
   })
 }
+
+watch(() => props.status, (newVal) => {
+  if (newVal) {
+    searchQuery.processResult = StatusMap[newVal]
+    getList()
+  }
+})
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -103,13 +111,7 @@
   getList()
 }
 // 详情
-const detail = (row) => {
-  // console.log(row, 'row')
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   title: '详情',
-  //   ...row,
-  // })
+const detail = (row: searchType) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -118,17 +120,13 @@
     query: {
       title: '详情',
       name: '设备借用处理',
+      id: row.id,
       // approvalStatusName: row.approvalStatusName,
     },
   })
 }
 // 编辑
-const update = (row) => {
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   title: '编辑',
-  //   ...row,
-  // })
+const update = (row: searchType) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -141,7 +139,7 @@
   })
 }
 // 删除
-const remove = (row) => {
+const remove = (row: searchType) => {
   ElMessageBox.confirm(
     `确认删除${row.applyName}吗？`,
     '提示',
@@ -165,6 +163,8 @@
 }
 // 搜索
 const search = () => {
+  searchQuery.startTime = time.value[0] as string || ''
+  searchQuery.endTime = time.value[1] as string || ''
   getList()
 }
 // 重置
@@ -173,7 +173,9 @@
   searchQuery.applyNo = ''
   searchQuery.applyPerson = ''
   searchQuery.applyUnit = ''
-  searchQuery.time = ''
+  searchQuery.startTime = ''
+  searchQuery.endTime = ''
+  time.value = ['', '']
   getList()
 }
 // 模板下载
@@ -185,7 +187,7 @@
 
 }
 // 借用
-const borrow = (row) => {
+const borrow = (row: searchType) => {
   ElMessageBox.confirm(
     `确认借用${row.applyName}吗？`,
     '提示',
@@ -194,10 +196,20 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
+  ).then((res) => {
+    submitApply({ id: row.id as string }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '借用成功',
+        })
+        getList()
+      }
+    })
+  })
 }
 // 归还
-const returnBtn = (row) => {
+const returnBtn = (row: searchType) => {
   ElMessageBox.confirm(
     `确认归还${row.applyName}吗？`,
     '提示',
@@ -206,14 +218,20 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
+  ).then((res) => {
+    returnApply({ id: row.id as string }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '归还成功',
+        })
+        getList()
+      }
+    })
+  })
 }
 // 新增
 const addBtn = () => {
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   title: '新建',
-  // })
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -225,31 +243,33 @@
     },
   })
 }
+
 // 表格被选中的行
-const selectList = ref([])
+const selectList = ref<searchType[]>([])
 // 表格多选
-const multiSelect = (row) => {
+const multiSelect = (row: searchType[]) => {
   selectList.value = row
 }
+
 // 导出
 const exportExcelBtn = () => {
-  // const loading = ElLoading.service({
-  //   lock: true,
-  //   text: 'Loading',
-  //   background: 'rgba(255, 255, 255, 0.8)',
-  // })
-  // if (selectList.value.length) {
-  //   selectList.value.forEach((item) => {
-  //     searchQuery.ids?.push(item.id as string)
-  //   })
-  // }
-  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
-  //   exportFile(res.data, '固定资产列表')
-  //   loading.close()
-  // searchQuery.ids = []
-  // }).catch((_) => {
-  //   loading.close()
-  // })
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  searchQuery.ids = []
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
+  exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+    exportFile(res.data, '设备借用处理')
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
 }
 // 打印
 function printList() {
@@ -328,7 +348,7 @@
         <!-- 表格区域 -->
         <normal-table
           id="print"
-          :data="list" :total="total" :columns="columns as any"
+          :data="list" :total="total" :columns="columns"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue
index ff7153c..9cd3c83 100644
--- a/src/views/device/standingBook/components/templateAdd.vue
+++ b/src/views/device/standingBook/components/templateAdd.vue
@@ -3,7 +3,7 @@
 import type { certificate, checkedRecord, fixedAssetsType, menuType, stateChangedRecord, usedRecord } from '../standingBook-interface'
 import baseInfo from './baseInfo.vue' // 基本信息
 import TemplateTable from './templateTable.vue'
-import { assetsDetailApi } from '@/api/device/standingBook'
+import { assetsDetailApi, queryStateChangeLogList, queryUseLogList } from '@/api/device/standingBook'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 
 const $router = useRouter()
@@ -23,6 +23,7 @@
   { name: '使用记录', comp: TemplateTable },
   { name: '检定证书', comp: TemplateTable },
 ])
+
 const current = ref('周检记录')
 
 // 点击取消
@@ -67,47 +68,49 @@
 const checkedRecordsLoading = ref(false)
 function fetchCheckedRecords(query = { ...queryParams }) {
   checkedRecordsLoading.value = true
-  checkedRecords.value = [{
-    text: 'xx',
-  }]
+  checkedRecords.value = []
   checkedRecordsLoading.value = false
 }
 
 // 状态变更记录
 const stateChangedRecordsColumns = ref<TableColumn[]>(
   [
-    { text: '状态类型', value: 'deviceStatusName', align: 'center' },
-    { text: '开始日期', value: 'startTime', align: 'center' },
-    { text: '结束日期', value: 'endTime', align: 'center' },
-    { text: '申请人', value: 'createUserName', align: 'center' },
+    { text: '状态类型', value: 'managerStateName', align: 'center' },
+    { text: '开始日期', value: 'startDate', align: 'center' },
+    { text: '结束日期', value: 'endDate', align: 'center' },
+    { text: '申请人', value: 'applyPerson', align: 'center' },
   ],
 )
 const stateChangedLoading = ref(false)
 const stateChangedRecords = ref<stateChangedRecord[]>([])
 function fetchStateChangedRecords(query = { ...queryParams }) {
   stateChangedLoading.value = true
-  stateChangedRecords.value = [
-    { deviceStatusName: '闲置', startTime: '2022-10-12 08:32:25', endTime: '至今', createUserName: '张三' },
-  ]
+  queryStateChangeLogList({ id: id.value }).then((res) => {
+    if (res.code === 200) {
+      stateChangedRecords.value = res.data
+    }
+  })
   stateChangedLoading.value = false
 }
 // 获取使用记录
 const useRecordsColumns = ref<TableColumn[]>(
   [
-    { text: '使用人', value: '', align: 'center' },
-    { text: '使用部门', value: '', align: 'center' },
-    { text: '使用类型', value: '', align: 'center' },
-    { text: '使用开始日期', value: '', align: 'center' },
-    { text: '使用结束日期', value: '', align: 'center' },
+    { text: '使用人', value: 'usePersonName', align: 'center' },
+    { text: '使用部门', value: 'useDept', align: 'center' },
+    { text: '使用类型', value: 'useType', align: 'center' },
+    { text: '使用开始日期', value: 'startDate', align: 'center' },
+    { text: '使用结束日期', value: 'endDate', align: 'center' },
   ],
 )
 const useRecordsLoading = ref(false)
 const useRecords = ref<usedRecord[]>([])
 function fetchUseRecords(query = { ...queryParams }) {
   useRecordsLoading.value = true
-  useRecords.value = [{
-    text: 'xx',
-  }]
+  queryUseLogList({ id: id.value }).then((res) => {
+    if (res.code === 200) {
+      useRecords.value = res.data
+    }
+  })
   useRecordsLoading.value = false
 }
 // 获取检定证书记录
@@ -138,7 +141,7 @@
     getInfo()
     if (pageType.value === 'detail' && name.value !== '固定资产') {
       fetchCheckedRecords()
-      fetchUseRecords()
+      fetchStateChangedRecords()
       fetchUseRecords()
       fetchCertificationList()
     }
@@ -171,10 +174,10 @@
           </el-radio-button>
         </el-radio-group>
       </template>
-      <template-table v-if="current === '周检记录'" :columns="checkedRecordsColumns" :list="checkedRecords" :loading="checkedRecordsLoading" @change-page="fetchCheckedRecords" />
-      <template-table v-if="current === '状态变更记录'" :columns="stateChangedRecordsColumns" :list="stateChangedRecords" :loading="stateChangedLoading" @change-page="fetchStateChangedRecords" />
-      <template-table v-if="current === '使用记录'" :columns="useRecordsColumns" :list="useRecords" :loading="useRecordsLoading" @change-page="fetchUseRecords" />
-      <template-table v-if="current === '检定证书'" :columns="certificationListColumns" :list="certificationList" :loading="certificationLoading" @change-page="fetchCertificationList" />
+      <template-table v-if="current === '周检记录'" :columns="checkedRecordsColumns" :list="checkedRecords" :loading="checkedRecordsLoading" />
+      <template-table v-if="current === '状态变更记录'" :columns="stateChangedRecordsColumns" :list="stateChangedRecords" :loading="stateChangedLoading" />
+      <template-table v-if="current === '使用记录'" :columns="useRecordsColumns" :list="useRecords" :loading="useRecordsLoading" />
+      <template-table v-if="current === '检定证书'" :columns="certificationListColumns" :list="certificationList" :loading="certificationLoading" />
     </detail-block-switch>
   </app-container>
 </template>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 3c64594..6c6ed79 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -12,10 +12,11 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
-import { addApply, deleteApply, detailApply, editApply } from '@/api/device/borrow'
+import { addApply, deleteApply, detailApply, editApply, submitApply } from '@/api/device/borrow'
 import { addStatus, detailStatus, updateStatus } from '@/api/device/stateManage'
 import type { borrowDeviceType } from '@/views/device/borrow/borrow-interface'
 import useUserStore from '@/store/modules/user'
+import { SCHEDULE } from '@/utils/scheduleDict'
 
 const userInfo = useUserStore()
 const $router = useRouter()
@@ -234,26 +235,39 @@
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      if (borrowList.value.length) {
+      if (borrowList.value.length > 0) {
         // 整理数据
         delete ruleForm2.value.equipmentInfoList // 去除显示的列表
         ruleForm2.value.applyType = '2'
         const params = {
           ...ruleForm2.value,
           equipmentList: borrowList.value.map(item => ({
-            id: ruleForm2.value.id,
             equipmentId: item.id,
           })),
-          // applyType: $route.query.applyType,
         }
-        editApply(params).then((res) => {
-          if (res.code === 200) {
-            // 成功
-            ElMessage.success('操作成功')
-            $router.go(-1)
-          }
-        })
+        if (title.value === '新建') {
+          addApply(params).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+            }
+          })
+        }
+        else {
+          editApply(params).then((res) => {
+            if (res.code === 200) {
+              // 成功
+              ElMessage.success('操作成功')
+              $router.go(-1)
+            }
+          })
+        }
       }
+      else {
+        ElMessage.warning('请选择借用设备列表!')
+      }
+    }
+    else {
+      console.log('表单校验不通过')
     }
   })
 }
@@ -263,64 +277,33 @@
   if (isDevice.value) {
     //  设备借用
     if (!formEl2) { return }
-    await formEl2.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-          '确认提交吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          if (borrowList.value.length) {
-            // 整理数据
-            delete ruleForm2.value.equipmentInfoList // 去除显示的列表
+    if (ruleForm2.value.id) {
+      await formEl2.validate((valid, fields) => {
+        if (valid) {
+          ElMessageBox.confirm(
+            '确认提交吗？',
+            '提示',
+            {
+              confirmButtonText: '确认',
+              cancelButtonText: '取消',
+              type: 'warning',
+            },
+          ).then(() => {
             const params = {
-              ...ruleForm2.value,
-              equipmentList: borrowList.value.map(item => ({
-                id: ruleForm2.value.id,
-                equipmentId: item.id,
-              })),
-              applyType: $route.query.applyType || '1',
+              id: ruleForm2.value.id,
+              formId: SCHEDULE.DEVICE_BORROW_APPROVAL, // 表单id
             }
-            // title.value === '新建'
-
-            // ? addApply(params) : editApply(params)
-            //   .then((res) => {
-            //     console.log(res)
-            //     if (res.code === 200) {
-            //       // 成功
-            //       ElMessage.success('操作成功')
-            //       $router.go(-1)
-            //     }
-            //   })
-            if (title.value === '新建') {
-              addApply(params).then((res) => {
-                if (res.code === 200) {
-                  // 成功
-                  ElMessage.success('操作成功')
-                  $router.go(-1)
-                }
-              })
-            }
-            else {
-              editApply(params).then((res) => {
-                if (res.code === 200) {
-                  // 成功
-                  ElMessage.success('操作成功')
-                  $router.go(-1)
-                }
-              })
-            }
-          }
-          else {
-            ElMessage.warning('请先添加借用设备')
-          }
-        })
-      }
-    })
+            submitApply(params).then(() => {
+              ElMessage.success('操作成功!')
+              $router.go(-1)
+            })
+          })
+        }
+      })
+    }
+    else {
+      ElMessage.info('请先保存再提交！')
+    }
   }
   else {
   // 状态管理
@@ -635,7 +618,7 @@
     <approve-action ref="approveRef" />
     <detail-page :title="`${name}-${title}`">
       <template #btns>
-        <el-button v-if="title !== '详情' && name.search('借用') === -1" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
+        <el-button v-if="title !== '详情' && name.search('借用') !== -1" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
           提交
         </el-button>
         <el-button v-if="title !== '详情' && name.search('借用') !== -1" type="primary" @click="saveForm(ruleFormRef2)">
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 58f6068..b533114 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -244,15 +244,15 @@
 }
 // 同意
 const agree = (row: TableRow) => {
-  approvalDialog.value.initDialog('agree', row.processId)
+  approvalDialog.value.initDialog('agree', row.taskId)
 }
 // 驳回
 const reject = (row: TableRow) => {
-  approvalDialog.value.initDialog('reject', row.processId)
+  approvalDialog.value.initDialog('reject', row.taskId)
 }
 // 拒绝
 const refuse = (row: TableRow) => {
-  approvalDialog.value.initDialog('refuse', row.processId)
+  approvalDialog.value.initDialog('refuse', row.taskId)
 }
 // 取消
 const cancel = (row: TableRow) => {
@@ -551,7 +551,7 @@
                   提交
                 </el-button>
                 <el-button
-                  v-if="['0', '2', '3'].includes(props.type)"
+                  v-if="['0', '2'].includes(props.type)"
                   size="small"
                   type="primary"
                   link
@@ -564,7 +564,7 @@
                   同意
                 </el-button>
                 <el-button
-                  v-if="['0', '2', '3'].includes(props.type)"
+                  v-if="['0', '2'].includes(props.type)"
                   size="small"
                   type="primary"
                   link
@@ -577,7 +577,7 @@
                   驳回
                 </el-button>
                 <el-button
-                  v-if="['0', '2', '3'].includes(props.type)"
+                  v-if="['0', '2'].includes(props.type)"
                   size="small"
                   type="danger"
                   link
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index b81c859..9c56cb1 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -25,7 +25,11 @@
 const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 40 + 24
+  // 审批中状态时候长度返回错误
+  if (props.status === '3' || props.status === '6') {
+    props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度
+  }
+  return props.buttons.length * 40 + 23
 })
 
 // 查询条件
@@ -39,6 +43,7 @@
   trainTime: '', // 培训时间
   offset: 1, // 当前页
   limit: 20, // 每页多少条
+  ids: [], // 导出数据
 })
 // 表格数据
 const list = ref<IPlanList[]>([])
@@ -52,26 +57,31 @@
     text: '计划编号',
     value: 'planNo',
     align: 'center',
+    width: '90',
   },
   {
     text: '培训名称',
     value: 'planName',
     align: 'center',
+    width: '90',
   },
   {
     text: '培训对象',
     value: 'trainPerson',
     align: 'center',
+    width: '90',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
     align: 'center',
+    width: '90',
   },
   {
     text: '培训学时',
     value: 'trainHour',
     align: 'center',
+    width: '90',
   },
   {
     text: '培训时间',
@@ -83,21 +93,25 @@
     text: '主管部门',
     value: 'deptName',
     align: 'center',
+    width: '90',
   },
   {
     text: '实施单位',
     value: 'effectiveCompany',
     align: 'center',
+    width: '90',
   },
   {
     text: '负责人',
     value: 'director',
     align: 'center',
+    width: '90',
   },
   {
     text: '培训内容',
     value: 'trainContent',
     align: 'center',
+    width: '90',
   },
   {
     text: '创建时间',
@@ -122,6 +136,7 @@
 // 获取列表
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
+
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
@@ -220,7 +235,10 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  listQuery.value.ids = []
   if (list.value.length > 0) {
+    console.log(listQuery.value)
+    listQuery.value.ids = checkoutList.value
     exportPlanList(listQuery.value).then((res) => {
       const blob = new Blob([res.data])
       exportFile(blob, '培训计划列表.xlsx')
@@ -423,7 +441,7 @@
                 size="small"
                 link
                 type="primary"
-                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                :disabled="row.approvalStatusName !== '待审批'"
                 @click="clickBtn(row, '同意')"
               >
                 同意
@@ -433,7 +451,7 @@
                 size="small"
                 link
                 type="primary"
-                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                :disabled="row.approvalStatusName !== '待审批'"
                 @click="clickBtn(row, '驳回')"
               >
                 驳回
@@ -443,7 +461,7 @@
                 size="small"
                 link
                 type="danger"
-                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                :disabled="row.approvalStatusName !== '待审批'"
                 @click="clickBtn(row, '拒绝')"
               >
                 拒绝
diff --git a/src/views/measure/train/plan_interface.ts b/src/views/measure/train/plan_interface.ts
index 7d5f791..1e81f2c 100644
--- a/src/views/measure/train/plan_interface.ts
+++ b/src/views/measure/train/plan_interface.ts
@@ -43,11 +43,13 @@
 }
 // 培训计划审批列表查询条件
 export interface IlistApprovalQuery {
+  ids: never[]
   approvalStatus: string // 审批状态
   formId: string // 表单id
   createTime: string // 创建时间
   deptId: string // 部门id
   director: string // 负责人
+  ids?: [] // 导出列表
   effectiveCompany: string // 实施单位
   trainTime: string // 培训时间
   offset: number // 当前页
diff --git a/src/views/measure/train/trainPlanApprove.vue b/src/views/measure/train/trainPlanApprove.vue
index 8fc73a5..a29a38b 100644
--- a/src/views/measure/train/trainPlanApprove.vue
+++ b/src/views/measure/train/trainPlanApprove.vue
@@ -35,6 +35,9 @@
   ],
   审批中: [
     { name: '查看', type: 'primary' },
+    // { name: '同意', type: 'primary' },
+    // { name: '驳回', type: 'primary' },
+    // { name: '拒绝', type: 'danger' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
@@ -68,7 +71,6 @@
 currentButtons.value = buttonsSet['全部']
 // 审批类型字典
 const approvalStatusList = dictStore.approvalStatusListTow
-
 const $route = useRoute()
 if ($route.query && $route.query.type) {
   const currentMenu = menus.value.find(item => item.value == $route.query.type)