diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index dbce999..5bd4111 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -45,6 +45,15 @@
     data,
   })
 }
+
+// 设备借用驳回后编辑
+export function failUpdate(data: object) {
+  return request({
+    url: '/equipmentApply/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 // 设备借用申请删除
 export function deleteApply(data: object) {
   return request({

diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index dbce999..5bd4111 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -45,6 +45,15 @@
     data,
   })
 }
+
+// 设备借用驳回后编辑
+export function failUpdate(data: object) {
+  return request({
+    url: '/equipmentApply/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 // 设备借用申请删除
 export function deleteApply(data: object) {
   return request({
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 9049282..7f9431b 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -1,6 +1,6 @@
 // 状态管理相关接口api
 import request from '../index'
-import type { ISearchQuery, ITableRow, Iapprove } from '@/views/device/stateManage/components/status-interface.ts'
+import type { ISearchQuery, Iapprove } from '@/views/device/stateManage/components/status-interface'
 
 // 设备申请列表
 export function getStatusList(data: ISearchQuery) {
@@ -11,7 +11,7 @@
   })
 }
 // 状态管理新建
-export function addStatus(data: ITableRow) {
+export function addStatus(data: Object) {
   return request({
     url: '/meter/stateManage/addStateManageInfo',
     method: 'post',
@@ -20,7 +20,7 @@
 }
 
 // 状态管理编辑
-export function updateStatus(data: ITableRow) {
+export function updateStatus(data: Object) {
   return request({
     url: '/meter/stateManage/updateStateManageInfo',
     method: 'post',
@@ -53,7 +53,7 @@
   })
 }
 // 状态管理详情
-export function detailStatus(data: ITableRow) {
+export function detailStatus(data: object) {
   return request({
     url: '/meter/stateManage/selectStateManageInfo',
     method: 'post',

diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index dbce999..5bd4111 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -45,6 +45,15 @@
     data,
   })
 }
+
+// 设备借用驳回后编辑
+export function failUpdate(data: object) {
+  return request({
+    url: '/equipmentApply/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 // 设备借用申请删除
 export function deleteApply(data: object) {
   return request({
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 9049282..7f9431b 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -1,6 +1,6 @@
 // 状态管理相关接口api
 import request from '../index'
-import type { ISearchQuery, ITableRow, Iapprove } from '@/views/device/stateManage/components/status-interface.ts'
+import type { ISearchQuery, Iapprove } from '@/views/device/stateManage/components/status-interface'
 
 // 设备申请列表
 export function getStatusList(data: ISearchQuery) {
@@ -11,7 +11,7 @@
   })
 }
 // 状态管理新建
-export function addStatus(data: ITableRow) {
+export function addStatus(data: Object) {
   return request({
     url: '/meter/stateManage/addStateManageInfo',
     method: 'post',
@@ -20,7 +20,7 @@
 }
 
 // 状态管理编辑
-export function updateStatus(data: ITableRow) {
+export function updateStatus(data: Object) {
   return request({
     url: '/meter/stateManage/updateStateManageInfo',
     method: 'post',
@@ -53,7 +53,7 @@
   })
 }
 // 状态管理详情
-export function detailStatus(data: ITableRow) {
+export function detailStatus(data: object) {
   return request({
     url: '/meter/stateManage/selectStateManageInfo',
     method: 'post',
diff --git a/src/components/SearchArea/SearchItem.vue b/src/components/SearchArea/SearchItem.vue
index 3adef93..dc53b08 100644
--- a/src/components/SearchArea/SearchItem.vue
+++ b/src/components/SearchArea/SearchItem.vue
@@ -23,7 +23,6 @@
   display: inline-block;
   margin-bottom: 10px;
   vertical-align: top;
-  box-sizing: inherit;
   margin-right: 5px;
 }
 

diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index dbce999..5bd4111 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -45,6 +45,15 @@
     data,
   })
 }
+
+// 设备借用驳回后编辑
+export function failUpdate(data: object) {
+  return request({
+    url: '/equipmentApply/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 // 设备借用申请删除
 export function deleteApply(data: object) {
   return request({
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 9049282..7f9431b 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -1,6 +1,6 @@
 // 状态管理相关接口api
 import request from '../index'
-import type { ISearchQuery, ITableRow, Iapprove } from '@/views/device/stateManage/components/status-interface.ts'
+import type { ISearchQuery, Iapprove } from '@/views/device/stateManage/components/status-interface'
 
 // 设备申请列表
 export function getStatusList(data: ISearchQuery) {
@@ -11,7 +11,7 @@
   })
 }
 // 状态管理新建
-export function addStatus(data: ITableRow) {
+export function addStatus(data: Object) {
   return request({
     url: '/meter/stateManage/addStateManageInfo',
     method: 'post',
@@ -20,7 +20,7 @@
 }
 
 // 状态管理编辑
-export function updateStatus(data: ITableRow) {
+export function updateStatus(data: Object) {
   return request({
     url: '/meter/stateManage/updateStateManageInfo',
     method: 'post',
@@ -53,7 +53,7 @@
   })
 }
 // 状态管理详情
-export function detailStatus(data: ITableRow) {
+export function detailStatus(data: object) {
   return request({
     url: '/meter/stateManage/selectStateManageInfo',
     method: 'post',
diff --git a/src/components/SearchArea/SearchItem.vue b/src/components/SearchArea/SearchItem.vue
index 3adef93..dc53b08 100644
--- a/src/components/SearchArea/SearchItem.vue
+++ b/src/components/SearchArea/SearchItem.vue
@@ -23,7 +23,6 @@
   display: inline-block;
   margin-bottom: 10px;
   vertical-align: top;
-  box-sizing: inherit;
   margin-right: 5px;
 }
 
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index 12d7290..e3c72af 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -1,5 +1,9 @@
 // 证书打印查询
 export interface ICertPrintSearch {
+  certificateClass: string
+  certificateNo: string
+  createUserId: number
+  printStatus: number | null
   certificationReportCode: string // 证书编号
   orderNo: string // 委托书编号
   customerName: string // 委托方名称
@@ -13,7 +17,7 @@
   reason: string // 操作原因
   sampleId: string // 样品id
   status: string // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
-  ids?: []
+  ids?: [] | null
   offset: number
   limit: number
 }

diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index dbce999..5bd4111 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -45,6 +45,15 @@
     data,
   })
 }
+
+// 设备借用驳回后编辑
+export function failUpdate(data: object) {
+  return request({
+    url: '/equipmentApply/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 // 设备借用申请删除
 export function deleteApply(data: object) {
   return request({
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 9049282..7f9431b 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -1,6 +1,6 @@
 // 状态管理相关接口api
 import request from '../index'
-import type { ISearchQuery, ITableRow, Iapprove } from '@/views/device/stateManage/components/status-interface.ts'
+import type { ISearchQuery, Iapprove } from '@/views/device/stateManage/components/status-interface'
 
 // 设备申请列表
 export function getStatusList(data: ISearchQuery) {
@@ -11,7 +11,7 @@
   })
 }
 // 状态管理新建
-export function addStatus(data: ITableRow) {
+export function addStatus(data: Object) {
   return request({
     url: '/meter/stateManage/addStateManageInfo',
     method: 'post',
@@ -20,7 +20,7 @@
 }
 
 // 状态管理编辑
-export function updateStatus(data: ITableRow) {
+export function updateStatus(data: Object) {
   return request({
     url: '/meter/stateManage/updateStateManageInfo',
     method: 'post',
@@ -53,7 +53,7 @@
   })
 }
 // 状态管理详情
-export function detailStatus(data: ITableRow) {
+export function detailStatus(data: object) {
   return request({
     url: '/meter/stateManage/selectStateManageInfo',
     method: 'post',
diff --git a/src/components/SearchArea/SearchItem.vue b/src/components/SearchArea/SearchItem.vue
index 3adef93..dc53b08 100644
--- a/src/components/SearchArea/SearchItem.vue
+++ b/src/components/SearchArea/SearchItem.vue
@@ -23,7 +23,6 @@
   display: inline-block;
   margin-bottom: 10px;
   vertical-align: top;
-  box-sizing: inherit;
   margin-right: 5px;
 }
 
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index 12d7290..e3c72af 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -1,5 +1,9 @@
 // 证书打印查询
 export interface ICertPrintSearch {
+  certificateClass: string
+  certificateNo: string
+  createUserId: number
+  printStatus: number | null
   certificationReportCode: string // 证书编号
   orderNo: string // 委托书编号
   customerName: string // 委托方名称
@@ -13,7 +17,7 @@
   reason: string // 操作原因
   sampleId: string // 样品id
   status: string // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
-  ids?: []
+  ids?: [] | null
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 3daa2b5..391931b 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -22,6 +22,10 @@
 const activeTitle = ref('') // active对应的审批状态名字
 // 查询条件
 const listQuery = ref<ICertPrintSearch>({
+  certificateClass: '',
+  certificateNo: '', // 证书编号
+  createUserId: 0,
+  printStatus: 0, // 可打印(证书可打印传0,全部传null)
   certificationReportCode: '', // 证书编号
   orderNo: '', // 委托书编号
   customerName: '', // 委托方名称
@@ -30,11 +34,12 @@
   certificateReportType: '', // 证书类型
   printNum: '', // 打印次数 -未打印和全部用
   approvalStatus: '', // 审批状态-审批查询用
-  orderId: '0', // 委托书id
+  orderId: '', // 委托书id
   reason: '', // 操作原因
-  sampleId: '0', // 样品id
+  sampleId: '', // 样品id
   status: '', // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
   formId: SCHEDULE.BUSINESS_CERT_PRINT,
+  ids: null, // 设置默认值
   offset: 1,
   limit: 20,
 })
@@ -78,22 +83,30 @@
         }
       }
     })
+    if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+      active.value = window.sessionStorage.getItem('buttonBoxActive')!
+      activeTitle.value === '未通过'
+    }
+    else {
+      active.value = menu.value.find(item => item.name === '可打印')!.id // 可打印
+      activeTitle.value === '可打印'
+    }
   })
 }
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationReportCode', width: '110', align: 'center' },
-  { text: '证书名称', value: 'certificationReportName', width: '120', align: 'center' },
+  { text: '证书编号', value: 'certificateNo', width: '110', align: 'center' },
+  { text: '证书名称', value: 'certificateName', width: '120', align: 'center' },
   { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', width: '120', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', width: '120', align: 'center' },
   { text: '委托书编号', value: 'orderNo', width: '120', align: 'center' },
-  { text: '检校类别', value: 'customerNo', width: '120', align: 'center' },
-  { text: '检定人员', value: 'customerName', width: '120', align: 'center' },
-  { text: '证书类型', value: 'certificateReportTypeName', width: '120', align: 'center' },
-  { text: '打印状态', value: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
+  { text: '检校类别', value: 'measureType', width: '120', align: 'center' },
+  { text: '检定人员', value: 'measurePersonId', width: '120', align: 'center' },
+  { text: '证书类型', value: 'certificateType', width: '120', align: 'center' },
+  { text: '打印状态', value: 'printNum', align: 'center', width: '85px', filter: (row: ICerPrintList) => { var cnum = ['未打印', '一', '二', '三', '四', '五', '六', '七', '八', '九', '十']; return row.printNum == 0 ? '未打印' : `${cnum[parseInt(row.printNum)]}次打印` } },
   { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
 ])
 // 表格数据
@@ -107,37 +120,35 @@
 
 // 根据过滤查询条件
 function filterQuery() {
-  console.log(activeTitle)
+  const approvalStatus = menu.value.find(item => item.name === activeTitle.value)!.id
+  listQuery.value.approvalStatus = approvalStatus
   switch (activeTitle.value) {
     case '可打印':
-      listQuery.value.printNum = 0
+      listQuery.value.printStatus = 0
       listQuery.value.approvalStatus = ''
       break
     case '全部':
-      listQuery.value.printNum = 0
+      listQuery.value.printStatus = 2
       listQuery.value.approvalStatus = ''
       break
     case '待审批':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '1'
+      listQuery.value.printStatus = 2
       break
     case '审批中':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '2'
+      listQuery.value.printStatus = 2
       break
     case '已通过':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '3'
+      listQuery.value.printStatus = 2
       break
     case '未通过':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '4'
+      listQuery.value.printStatus = 2
       break
   }
 }
 
 // 数据查询
 function fetchData(isNowPage = false) {
+  console.log(listQuery)
   filterQuery()
   loadingTable.value = true
   if (!isNowPage) {
@@ -146,15 +157,11 @@
   }
   // 模拟数据
   loadingTable.value = false
-  list.value = [
-    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '0', printStatusName: '未打印', certificateReportTypeName: '自检', approvalStatusName: '待审批', taskId: '100', id: '10' },
-    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '1', printStatusName: '已打印', certificateReportTypeName: '自检', approvalStatusName: '待审批', taskId: '1001', id: '101' },
-  ]
-  // getCertList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getCertList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -167,7 +174,12 @@
 }
 // 点击重置
 const clearList = () => {
+  const approvalStatus = menu.value.find(item => item.name === activeTitle.value)!.id
   listQuery.value = {
+    certificateClass: '',
+    certificateNo: '', // 证书编号
+    createUserId: 0,
+    printStatus: 0, // 可打印(证书可打印传0,全部传null)
     certificationReportCode: '', // 证书编号
     orderNo: '', // 委托书编号
     customerName: '', // 委托方名称
@@ -176,14 +188,18 @@
     certificateReportType: '', // 证书类型
     printNum: '', // 打印次数 -未打印和全部用
     approvalStatus: '', // 审批状态-审批查询用
-    orderId: '0', // 委托书id
+    orderId: '', // 委托书id
     reason: '', // 操作原因
-    sampleId: '0', // 样品id
+    sampleId: '', // 样品id
     status: '', // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
     formId: SCHEDULE.BUSINESS_CERT_PRINT,
     offset: 1,
     limit: 20,
   }
+  listQuery.value.approvalStatus = approvalStatus
+  if (activeTitle.value === '可打印' || activeTitle.value === '全部') {
+    listQuery.value.approvalStatus = ''
+  }
   fetchData(true)
 }
 // 点击详情
@@ -226,14 +242,14 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   if (list.value.length > 0) {
-    // const params = {
-    //   ...listQuery.value,
-    //   ids: checkoutList.value,
-    // }
-    // exportCert(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '证书打印列表.xlsx')
-    // })
+    const params = {
+      ...listQuery.value,
+      ids: checkoutList.value,
+    }
+    exportCert(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '证书打印列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
@@ -243,10 +259,9 @@
 
 // 打印
 const bindLabel = (row: ICerPrintList) => {
-  console.log(1)
-  row.printNum = 1
+  console.log(row)
   // 判断状态第一次可以直接打印,之后的打印需要审批
-  if (row.printNum == 1) {
+  if (row.printNum == 0) {
     ElMessageBox.confirm(
       '确定要打印吗？',
       '确认操作',
@@ -319,18 +334,9 @@
 
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
-    active.value = window.sessionStorage.getItem('buttonBoxActive')!
-  }
-  else {
-    active.value = menu.value.find(item => item.name === '可打印')!.id // 可打
-    activeTitle.value === '可打印'
-  }
+
   fetchData(true)
 })
-onUnmounted(() => {
-  window.sessionStorage.setItem('buttonBoxActive', '') // 清除
-})
 </script>
 
 <template>
@@ -342,7 +348,7 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.certificationReportCode"
+          v-model.trim="listQuery.certificateNo"
           placeholder="证书编号"
           class="short-input"
           clearable
@@ -373,7 +379,7 @@
         />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 120px;" clearable>
+        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 160px;" clearable>
           <el-option v-for="item in certificationClassList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
@@ -388,19 +394,19 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column v-if="listQuery.printNum === ''" label="审批状态" align="center" width="90px" prop="approvalStatusName" />
+          <el-table-column label="审批状态" align="center" width="90px" prop="approvalStatusName" />
           <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.printNum === 0 || (listQuery.approvalStatus === '3')" size="small" link type="primary" @click="bindLabel(row)">
+              <el-button v-if="activeTitle === '全部' || activeTitle === '可打印'" size="small" link type="primary" @click="bindLabel(row)">
                 打印
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'agree')">
+              <el-button v-if="activeTitle === '待审批'" size="small" type="primary" link @click="handleDistribute(row, 'agree')">
                 同意
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'refuse')">
+              <el-button v-if="activeTitle === '待审批'" size="small" type="primary" link @click="handleDistribute(row, 'refuse')">
                 拒绝
               </el-button>
             </template>

diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index dbce999..5bd4111 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -45,6 +45,15 @@
     data,
   })
 }
+
+// 设备借用驳回后编辑
+export function failUpdate(data: object) {
+  return request({
+    url: '/equipmentApply/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 // 设备借用申请删除
 export function deleteApply(data: object) {
   return request({
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 9049282..7f9431b 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -1,6 +1,6 @@
 // 状态管理相关接口api
 import request from '../index'
-import type { ISearchQuery, ITableRow, Iapprove } from '@/views/device/stateManage/components/status-interface.ts'
+import type { ISearchQuery, Iapprove } from '@/views/device/stateManage/components/status-interface'
 
 // 设备申请列表
 export function getStatusList(data: ISearchQuery) {
@@ -11,7 +11,7 @@
   })
 }
 // 状态管理新建
-export function addStatus(data: ITableRow) {
+export function addStatus(data: Object) {
   return request({
     url: '/meter/stateManage/addStateManageInfo',
     method: 'post',
@@ -20,7 +20,7 @@
 }
 
 // 状态管理编辑
-export function updateStatus(data: ITableRow) {
+export function updateStatus(data: Object) {
   return request({
     url: '/meter/stateManage/updateStateManageInfo',
     method: 'post',
@@ -53,7 +53,7 @@
   })
 }
 // 状态管理详情
-export function detailStatus(data: ITableRow) {
+export function detailStatus(data: object) {
   return request({
     url: '/meter/stateManage/selectStateManageInfo',
     method: 'post',
diff --git a/src/components/SearchArea/SearchItem.vue b/src/components/SearchArea/SearchItem.vue
index 3adef93..dc53b08 100644
--- a/src/components/SearchArea/SearchItem.vue
+++ b/src/components/SearchArea/SearchItem.vue
@@ -23,7 +23,6 @@
   display: inline-block;
   margin-bottom: 10px;
   vertical-align: top;
-  box-sizing: inherit;
   margin-right: 5px;
 }
 
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index 12d7290..e3c72af 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -1,5 +1,9 @@
 // 证书打印查询
 export interface ICertPrintSearch {
+  certificateClass: string
+  certificateNo: string
+  createUserId: number
+  printStatus: number | null
   certificationReportCode: string // 证书编号
   orderNo: string // 委托书编号
   customerName: string // 委托方名称
@@ -13,7 +17,7 @@
   reason: string // 操作原因
   sampleId: string // 样品id
   status: string // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
-  ids?: []
+  ids?: [] | null
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 3daa2b5..391931b 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -22,6 +22,10 @@
 const activeTitle = ref('') // active对应的审批状态名字
 // 查询条件
 const listQuery = ref<ICertPrintSearch>({
+  certificateClass: '',
+  certificateNo: '', // 证书编号
+  createUserId: 0,
+  printStatus: 0, // 可打印(证书可打印传0,全部传null)
   certificationReportCode: '', // 证书编号
   orderNo: '', // 委托书编号
   customerName: '', // 委托方名称
@@ -30,11 +34,12 @@
   certificateReportType: '', // 证书类型
   printNum: '', // 打印次数 -未打印和全部用
   approvalStatus: '', // 审批状态-审批查询用
-  orderId: '0', // 委托书id
+  orderId: '', // 委托书id
   reason: '', // 操作原因
-  sampleId: '0', // 样品id
+  sampleId: '', // 样品id
   status: '', // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
   formId: SCHEDULE.BUSINESS_CERT_PRINT,
+  ids: null, // 设置默认值
   offset: 1,
   limit: 20,
 })
@@ -78,22 +83,30 @@
         }
       }
     })
+    if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+      active.value = window.sessionStorage.getItem('buttonBoxActive')!
+      activeTitle.value === '未通过'
+    }
+    else {
+      active.value = menu.value.find(item => item.name === '可打印')!.id // 可打印
+      activeTitle.value === '可打印'
+    }
   })
 }
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationReportCode', width: '110', align: 'center' },
-  { text: '证书名称', value: 'certificationReportName', width: '120', align: 'center' },
+  { text: '证书编号', value: 'certificateNo', width: '110', align: 'center' },
+  { text: '证书名称', value: 'certificateName', width: '120', align: 'center' },
   { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', width: '120', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', width: '120', align: 'center' },
   { text: '委托书编号', value: 'orderNo', width: '120', align: 'center' },
-  { text: '检校类别', value: 'customerNo', width: '120', align: 'center' },
-  { text: '检定人员', value: 'customerName', width: '120', align: 'center' },
-  { text: '证书类型', value: 'certificateReportTypeName', width: '120', align: 'center' },
-  { text: '打印状态', value: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
+  { text: '检校类别', value: 'measureType', width: '120', align: 'center' },
+  { text: '检定人员', value: 'measurePersonId', width: '120', align: 'center' },
+  { text: '证书类型', value: 'certificateType', width: '120', align: 'center' },
+  { text: '打印状态', value: 'printNum', align: 'center', width: '85px', filter: (row: ICerPrintList) => { var cnum = ['未打印', '一', '二', '三', '四', '五', '六', '七', '八', '九', '十']; return row.printNum == 0 ? '未打印' : `${cnum[parseInt(row.printNum)]}次打印` } },
   { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
 ])
 // 表格数据
@@ -107,37 +120,35 @@
 
 // 根据过滤查询条件
 function filterQuery() {
-  console.log(activeTitle)
+  const approvalStatus = menu.value.find(item => item.name === activeTitle.value)!.id
+  listQuery.value.approvalStatus = approvalStatus
   switch (activeTitle.value) {
     case '可打印':
-      listQuery.value.printNum = 0
+      listQuery.value.printStatus = 0
       listQuery.value.approvalStatus = ''
       break
     case '全部':
-      listQuery.value.printNum = 0
+      listQuery.value.printStatus = 2
       listQuery.value.approvalStatus = ''
       break
     case '待审批':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '1'
+      listQuery.value.printStatus = 2
       break
     case '审批中':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '2'
+      listQuery.value.printStatus = 2
       break
     case '已通过':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '3'
+      listQuery.value.printStatus = 2
       break
     case '未通过':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '4'
+      listQuery.value.printStatus = 2
       break
   }
 }
 
 // 数据查询
 function fetchData(isNowPage = false) {
+  console.log(listQuery)
   filterQuery()
   loadingTable.value = true
   if (!isNowPage) {
@@ -146,15 +157,11 @@
   }
   // 模拟数据
   loadingTable.value = false
-  list.value = [
-    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '0', printStatusName: '未打印', certificateReportTypeName: '自检', approvalStatusName: '待审批', taskId: '100', id: '10' },
-    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '1', printStatusName: '已打印', certificateReportTypeName: '自检', approvalStatusName: '待审批', taskId: '1001', id: '101' },
-  ]
-  // getCertList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getCertList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -167,7 +174,12 @@
 }
 // 点击重置
 const clearList = () => {
+  const approvalStatus = menu.value.find(item => item.name === activeTitle.value)!.id
   listQuery.value = {
+    certificateClass: '',
+    certificateNo: '', // 证书编号
+    createUserId: 0,
+    printStatus: 0, // 可打印(证书可打印传0,全部传null)
     certificationReportCode: '', // 证书编号
     orderNo: '', // 委托书编号
     customerName: '', // 委托方名称
@@ -176,14 +188,18 @@
     certificateReportType: '', // 证书类型
     printNum: '', // 打印次数 -未打印和全部用
     approvalStatus: '', // 审批状态-审批查询用
-    orderId: '0', // 委托书id
+    orderId: '', // 委托书id
     reason: '', // 操作原因
-    sampleId: '0', // 样品id
+    sampleId: '', // 样品id
     status: '', // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
     formId: SCHEDULE.BUSINESS_CERT_PRINT,
     offset: 1,
     limit: 20,
   }
+  listQuery.value.approvalStatus = approvalStatus
+  if (activeTitle.value === '可打印' || activeTitle.value === '全部') {
+    listQuery.value.approvalStatus = ''
+  }
   fetchData(true)
 }
 // 点击详情
@@ -226,14 +242,14 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   if (list.value.length > 0) {
-    // const params = {
-    //   ...listQuery.value,
-    //   ids: checkoutList.value,
-    // }
-    // exportCert(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '证书打印列表.xlsx')
-    // })
+    const params = {
+      ...listQuery.value,
+      ids: checkoutList.value,
+    }
+    exportCert(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '证书打印列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
@@ -243,10 +259,9 @@
 
 // 打印
 const bindLabel = (row: ICerPrintList) => {
-  console.log(1)
-  row.printNum = 1
+  console.log(row)
   // 判断状态第一次可以直接打印,之后的打印需要审批
-  if (row.printNum == 1) {
+  if (row.printNum == 0) {
     ElMessageBox.confirm(
       '确定要打印吗？',
       '确认操作',
@@ -319,18 +334,9 @@
 
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
-    active.value = window.sessionStorage.getItem('buttonBoxActive')!
-  }
-  else {
-    active.value = menu.value.find(item => item.name === '可打印')!.id // 可打
-    activeTitle.value === '可打印'
-  }
+
   fetchData(true)
 })
-onUnmounted(() => {
-  window.sessionStorage.setItem('buttonBoxActive', '') // 清除
-})
 </script>
 
 <template>
@@ -342,7 +348,7 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.certificationReportCode"
+          v-model.trim="listQuery.certificateNo"
           placeholder="证书编号"
           class="short-input"
           clearable
@@ -373,7 +379,7 @@
         />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 120px;" clearable>
+        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 160px;" clearable>
           <el-option v-for="item in certificationClassList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
@@ -388,19 +394,19 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column v-if="listQuery.printNum === ''" label="审批状态" align="center" width="90px" prop="approvalStatusName" />
+          <el-table-column label="审批状态" align="center" width="90px" prop="approvalStatusName" />
           <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.printNum === 0 || (listQuery.approvalStatus === '3')" size="small" link type="primary" @click="bindLabel(row)">
+              <el-button v-if="activeTitle === '全部' || activeTitle === '可打印'" size="small" link type="primary" @click="bindLabel(row)">
                 打印
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'agree')">
+              <el-button v-if="activeTitle === '待审批'" size="small" type="primary" link @click="handleDistribute(row, 'agree')">
                 同意
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'refuse')">
+              <el-button v-if="activeTitle === '待审批'" size="small" type="primary" link @click="handleDistribute(row, 'refuse')">
                 拒绝
               </el-button>
             </template>
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 2f8f8a4..fa8e6b0 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -392,4 +392,7 @@
 
 <style lang="scss" scoped>
 // 样式
+.short-input {
+  width: 180px !important;
+}
 </style>

diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index dbce999..5bd4111 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -45,6 +45,15 @@
     data,
   })
 }
+
+// 设备借用驳回后编辑
+export function failUpdate(data: object) {
+  return request({
+    url: '/equipmentApply/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 // 设备借用申请删除
 export function deleteApply(data: object) {
   return request({
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 9049282..7f9431b 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -1,6 +1,6 @@
 // 状态管理相关接口api
 import request from '../index'
-import type { ISearchQuery, ITableRow, Iapprove } from '@/views/device/stateManage/components/status-interface.ts'
+import type { ISearchQuery, Iapprove } from '@/views/device/stateManage/components/status-interface'
 
 // 设备申请列表
 export function getStatusList(data: ISearchQuery) {
@@ -11,7 +11,7 @@
   })
 }
 // 状态管理新建
-export function addStatus(data: ITableRow) {
+export function addStatus(data: Object) {
   return request({
     url: '/meter/stateManage/addStateManageInfo',
     method: 'post',
@@ -20,7 +20,7 @@
 }
 
 // 状态管理编辑
-export function updateStatus(data: ITableRow) {
+export function updateStatus(data: Object) {
   return request({
     url: '/meter/stateManage/updateStateManageInfo',
     method: 'post',
@@ -53,7 +53,7 @@
   })
 }
 // 状态管理详情
-export function detailStatus(data: ITableRow) {
+export function detailStatus(data: object) {
   return request({
     url: '/meter/stateManage/selectStateManageInfo',
     method: 'post',
diff --git a/src/components/SearchArea/SearchItem.vue b/src/components/SearchArea/SearchItem.vue
index 3adef93..dc53b08 100644
--- a/src/components/SearchArea/SearchItem.vue
+++ b/src/components/SearchArea/SearchItem.vue
@@ -23,7 +23,6 @@
   display: inline-block;
   margin-bottom: 10px;
   vertical-align: top;
-  box-sizing: inherit;
   margin-right: 5px;
 }
 
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index 12d7290..e3c72af 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -1,5 +1,9 @@
 // 证书打印查询
 export interface ICertPrintSearch {
+  certificateClass: string
+  certificateNo: string
+  createUserId: number
+  printStatus: number | null
   certificationReportCode: string // 证书编号
   orderNo: string // 委托书编号
   customerName: string // 委托方名称
@@ -13,7 +17,7 @@
   reason: string // 操作原因
   sampleId: string // 样品id
   status: string // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
-  ids?: []
+  ids?: [] | null
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 3daa2b5..391931b 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -22,6 +22,10 @@
 const activeTitle = ref('') // active对应的审批状态名字
 // 查询条件
 const listQuery = ref<ICertPrintSearch>({
+  certificateClass: '',
+  certificateNo: '', // 证书编号
+  createUserId: 0,
+  printStatus: 0, // 可打印(证书可打印传0,全部传null)
   certificationReportCode: '', // 证书编号
   orderNo: '', // 委托书编号
   customerName: '', // 委托方名称
@@ -30,11 +34,12 @@
   certificateReportType: '', // 证书类型
   printNum: '', // 打印次数 -未打印和全部用
   approvalStatus: '', // 审批状态-审批查询用
-  orderId: '0', // 委托书id
+  orderId: '', // 委托书id
   reason: '', // 操作原因
-  sampleId: '0', // 样品id
+  sampleId: '', // 样品id
   status: '', // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
   formId: SCHEDULE.BUSINESS_CERT_PRINT,
+  ids: null, // 设置默认值
   offset: 1,
   limit: 20,
 })
@@ -78,22 +83,30 @@
         }
       }
     })
+    if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+      active.value = window.sessionStorage.getItem('buttonBoxActive')!
+      activeTitle.value === '未通过'
+    }
+    else {
+      active.value = menu.value.find(item => item.name === '可打印')!.id // 可打印
+      activeTitle.value === '可打印'
+    }
   })
 }
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationReportCode', width: '110', align: 'center' },
-  { text: '证书名称', value: 'certificationReportName', width: '120', align: 'center' },
+  { text: '证书编号', value: 'certificateNo', width: '110', align: 'center' },
+  { text: '证书名称', value: 'certificateName', width: '120', align: 'center' },
   { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', width: '120', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', width: '120', align: 'center' },
   { text: '委托书编号', value: 'orderNo', width: '120', align: 'center' },
-  { text: '检校类别', value: 'customerNo', width: '120', align: 'center' },
-  { text: '检定人员', value: 'customerName', width: '120', align: 'center' },
-  { text: '证书类型', value: 'certificateReportTypeName', width: '120', align: 'center' },
-  { text: '打印状态', value: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
+  { text: '检校类别', value: 'measureType', width: '120', align: 'center' },
+  { text: '检定人员', value: 'measurePersonId', width: '120', align: 'center' },
+  { text: '证书类型', value: 'certificateType', width: '120', align: 'center' },
+  { text: '打印状态', value: 'printNum', align: 'center', width: '85px', filter: (row: ICerPrintList) => { var cnum = ['未打印', '一', '二', '三', '四', '五', '六', '七', '八', '九', '十']; return row.printNum == 0 ? '未打印' : `${cnum[parseInt(row.printNum)]}次打印` } },
   { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
 ])
 // 表格数据
@@ -107,37 +120,35 @@
 
 // 根据过滤查询条件
 function filterQuery() {
-  console.log(activeTitle)
+  const approvalStatus = menu.value.find(item => item.name === activeTitle.value)!.id
+  listQuery.value.approvalStatus = approvalStatus
   switch (activeTitle.value) {
     case '可打印':
-      listQuery.value.printNum = 0
+      listQuery.value.printStatus = 0
       listQuery.value.approvalStatus = ''
       break
     case '全部':
-      listQuery.value.printNum = 0
+      listQuery.value.printStatus = 2
       listQuery.value.approvalStatus = ''
       break
     case '待审批':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '1'
+      listQuery.value.printStatus = 2
       break
     case '审批中':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '2'
+      listQuery.value.printStatus = 2
       break
     case '已通过':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '3'
+      listQuery.value.printStatus = 2
       break
     case '未通过':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '4'
+      listQuery.value.printStatus = 2
       break
   }
 }
 
 // 数据查询
 function fetchData(isNowPage = false) {
+  console.log(listQuery)
   filterQuery()
   loadingTable.value = true
   if (!isNowPage) {
@@ -146,15 +157,11 @@
   }
   // 模拟数据
   loadingTable.value = false
-  list.value = [
-    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '0', printStatusName: '未打印', certificateReportTypeName: '自检', approvalStatusName: '待审批', taskId: '100', id: '10' },
-    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '1', printStatusName: '已打印', certificateReportTypeName: '自检', approvalStatusName: '待审批', taskId: '1001', id: '101' },
-  ]
-  // getCertList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getCertList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -167,7 +174,12 @@
 }
 // 点击重置
 const clearList = () => {
+  const approvalStatus = menu.value.find(item => item.name === activeTitle.value)!.id
   listQuery.value = {
+    certificateClass: '',
+    certificateNo: '', // 证书编号
+    createUserId: 0,
+    printStatus: 0, // 可打印(证书可打印传0,全部传null)
     certificationReportCode: '', // 证书编号
     orderNo: '', // 委托书编号
     customerName: '', // 委托方名称
@@ -176,14 +188,18 @@
     certificateReportType: '', // 证书类型
     printNum: '', // 打印次数 -未打印和全部用
     approvalStatus: '', // 审批状态-审批查询用
-    orderId: '0', // 委托书id
+    orderId: '', // 委托书id
     reason: '', // 操作原因
-    sampleId: '0', // 样品id
+    sampleId: '', // 样品id
     status: '', // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
     formId: SCHEDULE.BUSINESS_CERT_PRINT,
     offset: 1,
     limit: 20,
   }
+  listQuery.value.approvalStatus = approvalStatus
+  if (activeTitle.value === '可打印' || activeTitle.value === '全部') {
+    listQuery.value.approvalStatus = ''
+  }
   fetchData(true)
 }
 // 点击详情
@@ -226,14 +242,14 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   if (list.value.length > 0) {
-    // const params = {
-    //   ...listQuery.value,
-    //   ids: checkoutList.value,
-    // }
-    // exportCert(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '证书打印列表.xlsx')
-    // })
+    const params = {
+      ...listQuery.value,
+      ids: checkoutList.value,
+    }
+    exportCert(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '证书打印列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
@@ -243,10 +259,9 @@
 
 // 打印
 const bindLabel = (row: ICerPrintList) => {
-  console.log(1)
-  row.printNum = 1
+  console.log(row)
   // 判断状态第一次可以直接打印,之后的打印需要审批
-  if (row.printNum == 1) {
+  if (row.printNum == 0) {
     ElMessageBox.confirm(
       '确定要打印吗？',
       '确认操作',
@@ -319,18 +334,9 @@
 
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
-    active.value = window.sessionStorage.getItem('buttonBoxActive')!
-  }
-  else {
-    active.value = menu.value.find(item => item.name === '可打印')!.id // 可打
-    activeTitle.value === '可打印'
-  }
+
   fetchData(true)
 })
-onUnmounted(() => {
-  window.sessionStorage.setItem('buttonBoxActive', '') // 清除
-})
 </script>
 
 <template>
@@ -342,7 +348,7 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.certificationReportCode"
+          v-model.trim="listQuery.certificateNo"
           placeholder="证书编号"
           class="short-input"
           clearable
@@ -373,7 +379,7 @@
         />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 120px;" clearable>
+        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 160px;" clearable>
           <el-option v-for="item in certificationClassList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
@@ -388,19 +394,19 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column v-if="listQuery.printNum === ''" label="审批状态" align="center" width="90px" prop="approvalStatusName" />
+          <el-table-column label="审批状态" align="center" width="90px" prop="approvalStatusName" />
           <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.printNum === 0 || (listQuery.approvalStatus === '3')" size="small" link type="primary" @click="bindLabel(row)">
+              <el-button v-if="activeTitle === '全部' || activeTitle === '可打印'" size="small" link type="primary" @click="bindLabel(row)">
                 打印
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'agree')">
+              <el-button v-if="activeTitle === '待审批'" size="small" type="primary" link @click="handleDistribute(row, 'agree')">
                 同意
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'refuse')">
+              <el-button v-if="activeTitle === '待审批'" size="small" type="primary" link @click="handleDistribute(row, 'refuse')">
                 拒绝
               </el-button>
             </template>
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 2f8f8a4..fa8e6b0 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -392,4 +392,7 @@
 
 <style lang="scss" scoped>
 // 样式
+.short-input {
+  width: 180px !important;
+}
 </style>
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 2e8e4a7..5d7fc0f 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,5 +1,5 @@
 <!-- 设备借用处理 -->
-<script lang="ts" setup name="borrowApply">
+<script lang="ts" setup name="BorrowHandle">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
@@ -44,7 +44,7 @@
   applyPersonName: '', // 申请人姓名
   startTime: '', // 领用开始日期
   endTime: '', // 领用结束日期
-  approvalStatus: '4', // 	审批状态
+  approvalStatus: '4', // 	审批状态 (已完成)
   processResult: '1' || active.value, // 	处置结果 (3个状态字典值)
   applyType: '2', // 申请类型 借用2
   createUser: '', // 创建人
@@ -373,7 +373,7 @@
     active.value = window.sessionStorage.getItem('buttonBoxActive')!
   }
   else {
-    active.value = menu.value.find(item => item.name === '待借用')!.id // 全部
+    active.value = menu.value.find(item => item.name === '待借用')!.id // 待借用
     activeTitle.value === '待借用'
   }
   nextTick(() => {
@@ -394,6 +394,7 @@
         <el-input
           v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
+          class="short-input"
           clearable
         />
       </search-item>
@@ -401,6 +402,7 @@
         <el-input
           v-model.trim="listQuery.applyName"
           placeholder="申请名称"
+          class="short-input"
           clearable
         />
       </search-item>

diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index dbce999..5bd4111 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -45,6 +45,15 @@
     data,
   })
 }
+
+// 设备借用驳回后编辑
+export function failUpdate(data: object) {
+  return request({
+    url: '/equipmentApply/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 // 设备借用申请删除
 export function deleteApply(data: object) {
   return request({
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 9049282..7f9431b 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -1,6 +1,6 @@
 // 状态管理相关接口api
 import request from '../index'
-import type { ISearchQuery, ITableRow, Iapprove } from '@/views/device/stateManage/components/status-interface.ts'
+import type { ISearchQuery, Iapprove } from '@/views/device/stateManage/components/status-interface'
 
 // 设备申请列表
 export function getStatusList(data: ISearchQuery) {
@@ -11,7 +11,7 @@
   })
 }
 // 状态管理新建
-export function addStatus(data: ITableRow) {
+export function addStatus(data: Object) {
   return request({
     url: '/meter/stateManage/addStateManageInfo',
     method: 'post',
@@ -20,7 +20,7 @@
 }
 
 // 状态管理编辑
-export function updateStatus(data: ITableRow) {
+export function updateStatus(data: Object) {
   return request({
     url: '/meter/stateManage/updateStateManageInfo',
     method: 'post',
@@ -53,7 +53,7 @@
   })
 }
 // 状态管理详情
-export function detailStatus(data: ITableRow) {
+export function detailStatus(data: object) {
   return request({
     url: '/meter/stateManage/selectStateManageInfo',
     method: 'post',
diff --git a/src/components/SearchArea/SearchItem.vue b/src/components/SearchArea/SearchItem.vue
index 3adef93..dc53b08 100644
--- a/src/components/SearchArea/SearchItem.vue
+++ b/src/components/SearchArea/SearchItem.vue
@@ -23,7 +23,6 @@
   display: inline-block;
   margin-bottom: 10px;
   vertical-align: top;
-  box-sizing: inherit;
   margin-right: 5px;
 }
 
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index 12d7290..e3c72af 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -1,5 +1,9 @@
 // 证书打印查询
 export interface ICertPrintSearch {
+  certificateClass: string
+  certificateNo: string
+  createUserId: number
+  printStatus: number | null
   certificationReportCode: string // 证书编号
   orderNo: string // 委托书编号
   customerName: string // 委托方名称
@@ -13,7 +17,7 @@
   reason: string // 操作原因
   sampleId: string // 样品id
   status: string // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
-  ids?: []
+  ids?: [] | null
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 3daa2b5..391931b 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -22,6 +22,10 @@
 const activeTitle = ref('') // active对应的审批状态名字
 // 查询条件
 const listQuery = ref<ICertPrintSearch>({
+  certificateClass: '',
+  certificateNo: '', // 证书编号
+  createUserId: 0,
+  printStatus: 0, // 可打印(证书可打印传0,全部传null)
   certificationReportCode: '', // 证书编号
   orderNo: '', // 委托书编号
   customerName: '', // 委托方名称
@@ -30,11 +34,12 @@
   certificateReportType: '', // 证书类型
   printNum: '', // 打印次数 -未打印和全部用
   approvalStatus: '', // 审批状态-审批查询用
-  orderId: '0', // 委托书id
+  orderId: '', // 委托书id
   reason: '', // 操作原因
-  sampleId: '0', // 样品id
+  sampleId: '', // 样品id
   status: '', // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
   formId: SCHEDULE.BUSINESS_CERT_PRINT,
+  ids: null, // 设置默认值
   offset: 1,
   limit: 20,
 })
@@ -78,22 +83,30 @@
         }
       }
     })
+    if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+      active.value = window.sessionStorage.getItem('buttonBoxActive')!
+      activeTitle.value === '未通过'
+    }
+    else {
+      active.value = menu.value.find(item => item.name === '可打印')!.id // 可打印
+      activeTitle.value === '可打印'
+    }
   })
 }
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationReportCode', width: '110', align: 'center' },
-  { text: '证书名称', value: 'certificationReportName', width: '120', align: 'center' },
+  { text: '证书编号', value: 'certificateNo', width: '110', align: 'center' },
+  { text: '证书名称', value: 'certificateName', width: '120', align: 'center' },
   { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', width: '120', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', width: '120', align: 'center' },
   { text: '委托书编号', value: 'orderNo', width: '120', align: 'center' },
-  { text: '检校类别', value: 'customerNo', width: '120', align: 'center' },
-  { text: '检定人员', value: 'customerName', width: '120', align: 'center' },
-  { text: '证书类型', value: 'certificateReportTypeName', width: '120', align: 'center' },
-  { text: '打印状态', value: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
+  { text: '检校类别', value: 'measureType', width: '120', align: 'center' },
+  { text: '检定人员', value: 'measurePersonId', width: '120', align: 'center' },
+  { text: '证书类型', value: 'certificateType', width: '120', align: 'center' },
+  { text: '打印状态', value: 'printNum', align: 'center', width: '85px', filter: (row: ICerPrintList) => { var cnum = ['未打印', '一', '二', '三', '四', '五', '六', '七', '八', '九', '十']; return row.printNum == 0 ? '未打印' : `${cnum[parseInt(row.printNum)]}次打印` } },
   { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
 ])
 // 表格数据
@@ -107,37 +120,35 @@
 
 // 根据过滤查询条件
 function filterQuery() {
-  console.log(activeTitle)
+  const approvalStatus = menu.value.find(item => item.name === activeTitle.value)!.id
+  listQuery.value.approvalStatus = approvalStatus
   switch (activeTitle.value) {
     case '可打印':
-      listQuery.value.printNum = 0
+      listQuery.value.printStatus = 0
       listQuery.value.approvalStatus = ''
       break
     case '全部':
-      listQuery.value.printNum = 0
+      listQuery.value.printStatus = 2
       listQuery.value.approvalStatus = ''
       break
     case '待审批':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '1'
+      listQuery.value.printStatus = 2
       break
     case '审批中':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '2'
+      listQuery.value.printStatus = 2
       break
     case '已通过':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '3'
+      listQuery.value.printStatus = 2
       break
     case '未通过':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '4'
+      listQuery.value.printStatus = 2
       break
   }
 }
 
 // 数据查询
 function fetchData(isNowPage = false) {
+  console.log(listQuery)
   filterQuery()
   loadingTable.value = true
   if (!isNowPage) {
@@ -146,15 +157,11 @@
   }
   // 模拟数据
   loadingTable.value = false
-  list.value = [
-    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '0', printStatusName: '未打印', certificateReportTypeName: '自检', approvalStatusName: '待审批', taskId: '100', id: '10' },
-    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '1', printStatusName: '已打印', certificateReportTypeName: '自检', approvalStatusName: '待审批', taskId: '1001', id: '101' },
-  ]
-  // getCertList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getCertList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -167,7 +174,12 @@
 }
 // 点击重置
 const clearList = () => {
+  const approvalStatus = menu.value.find(item => item.name === activeTitle.value)!.id
   listQuery.value = {
+    certificateClass: '',
+    certificateNo: '', // 证书编号
+    createUserId: 0,
+    printStatus: 0, // 可打印(证书可打印传0,全部传null)
     certificationReportCode: '', // 证书编号
     orderNo: '', // 委托书编号
     customerName: '', // 委托方名称
@@ -176,14 +188,18 @@
     certificateReportType: '', // 证书类型
     printNum: '', // 打印次数 -未打印和全部用
     approvalStatus: '', // 审批状态-审批查询用
-    orderId: '0', // 委托书id
+    orderId: '', // 委托书id
     reason: '', // 操作原因
-    sampleId: '0', // 样品id
+    sampleId: '', // 样品id
     status: '', // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
     formId: SCHEDULE.BUSINESS_CERT_PRINT,
     offset: 1,
     limit: 20,
   }
+  listQuery.value.approvalStatus = approvalStatus
+  if (activeTitle.value === '可打印' || activeTitle.value === '全部') {
+    listQuery.value.approvalStatus = ''
+  }
   fetchData(true)
 }
 // 点击详情
@@ -226,14 +242,14 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   if (list.value.length > 0) {
-    // const params = {
-    //   ...listQuery.value,
-    //   ids: checkoutList.value,
-    // }
-    // exportCert(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '证书打印列表.xlsx')
-    // })
+    const params = {
+      ...listQuery.value,
+      ids: checkoutList.value,
+    }
+    exportCert(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '证书打印列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
@@ -243,10 +259,9 @@
 
 // 打印
 const bindLabel = (row: ICerPrintList) => {
-  console.log(1)
-  row.printNum = 1
+  console.log(row)
   // 判断状态第一次可以直接打印,之后的打印需要审批
-  if (row.printNum == 1) {
+  if (row.printNum == 0) {
     ElMessageBox.confirm(
       '确定要打印吗？',
       '确认操作',
@@ -319,18 +334,9 @@
 
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
-    active.value = window.sessionStorage.getItem('buttonBoxActive')!
-  }
-  else {
-    active.value = menu.value.find(item => item.name === '可打印')!.id // 可打
-    activeTitle.value === '可打印'
-  }
+
   fetchData(true)
 })
-onUnmounted(() => {
-  window.sessionStorage.setItem('buttonBoxActive', '') // 清除
-})
 </script>
 
 <template>
@@ -342,7 +348,7 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.certificationReportCode"
+          v-model.trim="listQuery.certificateNo"
           placeholder="证书编号"
           class="short-input"
           clearable
@@ -373,7 +379,7 @@
         />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 120px;" clearable>
+        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 160px;" clearable>
           <el-option v-for="item in certificationClassList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
@@ -388,19 +394,19 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column v-if="listQuery.printNum === ''" label="审批状态" align="center" width="90px" prop="approvalStatusName" />
+          <el-table-column label="审批状态" align="center" width="90px" prop="approvalStatusName" />
           <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.printNum === 0 || (listQuery.approvalStatus === '3')" size="small" link type="primary" @click="bindLabel(row)">
+              <el-button v-if="activeTitle === '全部' || activeTitle === '可打印'" size="small" link type="primary" @click="bindLabel(row)">
                 打印
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'agree')">
+              <el-button v-if="activeTitle === '待审批'" size="small" type="primary" link @click="handleDistribute(row, 'agree')">
                 同意
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'refuse')">
+              <el-button v-if="activeTitle === '待审批'" size="small" type="primary" link @click="handleDistribute(row, 'refuse')">
                 拒绝
               </el-button>
             </template>
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 2f8f8a4..fa8e6b0 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -392,4 +392,7 @@
 
 <style lang="scss" scoped>
 // 样式
+.short-input {
+  width: 180px !important;
+}
 </style>
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 2e8e4a7..5d7fc0f 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,5 +1,5 @@
 <!-- 设备借用处理 -->
-<script lang="ts" setup name="borrowApply">
+<script lang="ts" setup name="BorrowHandle">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
@@ -44,7 +44,7 @@
   applyPersonName: '', // 申请人姓名
   startTime: '', // 领用开始日期
   endTime: '', // 领用结束日期
-  approvalStatus: '4', // 	审批状态
+  approvalStatus: '4', // 	审批状态 (已完成)
   processResult: '1' || active.value, // 	处置结果 (3个状态字典值)
   applyType: '2', // 申请类型 借用2
   createUser: '', // 创建人
@@ -373,7 +373,7 @@
     active.value = window.sessionStorage.getItem('buttonBoxActive')!
   }
   else {
-    active.value = menu.value.find(item => item.name === '待借用')!.id // 全部
+    active.value = menu.value.find(item => item.name === '待借用')!.id // 待借用
     activeTitle.value === '待借用'
   }
   nextTick(() => {
@@ -394,6 +394,7 @@
         <el-input
           v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
+          class="short-input"
           clearable
         />
       </search-item>
@@ -401,6 +402,7 @@
         <el-input
           v-model.trim="listQuery.applyName"
           placeholder="申请名称"
+          class="short-input"
           clearable
         />
       </search-item>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index aae69c7..a59267d 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,5 +1,5 @@
 <!-- 设备借用申请 -->
-<script lang="ts" setup name="borrowApply">
+<script lang="ts" setup name="BorrowApply">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
@@ -49,7 +49,7 @@
   applyPersonName: '', // 申请人姓名
   startTime: '', // 领用开始日期
   endTime: '', // 领用结束日期
-  approvalStatus: active.value, // 	审批状态
+  approvalStatus: active.value, // 	审批状态 1 2 3 对应待借用|已借用|已归还
   processResult: '', // 	处置结果
   applyType: '2', // 申请类型 借用2
   createUser: '', // 创建人
@@ -156,7 +156,7 @@
     applyPerson: '', // 申请人
     startTime: '', // 申请开始日期
     endTime: '', // 申请结束日期
-    approvalStatus: active.value, // 	审批状态
+    approvalStatus: active.value, // 	审批状态  // 	审批状态 1 2 3 对应待借用|已借用|已归还
     processResult: '', // 	处置结果
     applyType: '2', // 申请类型 借用2
     createUser: '', // 创建人
@@ -193,27 +193,8 @@
   })
 }
 
-onMounted(async () => {
-  await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
-    active.value = window.sessionStorage.getItem('buttonBoxActive')!
-  }
-  else {
-    active.value = menu.value.find(item => item.name === '全部')!.id // 全部
-    activeTitle.value === '全部'
-  }
-  nextTick(() => {
-    fetchData(true) // 获取表格数据
-    fetchDeptTreeList() // 获取使用部门
-    fetchUserList() // 获取人员列表
-  })
-})
 const $router = useRouter()
 
-onUnmounted(() => {
-  window.sessionStorage.setItem('buttonBoxActive', '') // 清除
-})
-
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
@@ -434,6 +415,21 @@
     }
   }
 }
+onMounted(async () => {
+  await getDict() // 获取字典-审批状态
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+    active.value = window.sessionStorage.getItem('buttonBoxActive')!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '全部')!.id // 全部
+    activeTitle.value === '全部'
+  }
+  nextTick(() => {
+    fetchData(true) // 获取表格数据
+    fetchDeptTreeList() // 获取使用部门
+    fetchUserList() // 获取人员列表
+  })
+})
 </script>
 
 <template>
@@ -446,6 +442,7 @@
         <el-input
           v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
+          class="short-input"
           clearable
         />
       </search-item>
@@ -453,6 +450,7 @@
         <el-input
           v-model.trim="listQuery.applyName"
           placeholder="申请名称"
+          class="short-input"
           clearable
         />
       </search-item>
@@ -506,7 +504,7 @@
           <el-table-column
             label="操作"
             align="center"
-            :width="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 70 : 200"
+            :width="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 140 : 200"
             fixed="right"
           >
             <template #default="{ row }">
@@ -557,6 +555,17 @@
               >
                 编辑
               </el-button>
+
+              <el-button
+                v-if="proxy.hasPerm('/device/borrow/borrowapply/update') && activeTitle === '未通过'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName.search('驳回') === -1 "
+                @click="handleEdit(row, '编辑', 'edit')"
+              >
+                编辑
+              </el-button>
               <el-button
                 v-if="proxy.hasPerm('/device/borrow/borrowapply/update') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
                 size="small"

diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index dbce999..5bd4111 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -45,6 +45,15 @@
     data,
   })
 }
+
+// 设备借用驳回后编辑
+export function failUpdate(data: object) {
+  return request({
+    url: '/equipmentApply/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 // 设备借用申请删除
 export function deleteApply(data: object) {
   return request({
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 9049282..7f9431b 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -1,6 +1,6 @@
 // 状态管理相关接口api
 import request from '../index'
-import type { ISearchQuery, ITableRow, Iapprove } from '@/views/device/stateManage/components/status-interface.ts'
+import type { ISearchQuery, Iapprove } from '@/views/device/stateManage/components/status-interface'
 
 // 设备申请列表
 export function getStatusList(data: ISearchQuery) {
@@ -11,7 +11,7 @@
   })
 }
 // 状态管理新建
-export function addStatus(data: ITableRow) {
+export function addStatus(data: Object) {
   return request({
     url: '/meter/stateManage/addStateManageInfo',
     method: 'post',
@@ -20,7 +20,7 @@
 }
 
 // 状态管理编辑
-export function updateStatus(data: ITableRow) {
+export function updateStatus(data: Object) {
   return request({
     url: '/meter/stateManage/updateStateManageInfo',
     method: 'post',
@@ -53,7 +53,7 @@
   })
 }
 // 状态管理详情
-export function detailStatus(data: ITableRow) {
+export function detailStatus(data: object) {
   return request({
     url: '/meter/stateManage/selectStateManageInfo',
     method: 'post',
diff --git a/src/components/SearchArea/SearchItem.vue b/src/components/SearchArea/SearchItem.vue
index 3adef93..dc53b08 100644
--- a/src/components/SearchArea/SearchItem.vue
+++ b/src/components/SearchArea/SearchItem.vue
@@ -23,7 +23,6 @@
   display: inline-block;
   margin-bottom: 10px;
   vertical-align: top;
-  box-sizing: inherit;
   margin-right: 5px;
 }
 
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index 12d7290..e3c72af 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -1,5 +1,9 @@
 // 证书打印查询
 export interface ICertPrintSearch {
+  certificateClass: string
+  certificateNo: string
+  createUserId: number
+  printStatus: number | null
   certificationReportCode: string // 证书编号
   orderNo: string // 委托书编号
   customerName: string // 委托方名称
@@ -13,7 +17,7 @@
   reason: string // 操作原因
   sampleId: string // 样品id
   status: string // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
-  ids?: []
+  ids?: [] | null
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 3daa2b5..391931b 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -22,6 +22,10 @@
 const activeTitle = ref('') // active对应的审批状态名字
 // 查询条件
 const listQuery = ref<ICertPrintSearch>({
+  certificateClass: '',
+  certificateNo: '', // 证书编号
+  createUserId: 0,
+  printStatus: 0, // 可打印(证书可打印传0,全部传null)
   certificationReportCode: '', // 证书编号
   orderNo: '', // 委托书编号
   customerName: '', // 委托方名称
@@ -30,11 +34,12 @@
   certificateReportType: '', // 证书类型
   printNum: '', // 打印次数 -未打印和全部用
   approvalStatus: '', // 审批状态-审批查询用
-  orderId: '0', // 委托书id
+  orderId: '', // 委托书id
   reason: '', // 操作原因
-  sampleId: '0', // 样品id
+  sampleId: '', // 样品id
   status: '', // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
   formId: SCHEDULE.BUSINESS_CERT_PRINT,
+  ids: null, // 设置默认值
   offset: 1,
   limit: 20,
 })
@@ -78,22 +83,30 @@
         }
       }
     })
+    if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+      active.value = window.sessionStorage.getItem('buttonBoxActive')!
+      activeTitle.value === '未通过'
+    }
+    else {
+      active.value = menu.value.find(item => item.name === '可打印')!.id // 可打印
+      activeTitle.value === '可打印'
+    }
   })
 }
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationReportCode', width: '110', align: 'center' },
-  { text: '证书名称', value: 'certificationReportName', width: '120', align: 'center' },
+  { text: '证书编号', value: 'certificateNo', width: '110', align: 'center' },
+  { text: '证书名称', value: 'certificateName', width: '120', align: 'center' },
   { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', width: '120', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', width: '120', align: 'center' },
   { text: '委托书编号', value: 'orderNo', width: '120', align: 'center' },
-  { text: '检校类别', value: 'customerNo', width: '120', align: 'center' },
-  { text: '检定人员', value: 'customerName', width: '120', align: 'center' },
-  { text: '证书类型', value: 'certificateReportTypeName', width: '120', align: 'center' },
-  { text: '打印状态', value: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
+  { text: '检校类别', value: 'measureType', width: '120', align: 'center' },
+  { text: '检定人员', value: 'measurePersonId', width: '120', align: 'center' },
+  { text: '证书类型', value: 'certificateType', width: '120', align: 'center' },
+  { text: '打印状态', value: 'printNum', align: 'center', width: '85px', filter: (row: ICerPrintList) => { var cnum = ['未打印', '一', '二', '三', '四', '五', '六', '七', '八', '九', '十']; return row.printNum == 0 ? '未打印' : `${cnum[parseInt(row.printNum)]}次打印` } },
   { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
 ])
 // 表格数据
@@ -107,37 +120,35 @@
 
 // 根据过滤查询条件
 function filterQuery() {
-  console.log(activeTitle)
+  const approvalStatus = menu.value.find(item => item.name === activeTitle.value)!.id
+  listQuery.value.approvalStatus = approvalStatus
   switch (activeTitle.value) {
     case '可打印':
-      listQuery.value.printNum = 0
+      listQuery.value.printStatus = 0
       listQuery.value.approvalStatus = ''
       break
     case '全部':
-      listQuery.value.printNum = 0
+      listQuery.value.printStatus = 2
       listQuery.value.approvalStatus = ''
       break
     case '待审批':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '1'
+      listQuery.value.printStatus = 2
       break
     case '审批中':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '2'
+      listQuery.value.printStatus = 2
       break
     case '已通过':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '3'
+      listQuery.value.printStatus = 2
       break
     case '未通过':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '4'
+      listQuery.value.printStatus = 2
       break
   }
 }
 
 // 数据查询
 function fetchData(isNowPage = false) {
+  console.log(listQuery)
   filterQuery()
   loadingTable.value = true
   if (!isNowPage) {
@@ -146,15 +157,11 @@
   }
   // 模拟数据
   loadingTable.value = false
-  list.value = [
-    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '0', printStatusName: '未打印', certificateReportTypeName: '自检', approvalStatusName: '待审批', taskId: '100', id: '10' },
-    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '1', printStatusName: '已打印', certificateReportTypeName: '自检', approvalStatusName: '待审批', taskId: '1001', id: '101' },
-  ]
-  // getCertList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getCertList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -167,7 +174,12 @@
 }
 // 点击重置
 const clearList = () => {
+  const approvalStatus = menu.value.find(item => item.name === activeTitle.value)!.id
   listQuery.value = {
+    certificateClass: '',
+    certificateNo: '', // 证书编号
+    createUserId: 0,
+    printStatus: 0, // 可打印(证书可打印传0,全部传null)
     certificationReportCode: '', // 证书编号
     orderNo: '', // 委托书编号
     customerName: '', // 委托方名称
@@ -176,14 +188,18 @@
     certificateReportType: '', // 证书类型
     printNum: '', // 打印次数 -未打印和全部用
     approvalStatus: '', // 审批状态-审批查询用
-    orderId: '0', // 委托书id
+    orderId: '', // 委托书id
     reason: '', // 操作原因
-    sampleId: '0', // 样品id
+    sampleId: '', // 样品id
     status: '', // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
     formId: SCHEDULE.BUSINESS_CERT_PRINT,
     offset: 1,
     limit: 20,
   }
+  listQuery.value.approvalStatus = approvalStatus
+  if (activeTitle.value === '可打印' || activeTitle.value === '全部') {
+    listQuery.value.approvalStatus = ''
+  }
   fetchData(true)
 }
 // 点击详情
@@ -226,14 +242,14 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   if (list.value.length > 0) {
-    // const params = {
-    //   ...listQuery.value,
-    //   ids: checkoutList.value,
-    // }
-    // exportCert(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '证书打印列表.xlsx')
-    // })
+    const params = {
+      ...listQuery.value,
+      ids: checkoutList.value,
+    }
+    exportCert(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '证书打印列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
@@ -243,10 +259,9 @@
 
 // 打印
 const bindLabel = (row: ICerPrintList) => {
-  console.log(1)
-  row.printNum = 1
+  console.log(row)
   // 判断状态第一次可以直接打印,之后的打印需要审批
-  if (row.printNum == 1) {
+  if (row.printNum == 0) {
     ElMessageBox.confirm(
       '确定要打印吗？',
       '确认操作',
@@ -319,18 +334,9 @@
 
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
-    active.value = window.sessionStorage.getItem('buttonBoxActive')!
-  }
-  else {
-    active.value = menu.value.find(item => item.name === '可打印')!.id // 可打
-    activeTitle.value === '可打印'
-  }
+
   fetchData(true)
 })
-onUnmounted(() => {
-  window.sessionStorage.setItem('buttonBoxActive', '') // 清除
-})
 </script>
 
 <template>
@@ -342,7 +348,7 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.certificationReportCode"
+          v-model.trim="listQuery.certificateNo"
           placeholder="证书编号"
           class="short-input"
           clearable
@@ -373,7 +379,7 @@
         />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 120px;" clearable>
+        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 160px;" clearable>
           <el-option v-for="item in certificationClassList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
@@ -388,19 +394,19 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column v-if="listQuery.printNum === ''" label="审批状态" align="center" width="90px" prop="approvalStatusName" />
+          <el-table-column label="审批状态" align="center" width="90px" prop="approvalStatusName" />
           <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.printNum === 0 || (listQuery.approvalStatus === '3')" size="small" link type="primary" @click="bindLabel(row)">
+              <el-button v-if="activeTitle === '全部' || activeTitle === '可打印'" size="small" link type="primary" @click="bindLabel(row)">
                 打印
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'agree')">
+              <el-button v-if="activeTitle === '待审批'" size="small" type="primary" link @click="handleDistribute(row, 'agree')">
                 同意
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'refuse')">
+              <el-button v-if="activeTitle === '待审批'" size="small" type="primary" link @click="handleDistribute(row, 'refuse')">
                 拒绝
               </el-button>
             </template>
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 2f8f8a4..fa8e6b0 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -392,4 +392,7 @@
 
 <style lang="scss" scoped>
 // 样式
+.short-input {
+  width: 180px !important;
+}
 </style>
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 2e8e4a7..5d7fc0f 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,5 +1,5 @@
 <!-- 设备借用处理 -->
-<script lang="ts" setup name="borrowApply">
+<script lang="ts" setup name="BorrowHandle">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
@@ -44,7 +44,7 @@
   applyPersonName: '', // 申请人姓名
   startTime: '', // 领用开始日期
   endTime: '', // 领用结束日期
-  approvalStatus: '4', // 	审批状态
+  approvalStatus: '4', // 	审批状态 (已完成)
   processResult: '1' || active.value, // 	处置结果 (3个状态字典值)
   applyType: '2', // 申请类型 借用2
   createUser: '', // 创建人
@@ -373,7 +373,7 @@
     active.value = window.sessionStorage.getItem('buttonBoxActive')!
   }
   else {
-    active.value = menu.value.find(item => item.name === '待借用')!.id // 全部
+    active.value = menu.value.find(item => item.name === '待借用')!.id // 待借用
     activeTitle.value === '待借用'
   }
   nextTick(() => {
@@ -394,6 +394,7 @@
         <el-input
           v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
+          class="short-input"
           clearable
         />
       </search-item>
@@ -401,6 +402,7 @@
         <el-input
           v-model.trim="listQuery.applyName"
           placeholder="申请名称"
+          class="short-input"
           clearable
         />
       </search-item>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index aae69c7..a59267d 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,5 +1,5 @@
 <!-- 设备借用申请 -->
-<script lang="ts" setup name="borrowApply">
+<script lang="ts" setup name="BorrowApply">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
@@ -49,7 +49,7 @@
   applyPersonName: '', // 申请人姓名
   startTime: '', // 领用开始日期
   endTime: '', // 领用结束日期
-  approvalStatus: active.value, // 	审批状态
+  approvalStatus: active.value, // 	审批状态 1 2 3 对应待借用|已借用|已归还
   processResult: '', // 	处置结果
   applyType: '2', // 申请类型 借用2
   createUser: '', // 创建人
@@ -156,7 +156,7 @@
     applyPerson: '', // 申请人
     startTime: '', // 申请开始日期
     endTime: '', // 申请结束日期
-    approvalStatus: active.value, // 	审批状态
+    approvalStatus: active.value, // 	审批状态  // 	审批状态 1 2 3 对应待借用|已借用|已归还
     processResult: '', // 	处置结果
     applyType: '2', // 申请类型 借用2
     createUser: '', // 创建人
@@ -193,27 +193,8 @@
   })
 }
 
-onMounted(async () => {
-  await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
-    active.value = window.sessionStorage.getItem('buttonBoxActive')!
-  }
-  else {
-    active.value = menu.value.find(item => item.name === '全部')!.id // 全部
-    activeTitle.value === '全部'
-  }
-  nextTick(() => {
-    fetchData(true) // 获取表格数据
-    fetchDeptTreeList() // 获取使用部门
-    fetchUserList() // 获取人员列表
-  })
-})
 const $router = useRouter()
 
-onUnmounted(() => {
-  window.sessionStorage.setItem('buttonBoxActive', '') // 清除
-})
-
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
@@ -434,6 +415,21 @@
     }
   }
 }
+onMounted(async () => {
+  await getDict() // 获取字典-审批状态
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+    active.value = window.sessionStorage.getItem('buttonBoxActive')!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '全部')!.id // 全部
+    activeTitle.value === '全部'
+  }
+  nextTick(() => {
+    fetchData(true) // 获取表格数据
+    fetchDeptTreeList() // 获取使用部门
+    fetchUserList() // 获取人员列表
+  })
+})
 </script>
 
 <template>
@@ -446,6 +442,7 @@
         <el-input
           v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
+          class="short-input"
           clearable
         />
       </search-item>
@@ -453,6 +450,7 @@
         <el-input
           v-model.trim="listQuery.applyName"
           placeholder="申请名称"
+          class="short-input"
           clearable
         />
       </search-item>
@@ -506,7 +504,7 @@
           <el-table-column
             label="操作"
             align="center"
-            :width="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 70 : 200"
+            :width="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 140 : 200"
             fixed="right"
           >
             <template #default="{ row }">
@@ -557,6 +555,17 @@
               >
                 编辑
               </el-button>
+
+              <el-button
+                v-if="proxy.hasPerm('/device/borrow/borrowapply/update') && activeTitle === '未通过'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName.search('驳回') === -1 "
+                @click="handleEdit(row, '编辑', 'edit')"
+              >
+                编辑
+              </el-button>
               <el-button
                 v-if="proxy.hasPerm('/device/borrow/borrowapply/update') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
                 size="small"
diff --git a/src/views/device/borrow/components/approvalActionDialog.vue b/src/views/device/borrow/components/approvalActionDialog.vue
deleted file mode 100644
index 9375861..0000000
--- a/src/views/device/borrow/components/approvalActionDialog.vue
+++ /dev/null
@@ -1,109 +0,0 @@
-<!-- 审批操作弹窗 -->
-<script lang="ts" setup>
-import type { FormInstance, FormRules } from 'element-plus'
-import dayjs from 'dayjs'
-import useUserStore from '@/store/modules/user'
-const emits = defineEmits(['resetData'])
-const userInfo = useUserStore()
-const dialogVisibleApprove = ref(false)
-const form = reactive({
-  radio: '1',
-  certificateNo: '',
-  certificateName: '',
-  certificateCompany: '',
-  certificateDate: '',
-  validDate: '',
-})
-const ruleFormRef = ref<FormInstance>()
-const rules = reactive<FormRules>({
-})
-// 重置
-const resetData = () => {
-  form.certificateNo = ''
-  form.certificateName = ''
-  form.certificateCompany = ''
-  form.certificateDate = ''
-  form.validDate = ''
-}
-const approvetime = ref('') // 审批时间
-const initDialog = (row: any) => {
-  dialogVisibleApprove.value = true
-  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
-  form.radio = row.radio
-}
-defineExpose({ initDialog })
-
-// 点击保存
-const submitForm = async (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  await formEl.validate((valid, fields) => {
-    if (valid) {
-      dialogVisibleApprove.value = false
-      emits('resetData')
-    }
-  })
-}
-// 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  formEl.resetFields()
-  dialogVisibleApprove.value = false
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
-    <el-form
-      ref="ruleFormRef" :model="form"
-      :rules="rules" label-width="110px"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见">
-            <el-radio-group v-model="form.radio" style="width: 100%;">
-              <el-radio label="1">
-                同意
-              </el-radio>
-              <el-radio label="2">
-                拒绝
-              </el-radio>
-              <el-radio label="3">
-                驳回
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论">
-            <el-input
-              :rows="4"
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人">
-            <el-input disabled :value="userInfo.$state.name" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间">
-            <el-input disabled :value="approvetime" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
-        <el-button @click="resetForm(ruleFormRef)">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>

diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index dbce999..5bd4111 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -45,6 +45,15 @@
     data,
   })
 }
+
+// 设备借用驳回后编辑
+export function failUpdate(data: object) {
+  return request({
+    url: '/equipmentApply/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 // 设备借用申请删除
 export function deleteApply(data: object) {
   return request({
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 9049282..7f9431b 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -1,6 +1,6 @@
 // 状态管理相关接口api
 import request from '../index'
-import type { ISearchQuery, ITableRow, Iapprove } from '@/views/device/stateManage/components/status-interface.ts'
+import type { ISearchQuery, Iapprove } from '@/views/device/stateManage/components/status-interface'
 
 // 设备申请列表
 export function getStatusList(data: ISearchQuery) {
@@ -11,7 +11,7 @@
   })
 }
 // 状态管理新建
-export function addStatus(data: ITableRow) {
+export function addStatus(data: Object) {
   return request({
     url: '/meter/stateManage/addStateManageInfo',
     method: 'post',
@@ -20,7 +20,7 @@
 }
 
 // 状态管理编辑
-export function updateStatus(data: ITableRow) {
+export function updateStatus(data: Object) {
   return request({
     url: '/meter/stateManage/updateStateManageInfo',
     method: 'post',
@@ -53,7 +53,7 @@
   })
 }
 // 状态管理详情
-export function detailStatus(data: ITableRow) {
+export function detailStatus(data: object) {
   return request({
     url: '/meter/stateManage/selectStateManageInfo',
     method: 'post',
diff --git a/src/components/SearchArea/SearchItem.vue b/src/components/SearchArea/SearchItem.vue
index 3adef93..dc53b08 100644
--- a/src/components/SearchArea/SearchItem.vue
+++ b/src/components/SearchArea/SearchItem.vue
@@ -23,7 +23,6 @@
   display: inline-block;
   margin-bottom: 10px;
   vertical-align: top;
-  box-sizing: inherit;
   margin-right: 5px;
 }
 
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index 12d7290..e3c72af 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -1,5 +1,9 @@
 // 证书打印查询
 export interface ICertPrintSearch {
+  certificateClass: string
+  certificateNo: string
+  createUserId: number
+  printStatus: number | null
   certificationReportCode: string // 证书编号
   orderNo: string // 委托书编号
   customerName: string // 委托方名称
@@ -13,7 +17,7 @@
   reason: string // 操作原因
   sampleId: string // 样品id
   status: string // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
-  ids?: []
+  ids?: [] | null
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 3daa2b5..391931b 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -22,6 +22,10 @@
 const activeTitle = ref('') // active对应的审批状态名字
 // 查询条件
 const listQuery = ref<ICertPrintSearch>({
+  certificateClass: '',
+  certificateNo: '', // 证书编号
+  createUserId: 0,
+  printStatus: 0, // 可打印(证书可打印传0,全部传null)
   certificationReportCode: '', // 证书编号
   orderNo: '', // 委托书编号
   customerName: '', // 委托方名称
@@ -30,11 +34,12 @@
   certificateReportType: '', // 证书类型
   printNum: '', // 打印次数 -未打印和全部用
   approvalStatus: '', // 审批状态-审批查询用
-  orderId: '0', // 委托书id
+  orderId: '', // 委托书id
   reason: '', // 操作原因
-  sampleId: '0', // 样品id
+  sampleId: '', // 样品id
   status: '', // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
   formId: SCHEDULE.BUSINESS_CERT_PRINT,
+  ids: null, // 设置默认值
   offset: 1,
   limit: 20,
 })
@@ -78,22 +83,30 @@
         }
       }
     })
+    if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+      active.value = window.sessionStorage.getItem('buttonBoxActive')!
+      activeTitle.value === '未通过'
+    }
+    else {
+      active.value = menu.value.find(item => item.name === '可打印')!.id // 可打印
+      activeTitle.value === '可打印'
+    }
   })
 }
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationReportCode', width: '110', align: 'center' },
-  { text: '证书名称', value: 'certificationReportName', width: '120', align: 'center' },
+  { text: '证书编号', value: 'certificateNo', width: '110', align: 'center' },
+  { text: '证书名称', value: 'certificateName', width: '120', align: 'center' },
   { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', width: '120', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', width: '120', align: 'center' },
   { text: '委托书编号', value: 'orderNo', width: '120', align: 'center' },
-  { text: '检校类别', value: 'customerNo', width: '120', align: 'center' },
-  { text: '检定人员', value: 'customerName', width: '120', align: 'center' },
-  { text: '证书类型', value: 'certificateReportTypeName', width: '120', align: 'center' },
-  { text: '打印状态', value: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
+  { text: '检校类别', value: 'measureType', width: '120', align: 'center' },
+  { text: '检定人员', value: 'measurePersonId', width: '120', align: 'center' },
+  { text: '证书类型', value: 'certificateType', width: '120', align: 'center' },
+  { text: '打印状态', value: 'printNum', align: 'center', width: '85px', filter: (row: ICerPrintList) => { var cnum = ['未打印', '一', '二', '三', '四', '五', '六', '七', '八', '九', '十']; return row.printNum == 0 ? '未打印' : `${cnum[parseInt(row.printNum)]}次打印` } },
   { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
 ])
 // 表格数据
@@ -107,37 +120,35 @@
 
 // 根据过滤查询条件
 function filterQuery() {
-  console.log(activeTitle)
+  const approvalStatus = menu.value.find(item => item.name === activeTitle.value)!.id
+  listQuery.value.approvalStatus = approvalStatus
   switch (activeTitle.value) {
     case '可打印':
-      listQuery.value.printNum = 0
+      listQuery.value.printStatus = 0
       listQuery.value.approvalStatus = ''
       break
     case '全部':
-      listQuery.value.printNum = 0
+      listQuery.value.printStatus = 2
       listQuery.value.approvalStatus = ''
       break
     case '待审批':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '1'
+      listQuery.value.printStatus = 2
       break
     case '审批中':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '2'
+      listQuery.value.printStatus = 2
       break
     case '已通过':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '3'
+      listQuery.value.printStatus = 2
       break
     case '未通过':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '4'
+      listQuery.value.printStatus = 2
       break
   }
 }
 
 // 数据查询
 function fetchData(isNowPage = false) {
+  console.log(listQuery)
   filterQuery()
   loadingTable.value = true
   if (!isNowPage) {
@@ -146,15 +157,11 @@
   }
   // 模拟数据
   loadingTable.value = false
-  list.value = [
-    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '0', printStatusName: '未打印', certificateReportTypeName: '自检', approvalStatusName: '待审批', taskId: '100', id: '10' },
-    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '1', printStatusName: '已打印', certificateReportTypeName: '自检', approvalStatusName: '待审批', taskId: '1001', id: '101' },
-  ]
-  // getCertList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getCertList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -167,7 +174,12 @@
 }
 // 点击重置
 const clearList = () => {
+  const approvalStatus = menu.value.find(item => item.name === activeTitle.value)!.id
   listQuery.value = {
+    certificateClass: '',
+    certificateNo: '', // 证书编号
+    createUserId: 0,
+    printStatus: 0, // 可打印(证书可打印传0,全部传null)
     certificationReportCode: '', // 证书编号
     orderNo: '', // 委托书编号
     customerName: '', // 委托方名称
@@ -176,14 +188,18 @@
     certificateReportType: '', // 证书类型
     printNum: '', // 打印次数 -未打印和全部用
     approvalStatus: '', // 审批状态-审批查询用
-    orderId: '0', // 委托书id
+    orderId: '', // 委托书id
     reason: '', // 操作原因
-    sampleId: '0', // 样品id
+    sampleId: '', // 样品id
     status: '', // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
     formId: SCHEDULE.BUSINESS_CERT_PRINT,
     offset: 1,
     limit: 20,
   }
+  listQuery.value.approvalStatus = approvalStatus
+  if (activeTitle.value === '可打印' || activeTitle.value === '全部') {
+    listQuery.value.approvalStatus = ''
+  }
   fetchData(true)
 }
 // 点击详情
@@ -226,14 +242,14 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   if (list.value.length > 0) {
-    // const params = {
-    //   ...listQuery.value,
-    //   ids: checkoutList.value,
-    // }
-    // exportCert(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '证书打印列表.xlsx')
-    // })
+    const params = {
+      ...listQuery.value,
+      ids: checkoutList.value,
+    }
+    exportCert(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '证书打印列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
@@ -243,10 +259,9 @@
 
 // 打印
 const bindLabel = (row: ICerPrintList) => {
-  console.log(1)
-  row.printNum = 1
+  console.log(row)
   // 判断状态第一次可以直接打印,之后的打印需要审批
-  if (row.printNum == 1) {
+  if (row.printNum == 0) {
     ElMessageBox.confirm(
       '确定要打印吗？',
       '确认操作',
@@ -319,18 +334,9 @@
 
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
-    active.value = window.sessionStorage.getItem('buttonBoxActive')!
-  }
-  else {
-    active.value = menu.value.find(item => item.name === '可打印')!.id // 可打
-    activeTitle.value === '可打印'
-  }
+
   fetchData(true)
 })
-onUnmounted(() => {
-  window.sessionStorage.setItem('buttonBoxActive', '') // 清除
-})
 </script>
 
 <template>
@@ -342,7 +348,7 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.certificationReportCode"
+          v-model.trim="listQuery.certificateNo"
           placeholder="证书编号"
           class="short-input"
           clearable
@@ -373,7 +379,7 @@
         />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 120px;" clearable>
+        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 160px;" clearable>
           <el-option v-for="item in certificationClassList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
@@ -388,19 +394,19 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column v-if="listQuery.printNum === ''" label="审批状态" align="center" width="90px" prop="approvalStatusName" />
+          <el-table-column label="审批状态" align="center" width="90px" prop="approvalStatusName" />
           <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.printNum === 0 || (listQuery.approvalStatus === '3')" size="small" link type="primary" @click="bindLabel(row)">
+              <el-button v-if="activeTitle === '全部' || activeTitle === '可打印'" size="small" link type="primary" @click="bindLabel(row)">
                 打印
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'agree')">
+              <el-button v-if="activeTitle === '待审批'" size="small" type="primary" link @click="handleDistribute(row, 'agree')">
                 同意
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'refuse')">
+              <el-button v-if="activeTitle === '待审批'" size="small" type="primary" link @click="handleDistribute(row, 'refuse')">
                 拒绝
               </el-button>
             </template>
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 2f8f8a4..fa8e6b0 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -392,4 +392,7 @@
 
 <style lang="scss" scoped>
 // 样式
+.short-input {
+  width: 180px !important;
+}
 </style>
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 2e8e4a7..5d7fc0f 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,5 +1,5 @@
 <!-- 设备借用处理 -->
-<script lang="ts" setup name="borrowApply">
+<script lang="ts" setup name="BorrowHandle">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
@@ -44,7 +44,7 @@
   applyPersonName: '', // 申请人姓名
   startTime: '', // 领用开始日期
   endTime: '', // 领用结束日期
-  approvalStatus: '4', // 	审批状态
+  approvalStatus: '4', // 	审批状态 (已完成)
   processResult: '1' || active.value, // 	处置结果 (3个状态字典值)
   applyType: '2', // 申请类型 借用2
   createUser: '', // 创建人
@@ -373,7 +373,7 @@
     active.value = window.sessionStorage.getItem('buttonBoxActive')!
   }
   else {
-    active.value = menu.value.find(item => item.name === '待借用')!.id // 全部
+    active.value = menu.value.find(item => item.name === '待借用')!.id // 待借用
     activeTitle.value === '待借用'
   }
   nextTick(() => {
@@ -394,6 +394,7 @@
         <el-input
           v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
+          class="short-input"
           clearable
         />
       </search-item>
@@ -401,6 +402,7 @@
         <el-input
           v-model.trim="listQuery.applyName"
           placeholder="申请名称"
+          class="short-input"
           clearable
         />
       </search-item>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index aae69c7..a59267d 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,5 +1,5 @@
 <!-- 设备借用申请 -->
-<script lang="ts" setup name="borrowApply">
+<script lang="ts" setup name="BorrowApply">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
@@ -49,7 +49,7 @@
   applyPersonName: '', // 申请人姓名
   startTime: '', // 领用开始日期
   endTime: '', // 领用结束日期
-  approvalStatus: active.value, // 	审批状态
+  approvalStatus: active.value, // 	审批状态 1 2 3 对应待借用|已借用|已归还
   processResult: '', // 	处置结果
   applyType: '2', // 申请类型 借用2
   createUser: '', // 创建人
@@ -156,7 +156,7 @@
     applyPerson: '', // 申请人
     startTime: '', // 申请开始日期
     endTime: '', // 申请结束日期
-    approvalStatus: active.value, // 	审批状态
+    approvalStatus: active.value, // 	审批状态  // 	审批状态 1 2 3 对应待借用|已借用|已归还
     processResult: '', // 	处置结果
     applyType: '2', // 申请类型 借用2
     createUser: '', // 创建人
@@ -193,27 +193,8 @@
   })
 }
 
-onMounted(async () => {
-  await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
-    active.value = window.sessionStorage.getItem('buttonBoxActive')!
-  }
-  else {
-    active.value = menu.value.find(item => item.name === '全部')!.id // 全部
-    activeTitle.value === '全部'
-  }
-  nextTick(() => {
-    fetchData(true) // 获取表格数据
-    fetchDeptTreeList() // 获取使用部门
-    fetchUserList() // 获取人员列表
-  })
-})
 const $router = useRouter()
 
-onUnmounted(() => {
-  window.sessionStorage.setItem('buttonBoxActive', '') // 清除
-})
-
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
@@ -434,6 +415,21 @@
     }
   }
 }
+onMounted(async () => {
+  await getDict() // 获取字典-审批状态
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+    active.value = window.sessionStorage.getItem('buttonBoxActive')!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '全部')!.id // 全部
+    activeTitle.value === '全部'
+  }
+  nextTick(() => {
+    fetchData(true) // 获取表格数据
+    fetchDeptTreeList() // 获取使用部门
+    fetchUserList() // 获取人员列表
+  })
+})
 </script>
 
 <template>
@@ -446,6 +442,7 @@
         <el-input
           v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
+          class="short-input"
           clearable
         />
       </search-item>
@@ -453,6 +450,7 @@
         <el-input
           v-model.trim="listQuery.applyName"
           placeholder="申请名称"
+          class="short-input"
           clearable
         />
       </search-item>
@@ -506,7 +504,7 @@
           <el-table-column
             label="操作"
             align="center"
-            :width="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 70 : 200"
+            :width="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 140 : 200"
             fixed="right"
           >
             <template #default="{ row }">
@@ -557,6 +555,17 @@
               >
                 编辑
               </el-button>
+
+              <el-button
+                v-if="proxy.hasPerm('/device/borrow/borrowapply/update') && activeTitle === '未通过'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName.search('驳回') === -1 "
+                @click="handleEdit(row, '编辑', 'edit')"
+              >
+                编辑
+              </el-button>
               <el-button
                 v-if="proxy.hasPerm('/device/borrow/borrowapply/update') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
                 size="small"
diff --git a/src/views/device/borrow/components/approvalActionDialog.vue b/src/views/device/borrow/components/approvalActionDialog.vue
deleted file mode 100644
index 9375861..0000000
--- a/src/views/device/borrow/components/approvalActionDialog.vue
+++ /dev/null
@@ -1,109 +0,0 @@
-<!-- 审批操作弹窗 -->
-<script lang="ts" setup>
-import type { FormInstance, FormRules } from 'element-plus'
-import dayjs from 'dayjs'
-import useUserStore from '@/store/modules/user'
-const emits = defineEmits(['resetData'])
-const userInfo = useUserStore()
-const dialogVisibleApprove = ref(false)
-const form = reactive({
-  radio: '1',
-  certificateNo: '',
-  certificateName: '',
-  certificateCompany: '',
-  certificateDate: '',
-  validDate: '',
-})
-const ruleFormRef = ref<FormInstance>()
-const rules = reactive<FormRules>({
-})
-// 重置
-const resetData = () => {
-  form.certificateNo = ''
-  form.certificateName = ''
-  form.certificateCompany = ''
-  form.certificateDate = ''
-  form.validDate = ''
-}
-const approvetime = ref('') // 审批时间
-const initDialog = (row: any) => {
-  dialogVisibleApprove.value = true
-  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
-  form.radio = row.radio
-}
-defineExpose({ initDialog })
-
-// 点击保存
-const submitForm = async (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  await formEl.validate((valid, fields) => {
-    if (valid) {
-      dialogVisibleApprove.value = false
-      emits('resetData')
-    }
-  })
-}
-// 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  formEl.resetFields()
-  dialogVisibleApprove.value = false
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
-    <el-form
-      ref="ruleFormRef" :model="form"
-      :rules="rules" label-width="110px"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见">
-            <el-radio-group v-model="form.radio" style="width: 100%;">
-              <el-radio label="1">
-                同意
-              </el-radio>
-              <el-radio label="2">
-                拒绝
-              </el-radio>
-              <el-radio label="3">
-                驳回
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论">
-            <el-input
-              :rows="4"
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人">
-            <el-input disabled :value="userInfo.$state.name" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间">
-            <el-input disabled :value="approvetime" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
-        <el-button @click="resetForm(ruleFormRef)">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/device/borrow/editHandle.vue b/src/views/device/borrow/editHandle.vue
index d2e423c..9a5b2a6 100644
--- a/src/views/device/borrow/editHandle.vue
+++ b/src/views/device/borrow/editHandle.vue
@@ -1,4 +1,5 @@
-<script lang="ts" setup name="Detail">
+<!-- 设备借用处理详情/编辑 -->
+<script lang="ts" setup name="EditHandle">
 import { onMounted, ref } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { ElLoading } from 'element-plus'
@@ -17,7 +18,6 @@
 const { proxy } = getCurrentInstance() as any
 const useDeptList = ref<deptType[]>([]) // 部门列表
 const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
-const total = ref(20)// 总数
 // 表单数据
 const form = ref({
   id: '',
@@ -29,19 +29,7 @@
   applyDesc: '', // 申请说明
 })
 const list = ref<IdeviceList[]>([])// 表格数据
-// 查询条件
-const listQuery: Ref<IdeviceListQuery> = ref({
-  equipmentName: '', // 仪器名称
-  equipmentNo: '', // 设备编号
-  modelNo: '', // 型号
-  mesureRange: '', // 测量范围
-  useDeptName: '', // 使用部门
-  usePersonName: '', // 使用人
-  managerStateName: '', // 管理状态
-  validDate: '', // 有效日期
-  offset: 1,
-  limit: 20,
-})
+
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '设备编号', value: 'equipmentNo', align: 'center', width: '230' },
@@ -82,11 +70,11 @@
   $router.back()
 }
 
-// 打印
+// 设备借用处理详情打印
 const printObj = ref({
   id: 'lysq', // 需要打印元素的id
   popTitle: '设备借用处理', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备借用处理</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备借用处理详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
@@ -125,7 +113,7 @@
   <app-container>
     <detail-page title="设备借用处理-详情">
       <template #btns>
-        <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/device/borrow/borrowhandle/print')" v-print="printObj" type="primary">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -225,22 +213,6 @@
     background-color: #fff;
     // padding: 10px;
 
-    .title-button {
-      display: flex;
-      align-items: center;
-
-      &::before {
-        content: "";
-        flex: 1;
-      }
-
-      .button-group {
-        flex: 1;
-        display: flex;
-        justify-content: flex-end;
-      }
-    }
-
     .form-area {
       margin-top: 40px;
     }

diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index dbce999..5bd4111 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -45,6 +45,15 @@
     data,
   })
 }
+
+// 设备借用驳回后编辑
+export function failUpdate(data: object) {
+  return request({
+    url: '/equipmentApply/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 // 设备借用申请删除
 export function deleteApply(data: object) {
   return request({
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 9049282..7f9431b 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -1,6 +1,6 @@
 // 状态管理相关接口api
 import request from '../index'
-import type { ISearchQuery, ITableRow, Iapprove } from '@/views/device/stateManage/components/status-interface.ts'
+import type { ISearchQuery, Iapprove } from '@/views/device/stateManage/components/status-interface'
 
 // 设备申请列表
 export function getStatusList(data: ISearchQuery) {
@@ -11,7 +11,7 @@
   })
 }
 // 状态管理新建
-export function addStatus(data: ITableRow) {
+export function addStatus(data: Object) {
   return request({
     url: '/meter/stateManage/addStateManageInfo',
     method: 'post',
@@ -20,7 +20,7 @@
 }
 
 // 状态管理编辑
-export function updateStatus(data: ITableRow) {
+export function updateStatus(data: Object) {
   return request({
     url: '/meter/stateManage/updateStateManageInfo',
     method: 'post',
@@ -53,7 +53,7 @@
   })
 }
 // 状态管理详情
-export function detailStatus(data: ITableRow) {
+export function detailStatus(data: object) {
   return request({
     url: '/meter/stateManage/selectStateManageInfo',
     method: 'post',
diff --git a/src/components/SearchArea/SearchItem.vue b/src/components/SearchArea/SearchItem.vue
index 3adef93..dc53b08 100644
--- a/src/components/SearchArea/SearchItem.vue
+++ b/src/components/SearchArea/SearchItem.vue
@@ -23,7 +23,6 @@
   display: inline-block;
   margin-bottom: 10px;
   vertical-align: top;
-  box-sizing: inherit;
   margin-right: 5px;
 }
 
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index 12d7290..e3c72af 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -1,5 +1,9 @@
 // 证书打印查询
 export interface ICertPrintSearch {
+  certificateClass: string
+  certificateNo: string
+  createUserId: number
+  printStatus: number | null
   certificationReportCode: string // 证书编号
   orderNo: string // 委托书编号
   customerName: string // 委托方名称
@@ -13,7 +17,7 @@
   reason: string // 操作原因
   sampleId: string // 样品id
   status: string // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
-  ids?: []
+  ids?: [] | null
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 3daa2b5..391931b 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -22,6 +22,10 @@
 const activeTitle = ref('') // active对应的审批状态名字
 // 查询条件
 const listQuery = ref<ICertPrintSearch>({
+  certificateClass: '',
+  certificateNo: '', // 证书编号
+  createUserId: 0,
+  printStatus: 0, // 可打印(证书可打印传0,全部传null)
   certificationReportCode: '', // 证书编号
   orderNo: '', // 委托书编号
   customerName: '', // 委托方名称
@@ -30,11 +34,12 @@
   certificateReportType: '', // 证书类型
   printNum: '', // 打印次数 -未打印和全部用
   approvalStatus: '', // 审批状态-审批查询用
-  orderId: '0', // 委托书id
+  orderId: '', // 委托书id
   reason: '', // 操作原因
-  sampleId: '0', // 样品id
+  sampleId: '', // 样品id
   status: '', // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
   formId: SCHEDULE.BUSINESS_CERT_PRINT,
+  ids: null, // 设置默认值
   offset: 1,
   limit: 20,
 })
@@ -78,22 +83,30 @@
         }
       }
     })
+    if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+      active.value = window.sessionStorage.getItem('buttonBoxActive')!
+      activeTitle.value === '未通过'
+    }
+    else {
+      active.value = menu.value.find(item => item.name === '可打印')!.id // 可打印
+      activeTitle.value === '可打印'
+    }
   })
 }
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationReportCode', width: '110', align: 'center' },
-  { text: '证书名称', value: 'certificationReportName', width: '120', align: 'center' },
+  { text: '证书编号', value: 'certificateNo', width: '110', align: 'center' },
+  { text: '证书名称', value: 'certificateName', width: '120', align: 'center' },
   { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', width: '120', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', width: '120', align: 'center' },
   { text: '委托书编号', value: 'orderNo', width: '120', align: 'center' },
-  { text: '检校类别', value: 'customerNo', width: '120', align: 'center' },
-  { text: '检定人员', value: 'customerName', width: '120', align: 'center' },
-  { text: '证书类型', value: 'certificateReportTypeName', width: '120', align: 'center' },
-  { text: '打印状态', value: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
+  { text: '检校类别', value: 'measureType', width: '120', align: 'center' },
+  { text: '检定人员', value: 'measurePersonId', width: '120', align: 'center' },
+  { text: '证书类型', value: 'certificateType', width: '120', align: 'center' },
+  { text: '打印状态', value: 'printNum', align: 'center', width: '85px', filter: (row: ICerPrintList) => { var cnum = ['未打印', '一', '二', '三', '四', '五', '六', '七', '八', '九', '十']; return row.printNum == 0 ? '未打印' : `${cnum[parseInt(row.printNum)]}次打印` } },
   { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
 ])
 // 表格数据
@@ -107,37 +120,35 @@
 
 // 根据过滤查询条件
 function filterQuery() {
-  console.log(activeTitle)
+  const approvalStatus = menu.value.find(item => item.name === activeTitle.value)!.id
+  listQuery.value.approvalStatus = approvalStatus
   switch (activeTitle.value) {
     case '可打印':
-      listQuery.value.printNum = 0
+      listQuery.value.printStatus = 0
       listQuery.value.approvalStatus = ''
       break
     case '全部':
-      listQuery.value.printNum = 0
+      listQuery.value.printStatus = 2
       listQuery.value.approvalStatus = ''
       break
     case '待审批':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '1'
+      listQuery.value.printStatus = 2
       break
     case '审批中':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '2'
+      listQuery.value.printStatus = 2
       break
     case '已通过':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '3'
+      listQuery.value.printStatus = 2
       break
     case '未通过':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '4'
+      listQuery.value.printStatus = 2
       break
   }
 }
 
 // 数据查询
 function fetchData(isNowPage = false) {
+  console.log(listQuery)
   filterQuery()
   loadingTable.value = true
   if (!isNowPage) {
@@ -146,15 +157,11 @@
   }
   // 模拟数据
   loadingTable.value = false
-  list.value = [
-    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '0', printStatusName: '未打印', certificateReportTypeName: '自检', approvalStatusName: '待审批', taskId: '100', id: '10' },
-    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '1', printStatusName: '已打印', certificateReportTypeName: '自检', approvalStatusName: '待审批', taskId: '1001', id: '101' },
-  ]
-  // getCertList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getCertList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -167,7 +174,12 @@
 }
 // 点击重置
 const clearList = () => {
+  const approvalStatus = menu.value.find(item => item.name === activeTitle.value)!.id
   listQuery.value = {
+    certificateClass: '',
+    certificateNo: '', // 证书编号
+    createUserId: 0,
+    printStatus: 0, // 可打印(证书可打印传0,全部传null)
     certificationReportCode: '', // 证书编号
     orderNo: '', // 委托书编号
     customerName: '', // 委托方名称
@@ -176,14 +188,18 @@
     certificateReportType: '', // 证书类型
     printNum: '', // 打印次数 -未打印和全部用
     approvalStatus: '', // 审批状态-审批查询用
-    orderId: '0', // 委托书id
+    orderId: '', // 委托书id
     reason: '', // 操作原因
-    sampleId: '0', // 样品id
+    sampleId: '', // 样品id
     status: '', // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
     formId: SCHEDULE.BUSINESS_CERT_PRINT,
     offset: 1,
     limit: 20,
   }
+  listQuery.value.approvalStatus = approvalStatus
+  if (activeTitle.value === '可打印' || activeTitle.value === '全部') {
+    listQuery.value.approvalStatus = ''
+  }
   fetchData(true)
 }
 // 点击详情
@@ -226,14 +242,14 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   if (list.value.length > 0) {
-    // const params = {
-    //   ...listQuery.value,
-    //   ids: checkoutList.value,
-    // }
-    // exportCert(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '证书打印列表.xlsx')
-    // })
+    const params = {
+      ...listQuery.value,
+      ids: checkoutList.value,
+    }
+    exportCert(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '证书打印列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
@@ -243,10 +259,9 @@
 
 // 打印
 const bindLabel = (row: ICerPrintList) => {
-  console.log(1)
-  row.printNum = 1
+  console.log(row)
   // 判断状态第一次可以直接打印,之后的打印需要审批
-  if (row.printNum == 1) {
+  if (row.printNum == 0) {
     ElMessageBox.confirm(
       '确定要打印吗？',
       '确认操作',
@@ -319,18 +334,9 @@
 
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
-    active.value = window.sessionStorage.getItem('buttonBoxActive')!
-  }
-  else {
-    active.value = menu.value.find(item => item.name === '可打印')!.id // 可打
-    activeTitle.value === '可打印'
-  }
+
   fetchData(true)
 })
-onUnmounted(() => {
-  window.sessionStorage.setItem('buttonBoxActive', '') // 清除
-})
 </script>
 
 <template>
@@ -342,7 +348,7 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.certificationReportCode"
+          v-model.trim="listQuery.certificateNo"
           placeholder="证书编号"
           class="short-input"
           clearable
@@ -373,7 +379,7 @@
         />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 120px;" clearable>
+        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 160px;" clearable>
           <el-option v-for="item in certificationClassList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
@@ -388,19 +394,19 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column v-if="listQuery.printNum === ''" label="审批状态" align="center" width="90px" prop="approvalStatusName" />
+          <el-table-column label="审批状态" align="center" width="90px" prop="approvalStatusName" />
           <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.printNum === 0 || (listQuery.approvalStatus === '3')" size="small" link type="primary" @click="bindLabel(row)">
+              <el-button v-if="activeTitle === '全部' || activeTitle === '可打印'" size="small" link type="primary" @click="bindLabel(row)">
                 打印
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'agree')">
+              <el-button v-if="activeTitle === '待审批'" size="small" type="primary" link @click="handleDistribute(row, 'agree')">
                 同意
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'refuse')">
+              <el-button v-if="activeTitle === '待审批'" size="small" type="primary" link @click="handleDistribute(row, 'refuse')">
                 拒绝
               </el-button>
             </template>
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 2f8f8a4..fa8e6b0 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -392,4 +392,7 @@
 
 <style lang="scss" scoped>
 // 样式
+.short-input {
+  width: 180px !important;
+}
 </style>
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 2e8e4a7..5d7fc0f 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,5 +1,5 @@
 <!-- 设备借用处理 -->
-<script lang="ts" setup name="borrowApply">
+<script lang="ts" setup name="BorrowHandle">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
@@ -44,7 +44,7 @@
   applyPersonName: '', // 申请人姓名
   startTime: '', // 领用开始日期
   endTime: '', // 领用结束日期
-  approvalStatus: '4', // 	审批状态
+  approvalStatus: '4', // 	审批状态 (已完成)
   processResult: '1' || active.value, // 	处置结果 (3个状态字典值)
   applyType: '2', // 申请类型 借用2
   createUser: '', // 创建人
@@ -373,7 +373,7 @@
     active.value = window.sessionStorage.getItem('buttonBoxActive')!
   }
   else {
-    active.value = menu.value.find(item => item.name === '待借用')!.id // 全部
+    active.value = menu.value.find(item => item.name === '待借用')!.id // 待借用
     activeTitle.value === '待借用'
   }
   nextTick(() => {
@@ -394,6 +394,7 @@
         <el-input
           v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
+          class="short-input"
           clearable
         />
       </search-item>
@@ -401,6 +402,7 @@
         <el-input
           v-model.trim="listQuery.applyName"
           placeholder="申请名称"
+          class="short-input"
           clearable
         />
       </search-item>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index aae69c7..a59267d 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,5 +1,5 @@
 <!-- 设备借用申请 -->
-<script lang="ts" setup name="borrowApply">
+<script lang="ts" setup name="BorrowApply">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
@@ -49,7 +49,7 @@
   applyPersonName: '', // 申请人姓名
   startTime: '', // 领用开始日期
   endTime: '', // 领用结束日期
-  approvalStatus: active.value, // 	审批状态
+  approvalStatus: active.value, // 	审批状态 1 2 3 对应待借用|已借用|已归还
   processResult: '', // 	处置结果
   applyType: '2', // 申请类型 借用2
   createUser: '', // 创建人
@@ -156,7 +156,7 @@
     applyPerson: '', // 申请人
     startTime: '', // 申请开始日期
     endTime: '', // 申请结束日期
-    approvalStatus: active.value, // 	审批状态
+    approvalStatus: active.value, // 	审批状态  // 	审批状态 1 2 3 对应待借用|已借用|已归还
     processResult: '', // 	处置结果
     applyType: '2', // 申请类型 借用2
     createUser: '', // 创建人
@@ -193,27 +193,8 @@
   })
 }
 
-onMounted(async () => {
-  await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
-    active.value = window.sessionStorage.getItem('buttonBoxActive')!
-  }
-  else {
-    active.value = menu.value.find(item => item.name === '全部')!.id // 全部
-    activeTitle.value === '全部'
-  }
-  nextTick(() => {
-    fetchData(true) // 获取表格数据
-    fetchDeptTreeList() // 获取使用部门
-    fetchUserList() // 获取人员列表
-  })
-})
 const $router = useRouter()
 
-onUnmounted(() => {
-  window.sessionStorage.setItem('buttonBoxActive', '') // 清除
-})
-
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
@@ -434,6 +415,21 @@
     }
   }
 }
+onMounted(async () => {
+  await getDict() // 获取字典-审批状态
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+    active.value = window.sessionStorage.getItem('buttonBoxActive')!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '全部')!.id // 全部
+    activeTitle.value === '全部'
+  }
+  nextTick(() => {
+    fetchData(true) // 获取表格数据
+    fetchDeptTreeList() // 获取使用部门
+    fetchUserList() // 获取人员列表
+  })
+})
 </script>
 
 <template>
@@ -446,6 +442,7 @@
         <el-input
           v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
+          class="short-input"
           clearable
         />
       </search-item>
@@ -453,6 +450,7 @@
         <el-input
           v-model.trim="listQuery.applyName"
           placeholder="申请名称"
+          class="short-input"
           clearable
         />
       </search-item>
@@ -506,7 +504,7 @@
           <el-table-column
             label="操作"
             align="center"
-            :width="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 70 : 200"
+            :width="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 140 : 200"
             fixed="right"
           >
             <template #default="{ row }">
@@ -557,6 +555,17 @@
               >
                 编辑
               </el-button>
+
+              <el-button
+                v-if="proxy.hasPerm('/device/borrow/borrowapply/update') && activeTitle === '未通过'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName.search('驳回') === -1 "
+                @click="handleEdit(row, '编辑', 'edit')"
+              >
+                编辑
+              </el-button>
               <el-button
                 v-if="proxy.hasPerm('/device/borrow/borrowapply/update') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
                 size="small"
diff --git a/src/views/device/borrow/components/approvalActionDialog.vue b/src/views/device/borrow/components/approvalActionDialog.vue
deleted file mode 100644
index 9375861..0000000
--- a/src/views/device/borrow/components/approvalActionDialog.vue
+++ /dev/null
@@ -1,109 +0,0 @@
-<!-- 审批操作弹窗 -->
-<script lang="ts" setup>
-import type { FormInstance, FormRules } from 'element-plus'
-import dayjs from 'dayjs'
-import useUserStore from '@/store/modules/user'
-const emits = defineEmits(['resetData'])
-const userInfo = useUserStore()
-const dialogVisibleApprove = ref(false)
-const form = reactive({
-  radio: '1',
-  certificateNo: '',
-  certificateName: '',
-  certificateCompany: '',
-  certificateDate: '',
-  validDate: '',
-})
-const ruleFormRef = ref<FormInstance>()
-const rules = reactive<FormRules>({
-})
-// 重置
-const resetData = () => {
-  form.certificateNo = ''
-  form.certificateName = ''
-  form.certificateCompany = ''
-  form.certificateDate = ''
-  form.validDate = ''
-}
-const approvetime = ref('') // 审批时间
-const initDialog = (row: any) => {
-  dialogVisibleApprove.value = true
-  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
-  form.radio = row.radio
-}
-defineExpose({ initDialog })
-
-// 点击保存
-const submitForm = async (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  await formEl.validate((valid, fields) => {
-    if (valid) {
-      dialogVisibleApprove.value = false
-      emits('resetData')
-    }
-  })
-}
-// 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  formEl.resetFields()
-  dialogVisibleApprove.value = false
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
-    <el-form
-      ref="ruleFormRef" :model="form"
-      :rules="rules" label-width="110px"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见">
-            <el-radio-group v-model="form.radio" style="width: 100%;">
-              <el-radio label="1">
-                同意
-              </el-radio>
-              <el-radio label="2">
-                拒绝
-              </el-radio>
-              <el-radio label="3">
-                驳回
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论">
-            <el-input
-              :rows="4"
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人">
-            <el-input disabled :value="userInfo.$state.name" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间">
-            <el-input disabled :value="approvetime" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
-        <el-button @click="resetForm(ruleFormRef)">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/device/borrow/editHandle.vue b/src/views/device/borrow/editHandle.vue
index d2e423c..9a5b2a6 100644
--- a/src/views/device/borrow/editHandle.vue
+++ b/src/views/device/borrow/editHandle.vue
@@ -1,4 +1,5 @@
-<script lang="ts" setup name="Detail">
+<!-- 设备借用处理详情/编辑 -->
+<script lang="ts" setup name="EditHandle">
 import { onMounted, ref } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { ElLoading } from 'element-plus'
@@ -17,7 +18,6 @@
 const { proxy } = getCurrentInstance() as any
 const useDeptList = ref<deptType[]>([]) // 部门列表
 const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
-const total = ref(20)// 总数
 // 表单数据
 const form = ref({
   id: '',
@@ -29,19 +29,7 @@
   applyDesc: '', // 申请说明
 })
 const list = ref<IdeviceList[]>([])// 表格数据
-// 查询条件
-const listQuery: Ref<IdeviceListQuery> = ref({
-  equipmentName: '', // 仪器名称
-  equipmentNo: '', // 设备编号
-  modelNo: '', // 型号
-  mesureRange: '', // 测量范围
-  useDeptName: '', // 使用部门
-  usePersonName: '', // 使用人
-  managerStateName: '', // 管理状态
-  validDate: '', // 有效日期
-  offset: 1,
-  limit: 20,
-})
+
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '设备编号', value: 'equipmentNo', align: 'center', width: '230' },
@@ -82,11 +70,11 @@
   $router.back()
 }
 
-// 打印
+// 设备借用处理详情打印
 const printObj = ref({
   id: 'lysq', // 需要打印元素的id
   popTitle: '设备借用处理', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备借用处理</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备借用处理详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
@@ -125,7 +113,7 @@
   <app-container>
     <detail-page title="设备借用处理-详情">
       <template #btns>
-        <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/device/borrow/borrowhandle/print')" v-print="printObj" type="primary">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -225,22 +213,6 @@
     background-color: #fff;
     // padding: 10px;
 
-    .title-button {
-      display: flex;
-      align-items: center;
-
-      &::before {
-        content: "";
-        flex: 1;
-      }
-
-      .button-group {
-        flex: 1;
-        display: flex;
-        justify-content: flex-end;
-      }
-    }
-
     .form-area {
       margin-top: 40px;
     }
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index b76ab3e..18879cc 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -352,6 +352,7 @@
   formInline.value.acceptanceCheckId = object.id
   checkIdObject.value = object
   // 获取到详情
+
   equipmentApplyInfo({ id: object.id }).then((res) => {
     res.data.equipmentInfoList.map((item: objectReturn) => {
       if (item.id) {
@@ -492,11 +493,11 @@
         <el-row :gutter="20" class="marg">
           <el-col :span="14">
             <el-form-item label="附件:">
-              <show-photo v-if="formInline.fileList[0].minioFileName" :minio-file-name="formInline.fileList[0].minioFileName" />
+              <show-photo v-if="formInline.fileList" :minio-file-name="formInline.fileList.length && formInline.fileList[0].minioFileName ? formInline.fileList[0].minioFileName : ''" />
               <span v-else-if="pageType === 'detail'">无</span>
               <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.fileList[0].minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                {{ formInline.fileList[0].minioFileName === '' ? '上传' : '更换附件' }}
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.fileList.length && formInline.fileList[0].minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.fileList.length && formInline.fileList[0].minioFileName ? '上传' : '更换附件' }}
               </el-button>
             </el-form-item>
           </el-col>

diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index dbce999..5bd4111 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -45,6 +45,15 @@
     data,
   })
 }
+
+// 设备借用驳回后编辑
+export function failUpdate(data: object) {
+  return request({
+    url: '/equipmentApply/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 // 设备借用申请删除
 export function deleteApply(data: object) {
   return request({
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 9049282..7f9431b 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -1,6 +1,6 @@
 // 状态管理相关接口api
 import request from '../index'
-import type { ISearchQuery, ITableRow, Iapprove } from '@/views/device/stateManage/components/status-interface.ts'
+import type { ISearchQuery, Iapprove } from '@/views/device/stateManage/components/status-interface'
 
 // 设备申请列表
 export function getStatusList(data: ISearchQuery) {
@@ -11,7 +11,7 @@
   })
 }
 // 状态管理新建
-export function addStatus(data: ITableRow) {
+export function addStatus(data: Object) {
   return request({
     url: '/meter/stateManage/addStateManageInfo',
     method: 'post',
@@ -20,7 +20,7 @@
 }
 
 // 状态管理编辑
-export function updateStatus(data: ITableRow) {
+export function updateStatus(data: Object) {
   return request({
     url: '/meter/stateManage/updateStateManageInfo',
     method: 'post',
@@ -53,7 +53,7 @@
   })
 }
 // 状态管理详情
-export function detailStatus(data: ITableRow) {
+export function detailStatus(data: object) {
   return request({
     url: '/meter/stateManage/selectStateManageInfo',
     method: 'post',
diff --git a/src/components/SearchArea/SearchItem.vue b/src/components/SearchArea/SearchItem.vue
index 3adef93..dc53b08 100644
--- a/src/components/SearchArea/SearchItem.vue
+++ b/src/components/SearchArea/SearchItem.vue
@@ -23,7 +23,6 @@
   display: inline-block;
   margin-bottom: 10px;
   vertical-align: top;
-  box-sizing: inherit;
   margin-right: 5px;
 }
 
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index 12d7290..e3c72af 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -1,5 +1,9 @@
 // 证书打印查询
 export interface ICertPrintSearch {
+  certificateClass: string
+  certificateNo: string
+  createUserId: number
+  printStatus: number | null
   certificationReportCode: string // 证书编号
   orderNo: string // 委托书编号
   customerName: string // 委托方名称
@@ -13,7 +17,7 @@
   reason: string // 操作原因
   sampleId: string // 样品id
   status: string // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
-  ids?: []
+  ids?: [] | null
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 3daa2b5..391931b 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -22,6 +22,10 @@
 const activeTitle = ref('') // active对应的审批状态名字
 // 查询条件
 const listQuery = ref<ICertPrintSearch>({
+  certificateClass: '',
+  certificateNo: '', // 证书编号
+  createUserId: 0,
+  printStatus: 0, // 可打印(证书可打印传0,全部传null)
   certificationReportCode: '', // 证书编号
   orderNo: '', // 委托书编号
   customerName: '', // 委托方名称
@@ -30,11 +34,12 @@
   certificateReportType: '', // 证书类型
   printNum: '', // 打印次数 -未打印和全部用
   approvalStatus: '', // 审批状态-审批查询用
-  orderId: '0', // 委托书id
+  orderId: '', // 委托书id
   reason: '', // 操作原因
-  sampleId: '0', // 样品id
+  sampleId: '', // 样品id
   status: '', // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
   formId: SCHEDULE.BUSINESS_CERT_PRINT,
+  ids: null, // 设置默认值
   offset: 1,
   limit: 20,
 })
@@ -78,22 +83,30 @@
         }
       }
     })
+    if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+      active.value = window.sessionStorage.getItem('buttonBoxActive')!
+      activeTitle.value === '未通过'
+    }
+    else {
+      active.value = menu.value.find(item => item.name === '可打印')!.id // 可打印
+      activeTitle.value === '可打印'
+    }
   })
 }
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationReportCode', width: '110', align: 'center' },
-  { text: '证书名称', value: 'certificationReportName', width: '120', align: 'center' },
+  { text: '证书编号', value: 'certificateNo', width: '110', align: 'center' },
+  { text: '证书名称', value: 'certificateName', width: '120', align: 'center' },
   { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', width: '120', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', width: '120', align: 'center' },
   { text: '委托书编号', value: 'orderNo', width: '120', align: 'center' },
-  { text: '检校类别', value: 'customerNo', width: '120', align: 'center' },
-  { text: '检定人员', value: 'customerName', width: '120', align: 'center' },
-  { text: '证书类型', value: 'certificateReportTypeName', width: '120', align: 'center' },
-  { text: '打印状态', value: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
+  { text: '检校类别', value: 'measureType', width: '120', align: 'center' },
+  { text: '检定人员', value: 'measurePersonId', width: '120', align: 'center' },
+  { text: '证书类型', value: 'certificateType', width: '120', align: 'center' },
+  { text: '打印状态', value: 'printNum', align: 'center', width: '85px', filter: (row: ICerPrintList) => { var cnum = ['未打印', '一', '二', '三', '四', '五', '六', '七', '八', '九', '十']; return row.printNum == 0 ? '未打印' : `${cnum[parseInt(row.printNum)]}次打印` } },
   { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
 ])
 // 表格数据
@@ -107,37 +120,35 @@
 
 // 根据过滤查询条件
 function filterQuery() {
-  console.log(activeTitle)
+  const approvalStatus = menu.value.find(item => item.name === activeTitle.value)!.id
+  listQuery.value.approvalStatus = approvalStatus
   switch (activeTitle.value) {
     case '可打印':
-      listQuery.value.printNum = 0
+      listQuery.value.printStatus = 0
       listQuery.value.approvalStatus = ''
       break
     case '全部':
-      listQuery.value.printNum = 0
+      listQuery.value.printStatus = 2
       listQuery.value.approvalStatus = ''
       break
     case '待审批':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '1'
+      listQuery.value.printStatus = 2
       break
     case '审批中':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '2'
+      listQuery.value.printStatus = 2
       break
     case '已通过':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '3'
+      listQuery.value.printStatus = 2
       break
     case '未通过':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '4'
+      listQuery.value.printStatus = 2
       break
   }
 }
 
 // 数据查询
 function fetchData(isNowPage = false) {
+  console.log(listQuery)
   filterQuery()
   loadingTable.value = true
   if (!isNowPage) {
@@ -146,15 +157,11 @@
   }
   // 模拟数据
   loadingTable.value = false
-  list.value = [
-    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '0', printStatusName: '未打印', certificateReportTypeName: '自检', approvalStatusName: '待审批', taskId: '100', id: '10' },
-    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '1', printStatusName: '已打印', certificateReportTypeName: '自检', approvalStatusName: '待审批', taskId: '1001', id: '101' },
-  ]
-  // getCertList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getCertList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -167,7 +174,12 @@
 }
 // 点击重置
 const clearList = () => {
+  const approvalStatus = menu.value.find(item => item.name === activeTitle.value)!.id
   listQuery.value = {
+    certificateClass: '',
+    certificateNo: '', // 证书编号
+    createUserId: 0,
+    printStatus: 0, // 可打印(证书可打印传0,全部传null)
     certificationReportCode: '', // 证书编号
     orderNo: '', // 委托书编号
     customerName: '', // 委托方名称
@@ -176,14 +188,18 @@
     certificateReportType: '', // 证书类型
     printNum: '', // 打印次数 -未打印和全部用
     approvalStatus: '', // 审批状态-审批查询用
-    orderId: '0', // 委托书id
+    orderId: '', // 委托书id
     reason: '', // 操作原因
-    sampleId: '0', // 样品id
+    sampleId: '', // 样品id
     status: '', // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
     formId: SCHEDULE.BUSINESS_CERT_PRINT,
     offset: 1,
     limit: 20,
   }
+  listQuery.value.approvalStatus = approvalStatus
+  if (activeTitle.value === '可打印' || activeTitle.value === '全部') {
+    listQuery.value.approvalStatus = ''
+  }
   fetchData(true)
 }
 // 点击详情
@@ -226,14 +242,14 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   if (list.value.length > 0) {
-    // const params = {
-    //   ...listQuery.value,
-    //   ids: checkoutList.value,
-    // }
-    // exportCert(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '证书打印列表.xlsx')
-    // })
+    const params = {
+      ...listQuery.value,
+      ids: checkoutList.value,
+    }
+    exportCert(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '证书打印列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
@@ -243,10 +259,9 @@
 
 // 打印
 const bindLabel = (row: ICerPrintList) => {
-  console.log(1)
-  row.printNum = 1
+  console.log(row)
   // 判断状态第一次可以直接打印,之后的打印需要审批
-  if (row.printNum == 1) {
+  if (row.printNum == 0) {
     ElMessageBox.confirm(
       '确定要打印吗？',
       '确认操作',
@@ -319,18 +334,9 @@
 
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
-    active.value = window.sessionStorage.getItem('buttonBoxActive')!
-  }
-  else {
-    active.value = menu.value.find(item => item.name === '可打印')!.id // 可打
-    activeTitle.value === '可打印'
-  }
+
   fetchData(true)
 })
-onUnmounted(() => {
-  window.sessionStorage.setItem('buttonBoxActive', '') // 清除
-})
 </script>
 
 <template>
@@ -342,7 +348,7 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.certificationReportCode"
+          v-model.trim="listQuery.certificateNo"
           placeholder="证书编号"
           class="short-input"
           clearable
@@ -373,7 +379,7 @@
         />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 120px;" clearable>
+        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 160px;" clearable>
           <el-option v-for="item in certificationClassList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
@@ -388,19 +394,19 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column v-if="listQuery.printNum === ''" label="审批状态" align="center" width="90px" prop="approvalStatusName" />
+          <el-table-column label="审批状态" align="center" width="90px" prop="approvalStatusName" />
           <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.printNum === 0 || (listQuery.approvalStatus === '3')" size="small" link type="primary" @click="bindLabel(row)">
+              <el-button v-if="activeTitle === '全部' || activeTitle === '可打印'" size="small" link type="primary" @click="bindLabel(row)">
                 打印
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'agree')">
+              <el-button v-if="activeTitle === '待审批'" size="small" type="primary" link @click="handleDistribute(row, 'agree')">
                 同意
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'refuse')">
+              <el-button v-if="activeTitle === '待审批'" size="small" type="primary" link @click="handleDistribute(row, 'refuse')">
                 拒绝
               </el-button>
             </template>
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 2f8f8a4..fa8e6b0 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -392,4 +392,7 @@
 
 <style lang="scss" scoped>
 // 样式
+.short-input {
+  width: 180px !important;
+}
 </style>
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 2e8e4a7..5d7fc0f 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,5 +1,5 @@
 <!-- 设备借用处理 -->
-<script lang="ts" setup name="borrowApply">
+<script lang="ts" setup name="BorrowHandle">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
@@ -44,7 +44,7 @@
   applyPersonName: '', // 申请人姓名
   startTime: '', // 领用开始日期
   endTime: '', // 领用结束日期
-  approvalStatus: '4', // 	审批状态
+  approvalStatus: '4', // 	审批状态 (已完成)
   processResult: '1' || active.value, // 	处置结果 (3个状态字典值)
   applyType: '2', // 申请类型 借用2
   createUser: '', // 创建人
@@ -373,7 +373,7 @@
     active.value = window.sessionStorage.getItem('buttonBoxActive')!
   }
   else {
-    active.value = menu.value.find(item => item.name === '待借用')!.id // 全部
+    active.value = menu.value.find(item => item.name === '待借用')!.id // 待借用
     activeTitle.value === '待借用'
   }
   nextTick(() => {
@@ -394,6 +394,7 @@
         <el-input
           v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
+          class="short-input"
           clearable
         />
       </search-item>
@@ -401,6 +402,7 @@
         <el-input
           v-model.trim="listQuery.applyName"
           placeholder="申请名称"
+          class="short-input"
           clearable
         />
       </search-item>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index aae69c7..a59267d 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,5 +1,5 @@
 <!-- 设备借用申请 -->
-<script lang="ts" setup name="borrowApply">
+<script lang="ts" setup name="BorrowApply">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
@@ -49,7 +49,7 @@
   applyPersonName: '', // 申请人姓名
   startTime: '', // 领用开始日期
   endTime: '', // 领用结束日期
-  approvalStatus: active.value, // 	审批状态
+  approvalStatus: active.value, // 	审批状态 1 2 3 对应待借用|已借用|已归还
   processResult: '', // 	处置结果
   applyType: '2', // 申请类型 借用2
   createUser: '', // 创建人
@@ -156,7 +156,7 @@
     applyPerson: '', // 申请人
     startTime: '', // 申请开始日期
     endTime: '', // 申请结束日期
-    approvalStatus: active.value, // 	审批状态
+    approvalStatus: active.value, // 	审批状态  // 	审批状态 1 2 3 对应待借用|已借用|已归还
     processResult: '', // 	处置结果
     applyType: '2', // 申请类型 借用2
     createUser: '', // 创建人
@@ -193,27 +193,8 @@
   })
 }
 
-onMounted(async () => {
-  await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
-    active.value = window.sessionStorage.getItem('buttonBoxActive')!
-  }
-  else {
-    active.value = menu.value.find(item => item.name === '全部')!.id // 全部
-    activeTitle.value === '全部'
-  }
-  nextTick(() => {
-    fetchData(true) // 获取表格数据
-    fetchDeptTreeList() // 获取使用部门
-    fetchUserList() // 获取人员列表
-  })
-})
 const $router = useRouter()
 
-onUnmounted(() => {
-  window.sessionStorage.setItem('buttonBoxActive', '') // 清除
-})
-
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
@@ -434,6 +415,21 @@
     }
   }
 }
+onMounted(async () => {
+  await getDict() // 获取字典-审批状态
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+    active.value = window.sessionStorage.getItem('buttonBoxActive')!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '全部')!.id // 全部
+    activeTitle.value === '全部'
+  }
+  nextTick(() => {
+    fetchData(true) // 获取表格数据
+    fetchDeptTreeList() // 获取使用部门
+    fetchUserList() // 获取人员列表
+  })
+})
 </script>
 
 <template>
@@ -446,6 +442,7 @@
         <el-input
           v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
+          class="short-input"
           clearable
         />
       </search-item>
@@ -453,6 +450,7 @@
         <el-input
           v-model.trim="listQuery.applyName"
           placeholder="申请名称"
+          class="short-input"
           clearable
         />
       </search-item>
@@ -506,7 +504,7 @@
           <el-table-column
             label="操作"
             align="center"
-            :width="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 70 : 200"
+            :width="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 140 : 200"
             fixed="right"
           >
             <template #default="{ row }">
@@ -557,6 +555,17 @@
               >
                 编辑
               </el-button>
+
+              <el-button
+                v-if="proxy.hasPerm('/device/borrow/borrowapply/update') && activeTitle === '未通过'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName.search('驳回') === -1 "
+                @click="handleEdit(row, '编辑', 'edit')"
+              >
+                编辑
+              </el-button>
               <el-button
                 v-if="proxy.hasPerm('/device/borrow/borrowapply/update') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
                 size="small"
diff --git a/src/views/device/borrow/components/approvalActionDialog.vue b/src/views/device/borrow/components/approvalActionDialog.vue
deleted file mode 100644
index 9375861..0000000
--- a/src/views/device/borrow/components/approvalActionDialog.vue
+++ /dev/null
@@ -1,109 +0,0 @@
-<!-- 审批操作弹窗 -->
-<script lang="ts" setup>
-import type { FormInstance, FormRules } from 'element-plus'
-import dayjs from 'dayjs'
-import useUserStore from '@/store/modules/user'
-const emits = defineEmits(['resetData'])
-const userInfo = useUserStore()
-const dialogVisibleApprove = ref(false)
-const form = reactive({
-  radio: '1',
-  certificateNo: '',
-  certificateName: '',
-  certificateCompany: '',
-  certificateDate: '',
-  validDate: '',
-})
-const ruleFormRef = ref<FormInstance>()
-const rules = reactive<FormRules>({
-})
-// 重置
-const resetData = () => {
-  form.certificateNo = ''
-  form.certificateName = ''
-  form.certificateCompany = ''
-  form.certificateDate = ''
-  form.validDate = ''
-}
-const approvetime = ref('') // 审批时间
-const initDialog = (row: any) => {
-  dialogVisibleApprove.value = true
-  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
-  form.radio = row.radio
-}
-defineExpose({ initDialog })
-
-// 点击保存
-const submitForm = async (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  await formEl.validate((valid, fields) => {
-    if (valid) {
-      dialogVisibleApprove.value = false
-      emits('resetData')
-    }
-  })
-}
-// 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  formEl.resetFields()
-  dialogVisibleApprove.value = false
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
-    <el-form
-      ref="ruleFormRef" :model="form"
-      :rules="rules" label-width="110px"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见">
-            <el-radio-group v-model="form.radio" style="width: 100%;">
-              <el-radio label="1">
-                同意
-              </el-radio>
-              <el-radio label="2">
-                拒绝
-              </el-radio>
-              <el-radio label="3">
-                驳回
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论">
-            <el-input
-              :rows="4"
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人">
-            <el-input disabled :value="userInfo.$state.name" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间">
-            <el-input disabled :value="approvetime" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
-        <el-button @click="resetForm(ruleFormRef)">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/device/borrow/editHandle.vue b/src/views/device/borrow/editHandle.vue
index d2e423c..9a5b2a6 100644
--- a/src/views/device/borrow/editHandle.vue
+++ b/src/views/device/borrow/editHandle.vue
@@ -1,4 +1,5 @@
-<script lang="ts" setup name="Detail">
+<!-- 设备借用处理详情/编辑 -->
+<script lang="ts" setup name="EditHandle">
 import { onMounted, ref } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { ElLoading } from 'element-plus'
@@ -17,7 +18,6 @@
 const { proxy } = getCurrentInstance() as any
 const useDeptList = ref<deptType[]>([]) // 部门列表
 const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
-const total = ref(20)// 总数
 // 表单数据
 const form = ref({
   id: '',
@@ -29,19 +29,7 @@
   applyDesc: '', // 申请说明
 })
 const list = ref<IdeviceList[]>([])// 表格数据
-// 查询条件
-const listQuery: Ref<IdeviceListQuery> = ref({
-  equipmentName: '', // 仪器名称
-  equipmentNo: '', // 设备编号
-  modelNo: '', // 型号
-  mesureRange: '', // 测量范围
-  useDeptName: '', // 使用部门
-  usePersonName: '', // 使用人
-  managerStateName: '', // 管理状态
-  validDate: '', // 有效日期
-  offset: 1,
-  limit: 20,
-})
+
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '设备编号', value: 'equipmentNo', align: 'center', width: '230' },
@@ -82,11 +70,11 @@
   $router.back()
 }
 
-// 打印
+// 设备借用处理详情打印
 const printObj = ref({
   id: 'lysq', // 需要打印元素的id
   popTitle: '设备借用处理', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备借用处理</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备借用处理详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
@@ -125,7 +113,7 @@
   <app-container>
     <detail-page title="设备借用处理-详情">
       <template #btns>
-        <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/device/borrow/borrowhandle/print')" v-print="printObj" type="primary">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -225,22 +213,6 @@
     background-color: #fff;
     // padding: 10px;
 
-    .title-button {
-      display: flex;
-      align-items: center;
-
-      &::before {
-        content: "";
-        flex: 1;
-      }
-
-      .button-group {
-        flex: 1;
-        display: flex;
-        justify-content: flex-end;
-      }
-    }
-
     .form-area {
       margin-top: 40px;
     }
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index b76ab3e..18879cc 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -352,6 +352,7 @@
   formInline.value.acceptanceCheckId = object.id
   checkIdObject.value = object
   // 获取到详情
+
   equipmentApplyInfo({ id: object.id }).then((res) => {
     res.data.equipmentInfoList.map((item: objectReturn) => {
       if (item.id) {
@@ -492,11 +493,11 @@
         <el-row :gutter="20" class="marg">
           <el-col :span="14">
             <el-form-item label="附件:">
-              <show-photo v-if="formInline.fileList[0].minioFileName" :minio-file-name="formInline.fileList[0].minioFileName" />
+              <show-photo v-if="formInline.fileList" :minio-file-name="formInline.fileList.length && formInline.fileList[0].minioFileName ? formInline.fileList[0].minioFileName : ''" />
               <span v-else-if="pageType === 'detail'">无</span>
               <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.fileList[0].minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                {{ formInline.fileList[0].minioFileName === '' ? '上传' : '更换附件' }}
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.fileList.length && formInline.fileList[0].minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.fileList.length && formInline.fileList[0].minioFileName ? '上传' : '更换附件' }}
               </el-button>
             </el-form-item>
           </el-col>
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 73b9c0b..b21f663 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -543,6 +543,20 @@
 const addId = ref('')
 // 点击顶部一排按钮
 const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  // 添加校验条件
+  if (fromListInfo.value.fixedAssetsList) {
+    if (!fromListInfo.value.fixedAssetsList[0]?.id) {
+      ElMessage.warning('标准配套设备更换不能为空!')
+      return
+    }
+  }
+  if (fromListInfo.value.fileList) {
+    if (!fromListInfo.value.fileList[0]?.fileName) {
+      ElMessage.warning('申请文档不能为空!')
+      return
+    }
+  }
+
   if (item === '保存' && pageType.value === 'add') {
     if (!formEl) {
       return

diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index dbce999..5bd4111 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -45,6 +45,15 @@
     data,
   })
 }
+
+// 设备借用驳回后编辑
+export function failUpdate(data: object) {
+  return request({
+    url: '/equipmentApply/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 // 设备借用申请删除
 export function deleteApply(data: object) {
   return request({
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 9049282..7f9431b 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -1,6 +1,6 @@
 // 状态管理相关接口api
 import request from '../index'
-import type { ISearchQuery, ITableRow, Iapprove } from '@/views/device/stateManage/components/status-interface.ts'
+import type { ISearchQuery, Iapprove } from '@/views/device/stateManage/components/status-interface'
 
 // 设备申请列表
 export function getStatusList(data: ISearchQuery) {
@@ -11,7 +11,7 @@
   })
 }
 // 状态管理新建
-export function addStatus(data: ITableRow) {
+export function addStatus(data: Object) {
   return request({
     url: '/meter/stateManage/addStateManageInfo',
     method: 'post',
@@ -20,7 +20,7 @@
 }
 
 // 状态管理编辑
-export function updateStatus(data: ITableRow) {
+export function updateStatus(data: Object) {
   return request({
     url: '/meter/stateManage/updateStateManageInfo',
     method: 'post',
@@ -53,7 +53,7 @@
   })
 }
 // 状态管理详情
-export function detailStatus(data: ITableRow) {
+export function detailStatus(data: object) {
   return request({
     url: '/meter/stateManage/selectStateManageInfo',
     method: 'post',
diff --git a/src/components/SearchArea/SearchItem.vue b/src/components/SearchArea/SearchItem.vue
index 3adef93..dc53b08 100644
--- a/src/components/SearchArea/SearchItem.vue
+++ b/src/components/SearchArea/SearchItem.vue
@@ -23,7 +23,6 @@
   display: inline-block;
   margin-bottom: 10px;
   vertical-align: top;
-  box-sizing: inherit;
   margin-right: 5px;
 }
 
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index 12d7290..e3c72af 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -1,5 +1,9 @@
 // 证书打印查询
 export interface ICertPrintSearch {
+  certificateClass: string
+  certificateNo: string
+  createUserId: number
+  printStatus: number | null
   certificationReportCode: string // 证书编号
   orderNo: string // 委托书编号
   customerName: string // 委托方名称
@@ -13,7 +17,7 @@
   reason: string // 操作原因
   sampleId: string // 样品id
   status: string // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
-  ids?: []
+  ids?: [] | null
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 3daa2b5..391931b 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -22,6 +22,10 @@
 const activeTitle = ref('') // active对应的审批状态名字
 // 查询条件
 const listQuery = ref<ICertPrintSearch>({
+  certificateClass: '',
+  certificateNo: '', // 证书编号
+  createUserId: 0,
+  printStatus: 0, // 可打印(证书可打印传0,全部传null)
   certificationReportCode: '', // 证书编号
   orderNo: '', // 委托书编号
   customerName: '', // 委托方名称
@@ -30,11 +34,12 @@
   certificateReportType: '', // 证书类型
   printNum: '', // 打印次数 -未打印和全部用
   approvalStatus: '', // 审批状态-审批查询用
-  orderId: '0', // 委托书id
+  orderId: '', // 委托书id
   reason: '', // 操作原因
-  sampleId: '0', // 样品id
+  sampleId: '', // 样品id
   status: '', // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
   formId: SCHEDULE.BUSINESS_CERT_PRINT,
+  ids: null, // 设置默认值
   offset: 1,
   limit: 20,
 })
@@ -78,22 +83,30 @@
         }
       }
     })
+    if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+      active.value = window.sessionStorage.getItem('buttonBoxActive')!
+      activeTitle.value === '未通过'
+    }
+    else {
+      active.value = menu.value.find(item => item.name === '可打印')!.id // 可打印
+      activeTitle.value === '可打印'
+    }
   })
 }
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationReportCode', width: '110', align: 'center' },
-  { text: '证书名称', value: 'certificationReportName', width: '120', align: 'center' },
+  { text: '证书编号', value: 'certificateNo', width: '110', align: 'center' },
+  { text: '证书名称', value: 'certificateName', width: '120', align: 'center' },
   { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', width: '120', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', width: '120', align: 'center' },
   { text: '委托书编号', value: 'orderNo', width: '120', align: 'center' },
-  { text: '检校类别', value: 'customerNo', width: '120', align: 'center' },
-  { text: '检定人员', value: 'customerName', width: '120', align: 'center' },
-  { text: '证书类型', value: 'certificateReportTypeName', width: '120', align: 'center' },
-  { text: '打印状态', value: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
+  { text: '检校类别', value: 'measureType', width: '120', align: 'center' },
+  { text: '检定人员', value: 'measurePersonId', width: '120', align: 'center' },
+  { text: '证书类型', value: 'certificateType', width: '120', align: 'center' },
+  { text: '打印状态', value: 'printNum', align: 'center', width: '85px', filter: (row: ICerPrintList) => { var cnum = ['未打印', '一', '二', '三', '四', '五', '六', '七', '八', '九', '十']; return row.printNum == 0 ? '未打印' : `${cnum[parseInt(row.printNum)]}次打印` } },
   { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
 ])
 // 表格数据
@@ -107,37 +120,35 @@
 
 // 根据过滤查询条件
 function filterQuery() {
-  console.log(activeTitle)
+  const approvalStatus = menu.value.find(item => item.name === activeTitle.value)!.id
+  listQuery.value.approvalStatus = approvalStatus
   switch (activeTitle.value) {
     case '可打印':
-      listQuery.value.printNum = 0
+      listQuery.value.printStatus = 0
       listQuery.value.approvalStatus = ''
       break
     case '全部':
-      listQuery.value.printNum = 0
+      listQuery.value.printStatus = 2
       listQuery.value.approvalStatus = ''
       break
     case '待审批':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '1'
+      listQuery.value.printStatus = 2
       break
     case '审批中':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '2'
+      listQuery.value.printStatus = 2
       break
     case '已通过':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '3'
+      listQuery.value.printStatus = 2
       break
     case '未通过':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '4'
+      listQuery.value.printStatus = 2
       break
   }
 }
 
 // 数据查询
 function fetchData(isNowPage = false) {
+  console.log(listQuery)
   filterQuery()
   loadingTable.value = true
   if (!isNowPage) {
@@ -146,15 +157,11 @@
   }
   // 模拟数据
   loadingTable.value = false
-  list.value = [
-    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '0', printStatusName: '未打印', certificateReportTypeName: '自检', approvalStatusName: '待审批', taskId: '100', id: '10' },
-    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '1', printStatusName: '已打印', certificateReportTypeName: '自检', approvalStatusName: '待审批', taskId: '1001', id: '101' },
-  ]
-  // getCertList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getCertList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -167,7 +174,12 @@
 }
 // 点击重置
 const clearList = () => {
+  const approvalStatus = menu.value.find(item => item.name === activeTitle.value)!.id
   listQuery.value = {
+    certificateClass: '',
+    certificateNo: '', // 证书编号
+    createUserId: 0,
+    printStatus: 0, // 可打印(证书可打印传0,全部传null)
     certificationReportCode: '', // 证书编号
     orderNo: '', // 委托书编号
     customerName: '', // 委托方名称
@@ -176,14 +188,18 @@
     certificateReportType: '', // 证书类型
     printNum: '', // 打印次数 -未打印和全部用
     approvalStatus: '', // 审批状态-审批查询用
-    orderId: '0', // 委托书id
+    orderId: '', // 委托书id
     reason: '', // 操作原因
-    sampleId: '0', // 样品id
+    sampleId: '', // 样品id
     status: '', // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
     formId: SCHEDULE.BUSINESS_CERT_PRINT,
     offset: 1,
     limit: 20,
   }
+  listQuery.value.approvalStatus = approvalStatus
+  if (activeTitle.value === '可打印' || activeTitle.value === '全部') {
+    listQuery.value.approvalStatus = ''
+  }
   fetchData(true)
 }
 // 点击详情
@@ -226,14 +242,14 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   if (list.value.length > 0) {
-    // const params = {
-    //   ...listQuery.value,
-    //   ids: checkoutList.value,
-    // }
-    // exportCert(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '证书打印列表.xlsx')
-    // })
+    const params = {
+      ...listQuery.value,
+      ids: checkoutList.value,
+    }
+    exportCert(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '证书打印列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
@@ -243,10 +259,9 @@
 
 // 打印
 const bindLabel = (row: ICerPrintList) => {
-  console.log(1)
-  row.printNum = 1
+  console.log(row)
   // 判断状态第一次可以直接打印,之后的打印需要审批
-  if (row.printNum == 1) {
+  if (row.printNum == 0) {
     ElMessageBox.confirm(
       '确定要打印吗？',
       '确认操作',
@@ -319,18 +334,9 @@
 
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
-    active.value = window.sessionStorage.getItem('buttonBoxActive')!
-  }
-  else {
-    active.value = menu.value.find(item => item.name === '可打印')!.id // 可打
-    activeTitle.value === '可打印'
-  }
+
   fetchData(true)
 })
-onUnmounted(() => {
-  window.sessionStorage.setItem('buttonBoxActive', '') // 清除
-})
 </script>
 
 <template>
@@ -342,7 +348,7 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.certificationReportCode"
+          v-model.trim="listQuery.certificateNo"
           placeholder="证书编号"
           class="short-input"
           clearable
@@ -373,7 +379,7 @@
         />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 120px;" clearable>
+        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 160px;" clearable>
           <el-option v-for="item in certificationClassList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
@@ -388,19 +394,19 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column v-if="listQuery.printNum === ''" label="审批状态" align="center" width="90px" prop="approvalStatusName" />
+          <el-table-column label="审批状态" align="center" width="90px" prop="approvalStatusName" />
           <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.printNum === 0 || (listQuery.approvalStatus === '3')" size="small" link type="primary" @click="bindLabel(row)">
+              <el-button v-if="activeTitle === '全部' || activeTitle === '可打印'" size="small" link type="primary" @click="bindLabel(row)">
                 打印
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'agree')">
+              <el-button v-if="activeTitle === '待审批'" size="small" type="primary" link @click="handleDistribute(row, 'agree')">
                 同意
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'refuse')">
+              <el-button v-if="activeTitle === '待审批'" size="small" type="primary" link @click="handleDistribute(row, 'refuse')">
                 拒绝
               </el-button>
             </template>
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 2f8f8a4..fa8e6b0 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -392,4 +392,7 @@
 
 <style lang="scss" scoped>
 // 样式
+.short-input {
+  width: 180px !important;
+}
 </style>
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 2e8e4a7..5d7fc0f 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,5 +1,5 @@
 <!-- 设备借用处理 -->
-<script lang="ts" setup name="borrowApply">
+<script lang="ts" setup name="BorrowHandle">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
@@ -44,7 +44,7 @@
   applyPersonName: '', // 申请人姓名
   startTime: '', // 领用开始日期
   endTime: '', // 领用结束日期
-  approvalStatus: '4', // 	审批状态
+  approvalStatus: '4', // 	审批状态 (已完成)
   processResult: '1' || active.value, // 	处置结果 (3个状态字典值)
   applyType: '2', // 申请类型 借用2
   createUser: '', // 创建人
@@ -373,7 +373,7 @@
     active.value = window.sessionStorage.getItem('buttonBoxActive')!
   }
   else {
-    active.value = menu.value.find(item => item.name === '待借用')!.id // 全部
+    active.value = menu.value.find(item => item.name === '待借用')!.id // 待借用
     activeTitle.value === '待借用'
   }
   nextTick(() => {
@@ -394,6 +394,7 @@
         <el-input
           v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
+          class="short-input"
           clearable
         />
       </search-item>
@@ -401,6 +402,7 @@
         <el-input
           v-model.trim="listQuery.applyName"
           placeholder="申请名称"
+          class="short-input"
           clearable
         />
       </search-item>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index aae69c7..a59267d 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,5 +1,5 @@
 <!-- 设备借用申请 -->
-<script lang="ts" setup name="borrowApply">
+<script lang="ts" setup name="BorrowApply">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
@@ -49,7 +49,7 @@
   applyPersonName: '', // 申请人姓名
   startTime: '', // 领用开始日期
   endTime: '', // 领用结束日期
-  approvalStatus: active.value, // 	审批状态
+  approvalStatus: active.value, // 	审批状态 1 2 3 对应待借用|已借用|已归还
   processResult: '', // 	处置结果
   applyType: '2', // 申请类型 借用2
   createUser: '', // 创建人
@@ -156,7 +156,7 @@
     applyPerson: '', // 申请人
     startTime: '', // 申请开始日期
     endTime: '', // 申请结束日期
-    approvalStatus: active.value, // 	审批状态
+    approvalStatus: active.value, // 	审批状态  // 	审批状态 1 2 3 对应待借用|已借用|已归还
     processResult: '', // 	处置结果
     applyType: '2', // 申请类型 借用2
     createUser: '', // 创建人
@@ -193,27 +193,8 @@
   })
 }
 
-onMounted(async () => {
-  await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
-    active.value = window.sessionStorage.getItem('buttonBoxActive')!
-  }
-  else {
-    active.value = menu.value.find(item => item.name === '全部')!.id // 全部
-    activeTitle.value === '全部'
-  }
-  nextTick(() => {
-    fetchData(true) // 获取表格数据
-    fetchDeptTreeList() // 获取使用部门
-    fetchUserList() // 获取人员列表
-  })
-})
 const $router = useRouter()
 
-onUnmounted(() => {
-  window.sessionStorage.setItem('buttonBoxActive', '') // 清除
-})
-
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
@@ -434,6 +415,21 @@
     }
   }
 }
+onMounted(async () => {
+  await getDict() // 获取字典-审批状态
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+    active.value = window.sessionStorage.getItem('buttonBoxActive')!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '全部')!.id // 全部
+    activeTitle.value === '全部'
+  }
+  nextTick(() => {
+    fetchData(true) // 获取表格数据
+    fetchDeptTreeList() // 获取使用部门
+    fetchUserList() // 获取人员列表
+  })
+})
 </script>
 
 <template>
@@ -446,6 +442,7 @@
         <el-input
           v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
+          class="short-input"
           clearable
         />
       </search-item>
@@ -453,6 +450,7 @@
         <el-input
           v-model.trim="listQuery.applyName"
           placeholder="申请名称"
+          class="short-input"
           clearable
         />
       </search-item>
@@ -506,7 +504,7 @@
           <el-table-column
             label="操作"
             align="center"
-            :width="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 70 : 200"
+            :width="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 140 : 200"
             fixed="right"
           >
             <template #default="{ row }">
@@ -557,6 +555,17 @@
               >
                 编辑
               </el-button>
+
+              <el-button
+                v-if="proxy.hasPerm('/device/borrow/borrowapply/update') && activeTitle === '未通过'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName.search('驳回') === -1 "
+                @click="handleEdit(row, '编辑', 'edit')"
+              >
+                编辑
+              </el-button>
               <el-button
                 v-if="proxy.hasPerm('/device/borrow/borrowapply/update') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
                 size="small"
diff --git a/src/views/device/borrow/components/approvalActionDialog.vue b/src/views/device/borrow/components/approvalActionDialog.vue
deleted file mode 100644
index 9375861..0000000
--- a/src/views/device/borrow/components/approvalActionDialog.vue
+++ /dev/null
@@ -1,109 +0,0 @@
-<!-- 审批操作弹窗 -->
-<script lang="ts" setup>
-import type { FormInstance, FormRules } from 'element-plus'
-import dayjs from 'dayjs'
-import useUserStore from '@/store/modules/user'
-const emits = defineEmits(['resetData'])
-const userInfo = useUserStore()
-const dialogVisibleApprove = ref(false)
-const form = reactive({
-  radio: '1',
-  certificateNo: '',
-  certificateName: '',
-  certificateCompany: '',
-  certificateDate: '',
-  validDate: '',
-})
-const ruleFormRef = ref<FormInstance>()
-const rules = reactive<FormRules>({
-})
-// 重置
-const resetData = () => {
-  form.certificateNo = ''
-  form.certificateName = ''
-  form.certificateCompany = ''
-  form.certificateDate = ''
-  form.validDate = ''
-}
-const approvetime = ref('') // 审批时间
-const initDialog = (row: any) => {
-  dialogVisibleApprove.value = true
-  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
-  form.radio = row.radio
-}
-defineExpose({ initDialog })
-
-// 点击保存
-const submitForm = async (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  await formEl.validate((valid, fields) => {
-    if (valid) {
-      dialogVisibleApprove.value = false
-      emits('resetData')
-    }
-  })
-}
-// 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  formEl.resetFields()
-  dialogVisibleApprove.value = false
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
-    <el-form
-      ref="ruleFormRef" :model="form"
-      :rules="rules" label-width="110px"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见">
-            <el-radio-group v-model="form.radio" style="width: 100%;">
-              <el-radio label="1">
-                同意
-              </el-radio>
-              <el-radio label="2">
-                拒绝
-              </el-radio>
-              <el-radio label="3">
-                驳回
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论">
-            <el-input
-              :rows="4"
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人">
-            <el-input disabled :value="userInfo.$state.name" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间">
-            <el-input disabled :value="approvetime" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
-        <el-button @click="resetForm(ruleFormRef)">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/device/borrow/editHandle.vue b/src/views/device/borrow/editHandle.vue
index d2e423c..9a5b2a6 100644
--- a/src/views/device/borrow/editHandle.vue
+++ b/src/views/device/borrow/editHandle.vue
@@ -1,4 +1,5 @@
-<script lang="ts" setup name="Detail">
+<!-- 设备借用处理详情/编辑 -->
+<script lang="ts" setup name="EditHandle">
 import { onMounted, ref } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { ElLoading } from 'element-plus'
@@ -17,7 +18,6 @@
 const { proxy } = getCurrentInstance() as any
 const useDeptList = ref<deptType[]>([]) // 部门列表
 const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
-const total = ref(20)// 总数
 // 表单数据
 const form = ref({
   id: '',
@@ -29,19 +29,7 @@
   applyDesc: '', // 申请说明
 })
 const list = ref<IdeviceList[]>([])// 表格数据
-// 查询条件
-const listQuery: Ref<IdeviceListQuery> = ref({
-  equipmentName: '', // 仪器名称
-  equipmentNo: '', // 设备编号
-  modelNo: '', // 型号
-  mesureRange: '', // 测量范围
-  useDeptName: '', // 使用部门
-  usePersonName: '', // 使用人
-  managerStateName: '', // 管理状态
-  validDate: '', // 有效日期
-  offset: 1,
-  limit: 20,
-})
+
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '设备编号', value: 'equipmentNo', align: 'center', width: '230' },
@@ -82,11 +70,11 @@
   $router.back()
 }
 
-// 打印
+// 设备借用处理详情打印
 const printObj = ref({
   id: 'lysq', // 需要打印元素的id
   popTitle: '设备借用处理', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备借用处理</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备借用处理详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
@@ -125,7 +113,7 @@
   <app-container>
     <detail-page title="设备借用处理-详情">
       <template #btns>
-        <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/device/borrow/borrowhandle/print')" v-print="printObj" type="primary">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -225,22 +213,6 @@
     background-color: #fff;
     // padding: 10px;
 
-    .title-button {
-      display: flex;
-      align-items: center;
-
-      &::before {
-        content: "";
-        flex: 1;
-      }
-
-      .button-group {
-        flex: 1;
-        display: flex;
-        justify-content: flex-end;
-      }
-    }
-
     .form-area {
       margin-top: 40px;
     }
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index b76ab3e..18879cc 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -352,6 +352,7 @@
   formInline.value.acceptanceCheckId = object.id
   checkIdObject.value = object
   // 获取到详情
+
   equipmentApplyInfo({ id: object.id }).then((res) => {
     res.data.equipmentInfoList.map((item: objectReturn) => {
       if (item.id) {
@@ -492,11 +493,11 @@
         <el-row :gutter="20" class="marg">
           <el-col :span="14">
             <el-form-item label="附件:">
-              <show-photo v-if="formInline.fileList[0].minioFileName" :minio-file-name="formInline.fileList[0].minioFileName" />
+              <show-photo v-if="formInline.fileList" :minio-file-name="formInline.fileList.length && formInline.fileList[0].minioFileName ? formInline.fileList[0].minioFileName : ''" />
               <span v-else-if="pageType === 'detail'">无</span>
               <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.fileList[0].minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                {{ formInline.fileList[0].minioFileName === '' ? '上传' : '更换附件' }}
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.fileList.length && formInline.fileList[0].minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.fileList.length && formInline.fileList[0].minioFileName ? '上传' : '更换附件' }}
               </el-button>
             </el-form-item>
           </el-col>
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 73b9c0b..b21f663 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -543,6 +543,20 @@
 const addId = ref('')
 // 点击顶部一排按钮
 const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  // 添加校验条件
+  if (fromListInfo.value.fixedAssetsList) {
+    if (!fromListInfo.value.fixedAssetsList[0]?.id) {
+      ElMessage.warning('标准配套设备更换不能为空!')
+      return
+    }
+  }
+  if (fromListInfo.value.fileList) {
+    if (!fromListInfo.value.fileList[0]?.fileName) {
+      ElMessage.warning('申请文档不能为空!')
+      return
+    }
+  }
+
   if (item === '保存' && pageType.value === 'add') {
     if (!formEl) {
       return
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 0f8a9d5..3452009 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -148,7 +148,7 @@
     ABCList.value = response.data
   })
   // 获取检定方式
-  getDictByCode('mesureType').then((response) => {
+  getDictByCode('measureType').then((response) => {
     mesureTypeList.value = response.data
   })
   // 获取专业分类

diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index dbce999..5bd4111 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -45,6 +45,15 @@
     data,
   })
 }
+
+// 设备借用驳回后编辑
+export function failUpdate(data: object) {
+  return request({
+    url: '/equipmentApply/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 // 设备借用申请删除
 export function deleteApply(data: object) {
   return request({
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 9049282..7f9431b 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -1,6 +1,6 @@
 // 状态管理相关接口api
 import request from '../index'
-import type { ISearchQuery, ITableRow, Iapprove } from '@/views/device/stateManage/components/status-interface.ts'
+import type { ISearchQuery, Iapprove } from '@/views/device/stateManage/components/status-interface'
 
 // 设备申请列表
 export function getStatusList(data: ISearchQuery) {
@@ -11,7 +11,7 @@
   })
 }
 // 状态管理新建
-export function addStatus(data: ITableRow) {
+export function addStatus(data: Object) {
   return request({
     url: '/meter/stateManage/addStateManageInfo',
     method: 'post',
@@ -20,7 +20,7 @@
 }
 
 // 状态管理编辑
-export function updateStatus(data: ITableRow) {
+export function updateStatus(data: Object) {
   return request({
     url: '/meter/stateManage/updateStateManageInfo',
     method: 'post',
@@ -53,7 +53,7 @@
   })
 }
 // 状态管理详情
-export function detailStatus(data: ITableRow) {
+export function detailStatus(data: object) {
   return request({
     url: '/meter/stateManage/selectStateManageInfo',
     method: 'post',
diff --git a/src/components/SearchArea/SearchItem.vue b/src/components/SearchArea/SearchItem.vue
index 3adef93..dc53b08 100644
--- a/src/components/SearchArea/SearchItem.vue
+++ b/src/components/SearchArea/SearchItem.vue
@@ -23,7 +23,6 @@
   display: inline-block;
   margin-bottom: 10px;
   vertical-align: top;
-  box-sizing: inherit;
   margin-right: 5px;
 }
 
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index 12d7290..e3c72af 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -1,5 +1,9 @@
 // 证书打印查询
 export interface ICertPrintSearch {
+  certificateClass: string
+  certificateNo: string
+  createUserId: number
+  printStatus: number | null
   certificationReportCode: string // 证书编号
   orderNo: string // 委托书编号
   customerName: string // 委托方名称
@@ -13,7 +17,7 @@
   reason: string // 操作原因
   sampleId: string // 样品id
   status: string // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
-  ids?: []
+  ids?: [] | null
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 3daa2b5..391931b 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -22,6 +22,10 @@
 const activeTitle = ref('') // active对应的审批状态名字
 // 查询条件
 const listQuery = ref<ICertPrintSearch>({
+  certificateClass: '',
+  certificateNo: '', // 证书编号
+  createUserId: 0,
+  printStatus: 0, // 可打印(证书可打印传0,全部传null)
   certificationReportCode: '', // 证书编号
   orderNo: '', // 委托书编号
   customerName: '', // 委托方名称
@@ -30,11 +34,12 @@
   certificateReportType: '', // 证书类型
   printNum: '', // 打印次数 -未打印和全部用
   approvalStatus: '', // 审批状态-审批查询用
-  orderId: '0', // 委托书id
+  orderId: '', // 委托书id
   reason: '', // 操作原因
-  sampleId: '0', // 样品id
+  sampleId: '', // 样品id
   status: '', // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
   formId: SCHEDULE.BUSINESS_CERT_PRINT,
+  ids: null, // 设置默认值
   offset: 1,
   limit: 20,
 })
@@ -78,22 +83,30 @@
         }
       }
     })
+    if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+      active.value = window.sessionStorage.getItem('buttonBoxActive')!
+      activeTitle.value === '未通过'
+    }
+    else {
+      active.value = menu.value.find(item => item.name === '可打印')!.id // 可打印
+      activeTitle.value === '可打印'
+    }
   })
 }
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationReportCode', width: '110', align: 'center' },
-  { text: '证书名称', value: 'certificationReportName', width: '120', align: 'center' },
+  { text: '证书编号', value: 'certificateNo', width: '110', align: 'center' },
+  { text: '证书名称', value: 'certificateName', width: '120', align: 'center' },
   { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', width: '120', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', width: '120', align: 'center' },
   { text: '委托书编号', value: 'orderNo', width: '120', align: 'center' },
-  { text: '检校类别', value: 'customerNo', width: '120', align: 'center' },
-  { text: '检定人员', value: 'customerName', width: '120', align: 'center' },
-  { text: '证书类型', value: 'certificateReportTypeName', width: '120', align: 'center' },
-  { text: '打印状态', value: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
+  { text: '检校类别', value: 'measureType', width: '120', align: 'center' },
+  { text: '检定人员', value: 'measurePersonId', width: '120', align: 'center' },
+  { text: '证书类型', value: 'certificateType', width: '120', align: 'center' },
+  { text: '打印状态', value: 'printNum', align: 'center', width: '85px', filter: (row: ICerPrintList) => { var cnum = ['未打印', '一', '二', '三', '四', '五', '六', '七', '八', '九', '十']; return row.printNum == 0 ? '未打印' : `${cnum[parseInt(row.printNum)]}次打印` } },
   { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
 ])
 // 表格数据
@@ -107,37 +120,35 @@
 
 // 根据过滤查询条件
 function filterQuery() {
-  console.log(activeTitle)
+  const approvalStatus = menu.value.find(item => item.name === activeTitle.value)!.id
+  listQuery.value.approvalStatus = approvalStatus
   switch (activeTitle.value) {
     case '可打印':
-      listQuery.value.printNum = 0
+      listQuery.value.printStatus = 0
       listQuery.value.approvalStatus = ''
       break
     case '全部':
-      listQuery.value.printNum = 0
+      listQuery.value.printStatus = 2
       listQuery.value.approvalStatus = ''
       break
     case '待审批':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '1'
+      listQuery.value.printStatus = 2
       break
     case '审批中':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '2'
+      listQuery.value.printStatus = 2
       break
     case '已通过':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '3'
+      listQuery.value.printStatus = 2
       break
     case '未通过':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '4'
+      listQuery.value.printStatus = 2
       break
   }
 }
 
 // 数据查询
 function fetchData(isNowPage = false) {
+  console.log(listQuery)
   filterQuery()
   loadingTable.value = true
   if (!isNowPage) {
@@ -146,15 +157,11 @@
   }
   // 模拟数据
   loadingTable.value = false
-  list.value = [
-    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '0', printStatusName: '未打印', certificateReportTypeName: '自检', approvalStatusName: '待审批', taskId: '100', id: '10' },
-    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '1', printStatusName: '已打印', certificateReportTypeName: '自检', approvalStatusName: '待审批', taskId: '1001', id: '101' },
-  ]
-  // getCertList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getCertList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -167,7 +174,12 @@
 }
 // 点击重置
 const clearList = () => {
+  const approvalStatus = menu.value.find(item => item.name === activeTitle.value)!.id
   listQuery.value = {
+    certificateClass: '',
+    certificateNo: '', // 证书编号
+    createUserId: 0,
+    printStatus: 0, // 可打印(证书可打印传0,全部传null)
     certificationReportCode: '', // 证书编号
     orderNo: '', // 委托书编号
     customerName: '', // 委托方名称
@@ -176,14 +188,18 @@
     certificateReportType: '', // 证书类型
     printNum: '', // 打印次数 -未打印和全部用
     approvalStatus: '', // 审批状态-审批查询用
-    orderId: '0', // 委托书id
+    orderId: '', // 委托书id
     reason: '', // 操作原因
-    sampleId: '0', // 样品id
+    sampleId: '', // 样品id
     status: '', // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
     formId: SCHEDULE.BUSINESS_CERT_PRINT,
     offset: 1,
     limit: 20,
   }
+  listQuery.value.approvalStatus = approvalStatus
+  if (activeTitle.value === '可打印' || activeTitle.value === '全部') {
+    listQuery.value.approvalStatus = ''
+  }
   fetchData(true)
 }
 // 点击详情
@@ -226,14 +242,14 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   if (list.value.length > 0) {
-    // const params = {
-    //   ...listQuery.value,
-    //   ids: checkoutList.value,
-    // }
-    // exportCert(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '证书打印列表.xlsx')
-    // })
+    const params = {
+      ...listQuery.value,
+      ids: checkoutList.value,
+    }
+    exportCert(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '证书打印列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
@@ -243,10 +259,9 @@
 
 // 打印
 const bindLabel = (row: ICerPrintList) => {
-  console.log(1)
-  row.printNum = 1
+  console.log(row)
   // 判断状态第一次可以直接打印,之后的打印需要审批
-  if (row.printNum == 1) {
+  if (row.printNum == 0) {
     ElMessageBox.confirm(
       '确定要打印吗？',
       '确认操作',
@@ -319,18 +334,9 @@
 
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
-    active.value = window.sessionStorage.getItem('buttonBoxActive')!
-  }
-  else {
-    active.value = menu.value.find(item => item.name === '可打印')!.id // 可打
-    activeTitle.value === '可打印'
-  }
+
   fetchData(true)
 })
-onUnmounted(() => {
-  window.sessionStorage.setItem('buttonBoxActive', '') // 清除
-})
 </script>
 
 <template>
@@ -342,7 +348,7 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.certificationReportCode"
+          v-model.trim="listQuery.certificateNo"
           placeholder="证书编号"
           class="short-input"
           clearable
@@ -373,7 +379,7 @@
         />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 120px;" clearable>
+        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 160px;" clearable>
           <el-option v-for="item in certificationClassList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
@@ -388,19 +394,19 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column v-if="listQuery.printNum === ''" label="审批状态" align="center" width="90px" prop="approvalStatusName" />
+          <el-table-column label="审批状态" align="center" width="90px" prop="approvalStatusName" />
           <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.printNum === 0 || (listQuery.approvalStatus === '3')" size="small" link type="primary" @click="bindLabel(row)">
+              <el-button v-if="activeTitle === '全部' || activeTitle === '可打印'" size="small" link type="primary" @click="bindLabel(row)">
                 打印
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'agree')">
+              <el-button v-if="activeTitle === '待审批'" size="small" type="primary" link @click="handleDistribute(row, 'agree')">
                 同意
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'refuse')">
+              <el-button v-if="activeTitle === '待审批'" size="small" type="primary" link @click="handleDistribute(row, 'refuse')">
                 拒绝
               </el-button>
             </template>
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 2f8f8a4..fa8e6b0 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -392,4 +392,7 @@
 
 <style lang="scss" scoped>
 // 样式
+.short-input {
+  width: 180px !important;
+}
 </style>
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 2e8e4a7..5d7fc0f 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,5 +1,5 @@
 <!-- 设备借用处理 -->
-<script lang="ts" setup name="borrowApply">
+<script lang="ts" setup name="BorrowHandle">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
@@ -44,7 +44,7 @@
   applyPersonName: '', // 申请人姓名
   startTime: '', // 领用开始日期
   endTime: '', // 领用结束日期
-  approvalStatus: '4', // 	审批状态
+  approvalStatus: '4', // 	审批状态 (已完成)
   processResult: '1' || active.value, // 	处置结果 (3个状态字典值)
   applyType: '2', // 申请类型 借用2
   createUser: '', // 创建人
@@ -373,7 +373,7 @@
     active.value = window.sessionStorage.getItem('buttonBoxActive')!
   }
   else {
-    active.value = menu.value.find(item => item.name === '待借用')!.id // 全部
+    active.value = menu.value.find(item => item.name === '待借用')!.id // 待借用
     activeTitle.value === '待借用'
   }
   nextTick(() => {
@@ -394,6 +394,7 @@
         <el-input
           v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
+          class="short-input"
           clearable
         />
       </search-item>
@@ -401,6 +402,7 @@
         <el-input
           v-model.trim="listQuery.applyName"
           placeholder="申请名称"
+          class="short-input"
           clearable
         />
       </search-item>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index aae69c7..a59267d 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,5 +1,5 @@
 <!-- 设备借用申请 -->
-<script lang="ts" setup name="borrowApply">
+<script lang="ts" setup name="BorrowApply">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
@@ -49,7 +49,7 @@
   applyPersonName: '', // 申请人姓名
   startTime: '', // 领用开始日期
   endTime: '', // 领用结束日期
-  approvalStatus: active.value, // 	审批状态
+  approvalStatus: active.value, // 	审批状态 1 2 3 对应待借用|已借用|已归还
   processResult: '', // 	处置结果
   applyType: '2', // 申请类型 借用2
   createUser: '', // 创建人
@@ -156,7 +156,7 @@
     applyPerson: '', // 申请人
     startTime: '', // 申请开始日期
     endTime: '', // 申请结束日期
-    approvalStatus: active.value, // 	审批状态
+    approvalStatus: active.value, // 	审批状态  // 	审批状态 1 2 3 对应待借用|已借用|已归还
     processResult: '', // 	处置结果
     applyType: '2', // 申请类型 借用2
     createUser: '', // 创建人
@@ -193,27 +193,8 @@
   })
 }
 
-onMounted(async () => {
-  await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
-    active.value = window.sessionStorage.getItem('buttonBoxActive')!
-  }
-  else {
-    active.value = menu.value.find(item => item.name === '全部')!.id // 全部
-    activeTitle.value === '全部'
-  }
-  nextTick(() => {
-    fetchData(true) // 获取表格数据
-    fetchDeptTreeList() // 获取使用部门
-    fetchUserList() // 获取人员列表
-  })
-})
 const $router = useRouter()
 
-onUnmounted(() => {
-  window.sessionStorage.setItem('buttonBoxActive', '') // 清除
-})
-
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
@@ -434,6 +415,21 @@
     }
   }
 }
+onMounted(async () => {
+  await getDict() // 获取字典-审批状态
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+    active.value = window.sessionStorage.getItem('buttonBoxActive')!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '全部')!.id // 全部
+    activeTitle.value === '全部'
+  }
+  nextTick(() => {
+    fetchData(true) // 获取表格数据
+    fetchDeptTreeList() // 获取使用部门
+    fetchUserList() // 获取人员列表
+  })
+})
 </script>
 
 <template>
@@ -446,6 +442,7 @@
         <el-input
           v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
+          class="short-input"
           clearable
         />
       </search-item>
@@ -453,6 +450,7 @@
         <el-input
           v-model.trim="listQuery.applyName"
           placeholder="申请名称"
+          class="short-input"
           clearable
         />
       </search-item>
@@ -506,7 +504,7 @@
           <el-table-column
             label="操作"
             align="center"
-            :width="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 70 : 200"
+            :width="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 140 : 200"
             fixed="right"
           >
             <template #default="{ row }">
@@ -557,6 +555,17 @@
               >
                 编辑
               </el-button>
+
+              <el-button
+                v-if="proxy.hasPerm('/device/borrow/borrowapply/update') && activeTitle === '未通过'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName.search('驳回') === -1 "
+                @click="handleEdit(row, '编辑', 'edit')"
+              >
+                编辑
+              </el-button>
               <el-button
                 v-if="proxy.hasPerm('/device/borrow/borrowapply/update') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
                 size="small"
diff --git a/src/views/device/borrow/components/approvalActionDialog.vue b/src/views/device/borrow/components/approvalActionDialog.vue
deleted file mode 100644
index 9375861..0000000
--- a/src/views/device/borrow/components/approvalActionDialog.vue
+++ /dev/null
@@ -1,109 +0,0 @@
-<!-- 审批操作弹窗 -->
-<script lang="ts" setup>
-import type { FormInstance, FormRules } from 'element-plus'
-import dayjs from 'dayjs'
-import useUserStore from '@/store/modules/user'
-const emits = defineEmits(['resetData'])
-const userInfo = useUserStore()
-const dialogVisibleApprove = ref(false)
-const form = reactive({
-  radio: '1',
-  certificateNo: '',
-  certificateName: '',
-  certificateCompany: '',
-  certificateDate: '',
-  validDate: '',
-})
-const ruleFormRef = ref<FormInstance>()
-const rules = reactive<FormRules>({
-})
-// 重置
-const resetData = () => {
-  form.certificateNo = ''
-  form.certificateName = ''
-  form.certificateCompany = ''
-  form.certificateDate = ''
-  form.validDate = ''
-}
-const approvetime = ref('') // 审批时间
-const initDialog = (row: any) => {
-  dialogVisibleApprove.value = true
-  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
-  form.radio = row.radio
-}
-defineExpose({ initDialog })
-
-// 点击保存
-const submitForm = async (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  await formEl.validate((valid, fields) => {
-    if (valid) {
-      dialogVisibleApprove.value = false
-      emits('resetData')
-    }
-  })
-}
-// 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  formEl.resetFields()
-  dialogVisibleApprove.value = false
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
-    <el-form
-      ref="ruleFormRef" :model="form"
-      :rules="rules" label-width="110px"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见">
-            <el-radio-group v-model="form.radio" style="width: 100%;">
-              <el-radio label="1">
-                同意
-              </el-radio>
-              <el-radio label="2">
-                拒绝
-              </el-radio>
-              <el-radio label="3">
-                驳回
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论">
-            <el-input
-              :rows="4"
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人">
-            <el-input disabled :value="userInfo.$state.name" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间">
-            <el-input disabled :value="approvetime" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
-        <el-button @click="resetForm(ruleFormRef)">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/device/borrow/editHandle.vue b/src/views/device/borrow/editHandle.vue
index d2e423c..9a5b2a6 100644
--- a/src/views/device/borrow/editHandle.vue
+++ b/src/views/device/borrow/editHandle.vue
@@ -1,4 +1,5 @@
-<script lang="ts" setup name="Detail">
+<!-- 设备借用处理详情/编辑 -->
+<script lang="ts" setup name="EditHandle">
 import { onMounted, ref } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { ElLoading } from 'element-plus'
@@ -17,7 +18,6 @@
 const { proxy } = getCurrentInstance() as any
 const useDeptList = ref<deptType[]>([]) // 部门列表
 const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
-const total = ref(20)// 总数
 // 表单数据
 const form = ref({
   id: '',
@@ -29,19 +29,7 @@
   applyDesc: '', // 申请说明
 })
 const list = ref<IdeviceList[]>([])// 表格数据
-// 查询条件
-const listQuery: Ref<IdeviceListQuery> = ref({
-  equipmentName: '', // 仪器名称
-  equipmentNo: '', // 设备编号
-  modelNo: '', // 型号
-  mesureRange: '', // 测量范围
-  useDeptName: '', // 使用部门
-  usePersonName: '', // 使用人
-  managerStateName: '', // 管理状态
-  validDate: '', // 有效日期
-  offset: 1,
-  limit: 20,
-})
+
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '设备编号', value: 'equipmentNo', align: 'center', width: '230' },
@@ -82,11 +70,11 @@
   $router.back()
 }
 
-// 打印
+// 设备借用处理详情打印
 const printObj = ref({
   id: 'lysq', // 需要打印元素的id
   popTitle: '设备借用处理', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备借用处理</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备借用处理详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
@@ -125,7 +113,7 @@
   <app-container>
     <detail-page title="设备借用处理-详情">
       <template #btns>
-        <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/device/borrow/borrowhandle/print')" v-print="printObj" type="primary">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -225,22 +213,6 @@
     background-color: #fff;
     // padding: 10px;
 
-    .title-button {
-      display: flex;
-      align-items: center;
-
-      &::before {
-        content: "";
-        flex: 1;
-      }
-
-      .button-group {
-        flex: 1;
-        display: flex;
-        justify-content: flex-end;
-      }
-    }
-
     .form-area {
       margin-top: 40px;
     }
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index b76ab3e..18879cc 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -352,6 +352,7 @@
   formInline.value.acceptanceCheckId = object.id
   checkIdObject.value = object
   // 获取到详情
+
   equipmentApplyInfo({ id: object.id }).then((res) => {
     res.data.equipmentInfoList.map((item: objectReturn) => {
       if (item.id) {
@@ -492,11 +493,11 @@
         <el-row :gutter="20" class="marg">
           <el-col :span="14">
             <el-form-item label="附件:">
-              <show-photo v-if="formInline.fileList[0].minioFileName" :minio-file-name="formInline.fileList[0].minioFileName" />
+              <show-photo v-if="formInline.fileList" :minio-file-name="formInline.fileList.length && formInline.fileList[0].minioFileName ? formInline.fileList[0].minioFileName : ''" />
               <span v-else-if="pageType === 'detail'">无</span>
               <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.fileList[0].minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                {{ formInline.fileList[0].minioFileName === '' ? '上传' : '更换附件' }}
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.fileList.length && formInline.fileList[0].minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.fileList.length && formInline.fileList[0].minioFileName ? '上传' : '更换附件' }}
               </el-button>
             </el-form-item>
           </el-col>
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 73b9c0b..b21f663 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -543,6 +543,20 @@
 const addId = ref('')
 // 点击顶部一排按钮
 const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  // 添加校验条件
+  if (fromListInfo.value.fixedAssetsList) {
+    if (!fromListInfo.value.fixedAssetsList[0]?.id) {
+      ElMessage.warning('标准配套设备更换不能为空!')
+      return
+    }
+  }
+  if (fromListInfo.value.fileList) {
+    if (!fromListInfo.value.fileList[0]?.fileName) {
+      ElMessage.warning('申请文档不能为空!')
+      return
+    }
+  }
+
   if (item === '保存' && pageType.value === 'add') {
     if (!formEl) {
       return
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 0f8a9d5..3452009 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -148,7 +148,7 @@
     ABCList.value = response.data
   })
   // 获取检定方式
-  getDictByCode('mesureType').then((response) => {
+  getDictByCode('measureType').then((response) => {
     mesureTypeList.value = response.data
   })
   // 获取专业分类
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index e261313..0c76e05 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -116,7 +116,7 @@
     }
   })
   // 获取检定方式
-  getDictByCode('mesureType').then((response) => {
+  getDictByCode('measureType').then((response) => {
     mesureTypeList.value = response.data
   })
   // 获取管理状态
@@ -199,8 +199,15 @@
 }
 // 重置
 const reset = () => {
-  // searchQuery.fileNo = ''
   validDate.value = ''
+  searchQuery.equipmentNo = '' // 设备编号
+  searchQuery.equipmentName = ''
+  searchQuery.mesureType = ''
+  searchQuery.managerState = ''
+  searchQuery.useDept = ''
+  searchQuery.validStartDate = ''
+  searchQuery.validEndDate = ''
+  searchQuery.abc = ''
   getList()
 }
 // 模板下载
@@ -347,7 +354,7 @@
           <el-date-picker
             v-model="validDate"
             type="daterange"
-            format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+            format="YYYY-MM-DD" value-format="YYYY-MM-DD"
             range-separator="至"
             start-placeholder="有效开始日期"
             end-placeholder="有效结束日期"

diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index dbce999..5bd4111 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -45,6 +45,15 @@
     data,
   })
 }
+
+// 设备借用驳回后编辑
+export function failUpdate(data: object) {
+  return request({
+    url: '/equipmentApply/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 // 设备借用申请删除
 export function deleteApply(data: object) {
   return request({
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 9049282..7f9431b 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -1,6 +1,6 @@
 // 状态管理相关接口api
 import request from '../index'
-import type { ISearchQuery, ITableRow, Iapprove } from '@/views/device/stateManage/components/status-interface.ts'
+import type { ISearchQuery, Iapprove } from '@/views/device/stateManage/components/status-interface'
 
 // 设备申请列表
 export function getStatusList(data: ISearchQuery) {
@@ -11,7 +11,7 @@
   })
 }
 // 状态管理新建
-export function addStatus(data: ITableRow) {
+export function addStatus(data: Object) {
   return request({
     url: '/meter/stateManage/addStateManageInfo',
     method: 'post',
@@ -20,7 +20,7 @@
 }
 
 // 状态管理编辑
-export function updateStatus(data: ITableRow) {
+export function updateStatus(data: Object) {
   return request({
     url: '/meter/stateManage/updateStateManageInfo',
     method: 'post',
@@ -53,7 +53,7 @@
   })
 }
 // 状态管理详情
-export function detailStatus(data: ITableRow) {
+export function detailStatus(data: object) {
   return request({
     url: '/meter/stateManage/selectStateManageInfo',
     method: 'post',
diff --git a/src/components/SearchArea/SearchItem.vue b/src/components/SearchArea/SearchItem.vue
index 3adef93..dc53b08 100644
--- a/src/components/SearchArea/SearchItem.vue
+++ b/src/components/SearchArea/SearchItem.vue
@@ -23,7 +23,6 @@
   display: inline-block;
   margin-bottom: 10px;
   vertical-align: top;
-  box-sizing: inherit;
   margin-right: 5px;
 }
 
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index 12d7290..e3c72af 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -1,5 +1,9 @@
 // 证书打印查询
 export interface ICertPrintSearch {
+  certificateClass: string
+  certificateNo: string
+  createUserId: number
+  printStatus: number | null
   certificationReportCode: string // 证书编号
   orderNo: string // 委托书编号
   customerName: string // 委托方名称
@@ -13,7 +17,7 @@
   reason: string // 操作原因
   sampleId: string // 样品id
   status: string // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
-  ids?: []
+  ids?: [] | null
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 3daa2b5..391931b 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -22,6 +22,10 @@
 const activeTitle = ref('') // active对应的审批状态名字
 // 查询条件
 const listQuery = ref<ICertPrintSearch>({
+  certificateClass: '',
+  certificateNo: '', // 证书编号
+  createUserId: 0,
+  printStatus: 0, // 可打印(证书可打印传0,全部传null)
   certificationReportCode: '', // 证书编号
   orderNo: '', // 委托书编号
   customerName: '', // 委托方名称
@@ -30,11 +34,12 @@
   certificateReportType: '', // 证书类型
   printNum: '', // 打印次数 -未打印和全部用
   approvalStatus: '', // 审批状态-审批查询用
-  orderId: '0', // 委托书id
+  orderId: '', // 委托书id
   reason: '', // 操作原因
-  sampleId: '0', // 样品id
+  sampleId: '', // 样品id
   status: '', // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
   formId: SCHEDULE.BUSINESS_CERT_PRINT,
+  ids: null, // 设置默认值
   offset: 1,
   limit: 20,
 })
@@ -78,22 +83,30 @@
         }
       }
     })
+    if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+      active.value = window.sessionStorage.getItem('buttonBoxActive')!
+      activeTitle.value === '未通过'
+    }
+    else {
+      active.value = menu.value.find(item => item.name === '可打印')!.id // 可打印
+      activeTitle.value === '可打印'
+    }
   })
 }
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationReportCode', width: '110', align: 'center' },
-  { text: '证书名称', value: 'certificationReportName', width: '120', align: 'center' },
+  { text: '证书编号', value: 'certificateNo', width: '110', align: 'center' },
+  { text: '证书名称', value: 'certificateName', width: '120', align: 'center' },
   { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', width: '120', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', width: '120', align: 'center' },
   { text: '委托书编号', value: 'orderNo', width: '120', align: 'center' },
-  { text: '检校类别', value: 'customerNo', width: '120', align: 'center' },
-  { text: '检定人员', value: 'customerName', width: '120', align: 'center' },
-  { text: '证书类型', value: 'certificateReportTypeName', width: '120', align: 'center' },
-  { text: '打印状态', value: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
+  { text: '检校类别', value: 'measureType', width: '120', align: 'center' },
+  { text: '检定人员', value: 'measurePersonId', width: '120', align: 'center' },
+  { text: '证书类型', value: 'certificateType', width: '120', align: 'center' },
+  { text: '打印状态', value: 'printNum', align: 'center', width: '85px', filter: (row: ICerPrintList) => { var cnum = ['未打印', '一', '二', '三', '四', '五', '六', '七', '八', '九', '十']; return row.printNum == 0 ? '未打印' : `${cnum[parseInt(row.printNum)]}次打印` } },
   { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
 ])
 // 表格数据
@@ -107,37 +120,35 @@
 
 // 根据过滤查询条件
 function filterQuery() {
-  console.log(activeTitle)
+  const approvalStatus = menu.value.find(item => item.name === activeTitle.value)!.id
+  listQuery.value.approvalStatus = approvalStatus
   switch (activeTitle.value) {
     case '可打印':
-      listQuery.value.printNum = 0
+      listQuery.value.printStatus = 0
       listQuery.value.approvalStatus = ''
       break
     case '全部':
-      listQuery.value.printNum = 0
+      listQuery.value.printStatus = 2
       listQuery.value.approvalStatus = ''
       break
     case '待审批':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '1'
+      listQuery.value.printStatus = 2
       break
     case '审批中':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '2'
+      listQuery.value.printStatus = 2
       break
     case '已通过':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '3'
+      listQuery.value.printStatus = 2
       break
     case '未通过':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '4'
+      listQuery.value.printStatus = 2
       break
   }
 }
 
 // 数据查询
 function fetchData(isNowPage = false) {
+  console.log(listQuery)
   filterQuery()
   loadingTable.value = true
   if (!isNowPage) {
@@ -146,15 +157,11 @@
   }
   // 模拟数据
   loadingTable.value = false
-  list.value = [
-    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '0', printStatusName: '未打印', certificateReportTypeName: '自检', approvalStatusName: '待审批', taskId: '100', id: '10' },
-    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '1', printStatusName: '已打印', certificateReportTypeName: '自检', approvalStatusName: '待审批', taskId: '1001', id: '101' },
-  ]
-  // getCertList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getCertList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -167,7 +174,12 @@
 }
 // 点击重置
 const clearList = () => {
+  const approvalStatus = menu.value.find(item => item.name === activeTitle.value)!.id
   listQuery.value = {
+    certificateClass: '',
+    certificateNo: '', // 证书编号
+    createUserId: 0,
+    printStatus: 0, // 可打印(证书可打印传0,全部传null)
     certificationReportCode: '', // 证书编号
     orderNo: '', // 委托书编号
     customerName: '', // 委托方名称
@@ -176,14 +188,18 @@
     certificateReportType: '', // 证书类型
     printNum: '', // 打印次数 -未打印和全部用
     approvalStatus: '', // 审批状态-审批查询用
-    orderId: '0', // 委托书id
+    orderId: '', // 委托书id
     reason: '', // 操作原因
-    sampleId: '0', // 样品id
+    sampleId: '', // 样品id
     status: '', // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
     formId: SCHEDULE.BUSINESS_CERT_PRINT,
     offset: 1,
     limit: 20,
   }
+  listQuery.value.approvalStatus = approvalStatus
+  if (activeTitle.value === '可打印' || activeTitle.value === '全部') {
+    listQuery.value.approvalStatus = ''
+  }
   fetchData(true)
 }
 // 点击详情
@@ -226,14 +242,14 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   if (list.value.length > 0) {
-    // const params = {
-    //   ...listQuery.value,
-    //   ids: checkoutList.value,
-    // }
-    // exportCert(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '证书打印列表.xlsx')
-    // })
+    const params = {
+      ...listQuery.value,
+      ids: checkoutList.value,
+    }
+    exportCert(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '证书打印列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
@@ -243,10 +259,9 @@
 
 // 打印
 const bindLabel = (row: ICerPrintList) => {
-  console.log(1)
-  row.printNum = 1
+  console.log(row)
   // 判断状态第一次可以直接打印,之后的打印需要审批
-  if (row.printNum == 1) {
+  if (row.printNum == 0) {
     ElMessageBox.confirm(
       '确定要打印吗？',
       '确认操作',
@@ -319,18 +334,9 @@
 
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
-    active.value = window.sessionStorage.getItem('buttonBoxActive')!
-  }
-  else {
-    active.value = menu.value.find(item => item.name === '可打印')!.id // 可打
-    activeTitle.value === '可打印'
-  }
+
   fetchData(true)
 })
-onUnmounted(() => {
-  window.sessionStorage.setItem('buttonBoxActive', '') // 清除
-})
 </script>
 
 <template>
@@ -342,7 +348,7 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.certificationReportCode"
+          v-model.trim="listQuery.certificateNo"
           placeholder="证书编号"
           class="short-input"
           clearable
@@ -373,7 +379,7 @@
         />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 120px;" clearable>
+        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 160px;" clearable>
           <el-option v-for="item in certificationClassList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
@@ -388,19 +394,19 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column v-if="listQuery.printNum === ''" label="审批状态" align="center" width="90px" prop="approvalStatusName" />
+          <el-table-column label="审批状态" align="center" width="90px" prop="approvalStatusName" />
           <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.printNum === 0 || (listQuery.approvalStatus === '3')" size="small" link type="primary" @click="bindLabel(row)">
+              <el-button v-if="activeTitle === '全部' || activeTitle === '可打印'" size="small" link type="primary" @click="bindLabel(row)">
                 打印
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'agree')">
+              <el-button v-if="activeTitle === '待审批'" size="small" type="primary" link @click="handleDistribute(row, 'agree')">
                 同意
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'refuse')">
+              <el-button v-if="activeTitle === '待审批'" size="small" type="primary" link @click="handleDistribute(row, 'refuse')">
                 拒绝
               </el-button>
             </template>
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 2f8f8a4..fa8e6b0 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -392,4 +392,7 @@
 
 <style lang="scss" scoped>
 // 样式
+.short-input {
+  width: 180px !important;
+}
 </style>
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 2e8e4a7..5d7fc0f 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,5 +1,5 @@
 <!-- 设备借用处理 -->
-<script lang="ts" setup name="borrowApply">
+<script lang="ts" setup name="BorrowHandle">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
@@ -44,7 +44,7 @@
   applyPersonName: '', // 申请人姓名
   startTime: '', // 领用开始日期
   endTime: '', // 领用结束日期
-  approvalStatus: '4', // 	审批状态
+  approvalStatus: '4', // 	审批状态 (已完成)
   processResult: '1' || active.value, // 	处置结果 (3个状态字典值)
   applyType: '2', // 申请类型 借用2
   createUser: '', // 创建人
@@ -373,7 +373,7 @@
     active.value = window.sessionStorage.getItem('buttonBoxActive')!
   }
   else {
-    active.value = menu.value.find(item => item.name === '待借用')!.id // 全部
+    active.value = menu.value.find(item => item.name === '待借用')!.id // 待借用
     activeTitle.value === '待借用'
   }
   nextTick(() => {
@@ -394,6 +394,7 @@
         <el-input
           v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
+          class="short-input"
           clearable
         />
       </search-item>
@@ -401,6 +402,7 @@
         <el-input
           v-model.trim="listQuery.applyName"
           placeholder="申请名称"
+          class="short-input"
           clearable
         />
       </search-item>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index aae69c7..a59267d 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,5 +1,5 @@
 <!-- 设备借用申请 -->
-<script lang="ts" setup name="borrowApply">
+<script lang="ts" setup name="BorrowApply">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
@@ -49,7 +49,7 @@
   applyPersonName: '', // 申请人姓名
   startTime: '', // 领用开始日期
   endTime: '', // 领用结束日期
-  approvalStatus: active.value, // 	审批状态
+  approvalStatus: active.value, // 	审批状态 1 2 3 对应待借用|已借用|已归还
   processResult: '', // 	处置结果
   applyType: '2', // 申请类型 借用2
   createUser: '', // 创建人
@@ -156,7 +156,7 @@
     applyPerson: '', // 申请人
     startTime: '', // 申请开始日期
     endTime: '', // 申请结束日期
-    approvalStatus: active.value, // 	审批状态
+    approvalStatus: active.value, // 	审批状态  // 	审批状态 1 2 3 对应待借用|已借用|已归还
     processResult: '', // 	处置结果
     applyType: '2', // 申请类型 借用2
     createUser: '', // 创建人
@@ -193,27 +193,8 @@
   })
 }
 
-onMounted(async () => {
-  await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
-    active.value = window.sessionStorage.getItem('buttonBoxActive')!
-  }
-  else {
-    active.value = menu.value.find(item => item.name === '全部')!.id // 全部
-    activeTitle.value === '全部'
-  }
-  nextTick(() => {
-    fetchData(true) // 获取表格数据
-    fetchDeptTreeList() // 获取使用部门
-    fetchUserList() // 获取人员列表
-  })
-})
 const $router = useRouter()
 
-onUnmounted(() => {
-  window.sessionStorage.setItem('buttonBoxActive', '') // 清除
-})
-
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
@@ -434,6 +415,21 @@
     }
   }
 }
+onMounted(async () => {
+  await getDict() // 获取字典-审批状态
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+    active.value = window.sessionStorage.getItem('buttonBoxActive')!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '全部')!.id // 全部
+    activeTitle.value === '全部'
+  }
+  nextTick(() => {
+    fetchData(true) // 获取表格数据
+    fetchDeptTreeList() // 获取使用部门
+    fetchUserList() // 获取人员列表
+  })
+})
 </script>
 
 <template>
@@ -446,6 +442,7 @@
         <el-input
           v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
+          class="short-input"
           clearable
         />
       </search-item>
@@ -453,6 +450,7 @@
         <el-input
           v-model.trim="listQuery.applyName"
           placeholder="申请名称"
+          class="short-input"
           clearable
         />
       </search-item>
@@ -506,7 +504,7 @@
           <el-table-column
             label="操作"
             align="center"
-            :width="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 70 : 200"
+            :width="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 140 : 200"
             fixed="right"
           >
             <template #default="{ row }">
@@ -557,6 +555,17 @@
               >
                 编辑
               </el-button>
+
+              <el-button
+                v-if="proxy.hasPerm('/device/borrow/borrowapply/update') && activeTitle === '未通过'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName.search('驳回') === -1 "
+                @click="handleEdit(row, '编辑', 'edit')"
+              >
+                编辑
+              </el-button>
               <el-button
                 v-if="proxy.hasPerm('/device/borrow/borrowapply/update') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
                 size="small"
diff --git a/src/views/device/borrow/components/approvalActionDialog.vue b/src/views/device/borrow/components/approvalActionDialog.vue
deleted file mode 100644
index 9375861..0000000
--- a/src/views/device/borrow/components/approvalActionDialog.vue
+++ /dev/null
@@ -1,109 +0,0 @@
-<!-- 审批操作弹窗 -->
-<script lang="ts" setup>
-import type { FormInstance, FormRules } from 'element-plus'
-import dayjs from 'dayjs'
-import useUserStore from '@/store/modules/user'
-const emits = defineEmits(['resetData'])
-const userInfo = useUserStore()
-const dialogVisibleApprove = ref(false)
-const form = reactive({
-  radio: '1',
-  certificateNo: '',
-  certificateName: '',
-  certificateCompany: '',
-  certificateDate: '',
-  validDate: '',
-})
-const ruleFormRef = ref<FormInstance>()
-const rules = reactive<FormRules>({
-})
-// 重置
-const resetData = () => {
-  form.certificateNo = ''
-  form.certificateName = ''
-  form.certificateCompany = ''
-  form.certificateDate = ''
-  form.validDate = ''
-}
-const approvetime = ref('') // 审批时间
-const initDialog = (row: any) => {
-  dialogVisibleApprove.value = true
-  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
-  form.radio = row.radio
-}
-defineExpose({ initDialog })
-
-// 点击保存
-const submitForm = async (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  await formEl.validate((valid, fields) => {
-    if (valid) {
-      dialogVisibleApprove.value = false
-      emits('resetData')
-    }
-  })
-}
-// 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  formEl.resetFields()
-  dialogVisibleApprove.value = false
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
-    <el-form
-      ref="ruleFormRef" :model="form"
-      :rules="rules" label-width="110px"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见">
-            <el-radio-group v-model="form.radio" style="width: 100%;">
-              <el-radio label="1">
-                同意
-              </el-radio>
-              <el-radio label="2">
-                拒绝
-              </el-radio>
-              <el-radio label="3">
-                驳回
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论">
-            <el-input
-              :rows="4"
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人">
-            <el-input disabled :value="userInfo.$state.name" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间">
-            <el-input disabled :value="approvetime" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
-        <el-button @click="resetForm(ruleFormRef)">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/device/borrow/editHandle.vue b/src/views/device/borrow/editHandle.vue
index d2e423c..9a5b2a6 100644
--- a/src/views/device/borrow/editHandle.vue
+++ b/src/views/device/borrow/editHandle.vue
@@ -1,4 +1,5 @@
-<script lang="ts" setup name="Detail">
+<!-- 设备借用处理详情/编辑 -->
+<script lang="ts" setup name="EditHandle">
 import { onMounted, ref } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { ElLoading } from 'element-plus'
@@ -17,7 +18,6 @@
 const { proxy } = getCurrentInstance() as any
 const useDeptList = ref<deptType[]>([]) // 部门列表
 const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
-const total = ref(20)// 总数
 // 表单数据
 const form = ref({
   id: '',
@@ -29,19 +29,7 @@
   applyDesc: '', // 申请说明
 })
 const list = ref<IdeviceList[]>([])// 表格数据
-// 查询条件
-const listQuery: Ref<IdeviceListQuery> = ref({
-  equipmentName: '', // 仪器名称
-  equipmentNo: '', // 设备编号
-  modelNo: '', // 型号
-  mesureRange: '', // 测量范围
-  useDeptName: '', // 使用部门
-  usePersonName: '', // 使用人
-  managerStateName: '', // 管理状态
-  validDate: '', // 有效日期
-  offset: 1,
-  limit: 20,
-})
+
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '设备编号', value: 'equipmentNo', align: 'center', width: '230' },
@@ -82,11 +70,11 @@
   $router.back()
 }
 
-// 打印
+// 设备借用处理详情打印
 const printObj = ref({
   id: 'lysq', // 需要打印元素的id
   popTitle: '设备借用处理', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备借用处理</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备借用处理详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
@@ -125,7 +113,7 @@
   <app-container>
     <detail-page title="设备借用处理-详情">
       <template #btns>
-        <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/device/borrow/borrowhandle/print')" v-print="printObj" type="primary">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -225,22 +213,6 @@
     background-color: #fff;
     // padding: 10px;
 
-    .title-button {
-      display: flex;
-      align-items: center;
-
-      &::before {
-        content: "";
-        flex: 1;
-      }
-
-      .button-group {
-        flex: 1;
-        display: flex;
-        justify-content: flex-end;
-      }
-    }
-
     .form-area {
       margin-top: 40px;
     }
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index b76ab3e..18879cc 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -352,6 +352,7 @@
   formInline.value.acceptanceCheckId = object.id
   checkIdObject.value = object
   // 获取到详情
+
   equipmentApplyInfo({ id: object.id }).then((res) => {
     res.data.equipmentInfoList.map((item: objectReturn) => {
       if (item.id) {
@@ -492,11 +493,11 @@
         <el-row :gutter="20" class="marg">
           <el-col :span="14">
             <el-form-item label="附件:">
-              <show-photo v-if="formInline.fileList[0].minioFileName" :minio-file-name="formInline.fileList[0].minioFileName" />
+              <show-photo v-if="formInline.fileList" :minio-file-name="formInline.fileList.length && formInline.fileList[0].minioFileName ? formInline.fileList[0].minioFileName : ''" />
               <span v-else-if="pageType === 'detail'">无</span>
               <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.fileList[0].minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                {{ formInline.fileList[0].minioFileName === '' ? '上传' : '更换附件' }}
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.fileList.length && formInline.fileList[0].minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.fileList.length && formInline.fileList[0].minioFileName ? '上传' : '更换附件' }}
               </el-button>
             </el-form-item>
           </el-col>
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 73b9c0b..b21f663 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -543,6 +543,20 @@
 const addId = ref('')
 // 点击顶部一排按钮
 const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  // 添加校验条件
+  if (fromListInfo.value.fixedAssetsList) {
+    if (!fromListInfo.value.fixedAssetsList[0]?.id) {
+      ElMessage.warning('标准配套设备更换不能为空!')
+      return
+    }
+  }
+  if (fromListInfo.value.fileList) {
+    if (!fromListInfo.value.fileList[0]?.fileName) {
+      ElMessage.warning('申请文档不能为空!')
+      return
+    }
+  }
+
   if (item === '保存' && pageType.value === 'add') {
     if (!formEl) {
       return
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 0f8a9d5..3452009 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -148,7 +148,7 @@
     ABCList.value = response.data
   })
   // 获取检定方式
-  getDictByCode('mesureType').then((response) => {
+  getDictByCode('measureType').then((response) => {
     mesureTypeList.value = response.data
   })
   // 获取专业分类
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index e261313..0c76e05 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -116,7 +116,7 @@
     }
   })
   // 获取检定方式
-  getDictByCode('mesureType').then((response) => {
+  getDictByCode('measureType').then((response) => {
     mesureTypeList.value = response.data
   })
   // 获取管理状态
@@ -199,8 +199,15 @@
 }
 // 重置
 const reset = () => {
-  // searchQuery.fileNo = ''
   validDate.value = ''
+  searchQuery.equipmentNo = '' // 设备编号
+  searchQuery.equipmentName = ''
+  searchQuery.mesureType = ''
+  searchQuery.managerState = ''
+  searchQuery.useDept = ''
+  searchQuery.validStartDate = ''
+  searchQuery.validEndDate = ''
+  searchQuery.abc = ''
   getList()
 }
 // 模板下载
@@ -347,7 +354,7 @@
           <el-date-picker
             v-model="validDate"
             type="daterange"
-            format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+            format="YYYY-MM-DD" value-format="YYYY-MM-DD"
             range-separator="至"
             start-placeholder="有效开始日期"
             end-placeholder="有效结束日期"
diff --git a/src/views/device/stateManage/components/status-interface.ts b/src/views/device/stateManage/components/status-interface.ts
index caa43b1..93410a7 100644
--- a/src/views/device/stateManage/components/status-interface.ts
+++ b/src/views/device/stateManage/components/status-interface.ts
@@ -29,7 +29,7 @@
   equipmentName: string // 设备名称
   equipmentNo: string // 设备编号
   fileList: string // 文件列表
-  id: number // 主键id
+  id: number | string // 主键id
   isDel: number // 删除标记
   managerState: string //  管理状态
   managerStateName: string // 管理状态名称

diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index dbce999..5bd4111 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -45,6 +45,15 @@
     data,
   })
 }
+
+// 设备借用驳回后编辑
+export function failUpdate(data: object) {
+  return request({
+    url: '/equipmentApply/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 // 设备借用申请删除
 export function deleteApply(data: object) {
   return request({
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 9049282..7f9431b 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -1,6 +1,6 @@
 // 状态管理相关接口api
 import request from '../index'
-import type { ISearchQuery, ITableRow, Iapprove } from '@/views/device/stateManage/components/status-interface.ts'
+import type { ISearchQuery, Iapprove } from '@/views/device/stateManage/components/status-interface'
 
 // 设备申请列表
 export function getStatusList(data: ISearchQuery) {
@@ -11,7 +11,7 @@
   })
 }
 // 状态管理新建
-export function addStatus(data: ITableRow) {
+export function addStatus(data: Object) {
   return request({
     url: '/meter/stateManage/addStateManageInfo',
     method: 'post',
@@ -20,7 +20,7 @@
 }
 
 // 状态管理编辑
-export function updateStatus(data: ITableRow) {
+export function updateStatus(data: Object) {
   return request({
     url: '/meter/stateManage/updateStateManageInfo',
     method: 'post',
@@ -53,7 +53,7 @@
   })
 }
 // 状态管理详情
-export function detailStatus(data: ITableRow) {
+export function detailStatus(data: object) {
   return request({
     url: '/meter/stateManage/selectStateManageInfo',
     method: 'post',
diff --git a/src/components/SearchArea/SearchItem.vue b/src/components/SearchArea/SearchItem.vue
index 3adef93..dc53b08 100644
--- a/src/components/SearchArea/SearchItem.vue
+++ b/src/components/SearchArea/SearchItem.vue
@@ -23,7 +23,6 @@
   display: inline-block;
   margin-bottom: 10px;
   vertical-align: top;
-  box-sizing: inherit;
   margin-right: 5px;
 }
 
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index 12d7290..e3c72af 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -1,5 +1,9 @@
 // 证书打印查询
 export interface ICertPrintSearch {
+  certificateClass: string
+  certificateNo: string
+  createUserId: number
+  printStatus: number | null
   certificationReportCode: string // 证书编号
   orderNo: string // 委托书编号
   customerName: string // 委托方名称
@@ -13,7 +17,7 @@
   reason: string // 操作原因
   sampleId: string // 样品id
   status: string // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
-  ids?: []
+  ids?: [] | null
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 3daa2b5..391931b 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -22,6 +22,10 @@
 const activeTitle = ref('') // active对应的审批状态名字
 // 查询条件
 const listQuery = ref<ICertPrintSearch>({
+  certificateClass: '',
+  certificateNo: '', // 证书编号
+  createUserId: 0,
+  printStatus: 0, // 可打印(证书可打印传0,全部传null)
   certificationReportCode: '', // 证书编号
   orderNo: '', // 委托书编号
   customerName: '', // 委托方名称
@@ -30,11 +34,12 @@
   certificateReportType: '', // 证书类型
   printNum: '', // 打印次数 -未打印和全部用
   approvalStatus: '', // 审批状态-审批查询用
-  orderId: '0', // 委托书id
+  orderId: '', // 委托书id
   reason: '', // 操作原因
-  sampleId: '0', // 样品id
+  sampleId: '', // 样品id
   status: '', // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
   formId: SCHEDULE.BUSINESS_CERT_PRINT,
+  ids: null, // 设置默认值
   offset: 1,
   limit: 20,
 })
@@ -78,22 +83,30 @@
         }
       }
     })
+    if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+      active.value = window.sessionStorage.getItem('buttonBoxActive')!
+      activeTitle.value === '未通过'
+    }
+    else {
+      active.value = menu.value.find(item => item.name === '可打印')!.id // 可打印
+      activeTitle.value === '可打印'
+    }
   })
 }
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationReportCode', width: '110', align: 'center' },
-  { text: '证书名称', value: 'certificationReportName', width: '120', align: 'center' },
+  { text: '证书编号', value: 'certificateNo', width: '110', align: 'center' },
+  { text: '证书名称', value: 'certificateName', width: '120', align: 'center' },
   { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', width: '120', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', width: '120', align: 'center' },
   { text: '委托书编号', value: 'orderNo', width: '120', align: 'center' },
-  { text: '检校类别', value: 'customerNo', width: '120', align: 'center' },
-  { text: '检定人员', value: 'customerName', width: '120', align: 'center' },
-  { text: '证书类型', value: 'certificateReportTypeName', width: '120', align: 'center' },
-  { text: '打印状态', value: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
+  { text: '检校类别', value: 'measureType', width: '120', align: 'center' },
+  { text: '检定人员', value: 'measurePersonId', width: '120', align: 'center' },
+  { text: '证书类型', value: 'certificateType', width: '120', align: 'center' },
+  { text: '打印状态', value: 'printNum', align: 'center', width: '85px', filter: (row: ICerPrintList) => { var cnum = ['未打印', '一', '二', '三', '四', '五', '六', '七', '八', '九', '十']; return row.printNum == 0 ? '未打印' : `${cnum[parseInt(row.printNum)]}次打印` } },
   { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
 ])
 // 表格数据
@@ -107,37 +120,35 @@
 
 // 根据过滤查询条件
 function filterQuery() {
-  console.log(activeTitle)
+  const approvalStatus = menu.value.find(item => item.name === activeTitle.value)!.id
+  listQuery.value.approvalStatus = approvalStatus
   switch (activeTitle.value) {
     case '可打印':
-      listQuery.value.printNum = 0
+      listQuery.value.printStatus = 0
       listQuery.value.approvalStatus = ''
       break
     case '全部':
-      listQuery.value.printNum = 0
+      listQuery.value.printStatus = 2
       listQuery.value.approvalStatus = ''
       break
     case '待审批':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '1'
+      listQuery.value.printStatus = 2
       break
     case '审批中':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '2'
+      listQuery.value.printStatus = 2
       break
     case '已通过':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '3'
+      listQuery.value.printStatus = 2
       break
     case '未通过':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '4'
+      listQuery.value.printStatus = 2
       break
   }
 }
 
 // 数据查询
 function fetchData(isNowPage = false) {
+  console.log(listQuery)
   filterQuery()
   loadingTable.value = true
   if (!isNowPage) {
@@ -146,15 +157,11 @@
   }
   // 模拟数据
   loadingTable.value = false
-  list.value = [
-    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '0', printStatusName: '未打印', certificateReportTypeName: '自检', approvalStatusName: '待审批', taskId: '100', id: '10' },
-    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '1', printStatusName: '已打印', certificateReportTypeName: '自检', approvalStatusName: '待审批', taskId: '1001', id: '101' },
-  ]
-  // getCertList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getCertList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -167,7 +174,12 @@
 }
 // 点击重置
 const clearList = () => {
+  const approvalStatus = menu.value.find(item => item.name === activeTitle.value)!.id
   listQuery.value = {
+    certificateClass: '',
+    certificateNo: '', // 证书编号
+    createUserId: 0,
+    printStatus: 0, // 可打印(证书可打印传0,全部传null)
     certificationReportCode: '', // 证书编号
     orderNo: '', // 委托书编号
     customerName: '', // 委托方名称
@@ -176,14 +188,18 @@
     certificateReportType: '', // 证书类型
     printNum: '', // 打印次数 -未打印和全部用
     approvalStatus: '', // 审批状态-审批查询用
-    orderId: '0', // 委托书id
+    orderId: '', // 委托书id
     reason: '', // 操作原因
-    sampleId: '0', // 样品id
+    sampleId: '', // 样品id
     status: '', // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
     formId: SCHEDULE.BUSINESS_CERT_PRINT,
     offset: 1,
     limit: 20,
   }
+  listQuery.value.approvalStatus = approvalStatus
+  if (activeTitle.value === '可打印' || activeTitle.value === '全部') {
+    listQuery.value.approvalStatus = ''
+  }
   fetchData(true)
 }
 // 点击详情
@@ -226,14 +242,14 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   if (list.value.length > 0) {
-    // const params = {
-    //   ...listQuery.value,
-    //   ids: checkoutList.value,
-    // }
-    // exportCert(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '证书打印列表.xlsx')
-    // })
+    const params = {
+      ...listQuery.value,
+      ids: checkoutList.value,
+    }
+    exportCert(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '证书打印列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
@@ -243,10 +259,9 @@
 
 // 打印
 const bindLabel = (row: ICerPrintList) => {
-  console.log(1)
-  row.printNum = 1
+  console.log(row)
   // 判断状态第一次可以直接打印,之后的打印需要审批
-  if (row.printNum == 1) {
+  if (row.printNum == 0) {
     ElMessageBox.confirm(
       '确定要打印吗？',
       '确认操作',
@@ -319,18 +334,9 @@
 
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
-    active.value = window.sessionStorage.getItem('buttonBoxActive')!
-  }
-  else {
-    active.value = menu.value.find(item => item.name === '可打印')!.id // 可打
-    activeTitle.value === '可打印'
-  }
+
   fetchData(true)
 })
-onUnmounted(() => {
-  window.sessionStorage.setItem('buttonBoxActive', '') // 清除
-})
 </script>
 
 <template>
@@ -342,7 +348,7 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.certificationReportCode"
+          v-model.trim="listQuery.certificateNo"
           placeholder="证书编号"
           class="short-input"
           clearable
@@ -373,7 +379,7 @@
         />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 120px;" clearable>
+        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 160px;" clearable>
           <el-option v-for="item in certificationClassList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
@@ -388,19 +394,19 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column v-if="listQuery.printNum === ''" label="审批状态" align="center" width="90px" prop="approvalStatusName" />
+          <el-table-column label="审批状态" align="center" width="90px" prop="approvalStatusName" />
           <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.printNum === 0 || (listQuery.approvalStatus === '3')" size="small" link type="primary" @click="bindLabel(row)">
+              <el-button v-if="activeTitle === '全部' || activeTitle === '可打印'" size="small" link type="primary" @click="bindLabel(row)">
                 打印
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'agree')">
+              <el-button v-if="activeTitle === '待审批'" size="small" type="primary" link @click="handleDistribute(row, 'agree')">
                 同意
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'refuse')">
+              <el-button v-if="activeTitle === '待审批'" size="small" type="primary" link @click="handleDistribute(row, 'refuse')">
                 拒绝
               </el-button>
             </template>
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 2f8f8a4..fa8e6b0 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -392,4 +392,7 @@
 
 <style lang="scss" scoped>
 // 样式
+.short-input {
+  width: 180px !important;
+}
 </style>
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 2e8e4a7..5d7fc0f 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,5 +1,5 @@
 <!-- 设备借用处理 -->
-<script lang="ts" setup name="borrowApply">
+<script lang="ts" setup name="BorrowHandle">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
@@ -44,7 +44,7 @@
   applyPersonName: '', // 申请人姓名
   startTime: '', // 领用开始日期
   endTime: '', // 领用结束日期
-  approvalStatus: '4', // 	审批状态
+  approvalStatus: '4', // 	审批状态 (已完成)
   processResult: '1' || active.value, // 	处置结果 (3个状态字典值)
   applyType: '2', // 申请类型 借用2
   createUser: '', // 创建人
@@ -373,7 +373,7 @@
     active.value = window.sessionStorage.getItem('buttonBoxActive')!
   }
   else {
-    active.value = menu.value.find(item => item.name === '待借用')!.id // 全部
+    active.value = menu.value.find(item => item.name === '待借用')!.id // 待借用
     activeTitle.value === '待借用'
   }
   nextTick(() => {
@@ -394,6 +394,7 @@
         <el-input
           v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
+          class="short-input"
           clearable
         />
       </search-item>
@@ -401,6 +402,7 @@
         <el-input
           v-model.trim="listQuery.applyName"
           placeholder="申请名称"
+          class="short-input"
           clearable
         />
       </search-item>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index aae69c7..a59267d 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,5 +1,5 @@
 <!-- 设备借用申请 -->
-<script lang="ts" setup name="borrowApply">
+<script lang="ts" setup name="BorrowApply">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
@@ -49,7 +49,7 @@
   applyPersonName: '', // 申请人姓名
   startTime: '', // 领用开始日期
   endTime: '', // 领用结束日期
-  approvalStatus: active.value, // 	审批状态
+  approvalStatus: active.value, // 	审批状态 1 2 3 对应待借用|已借用|已归还
   processResult: '', // 	处置结果
   applyType: '2', // 申请类型 借用2
   createUser: '', // 创建人
@@ -156,7 +156,7 @@
     applyPerson: '', // 申请人
     startTime: '', // 申请开始日期
     endTime: '', // 申请结束日期
-    approvalStatus: active.value, // 	审批状态
+    approvalStatus: active.value, // 	审批状态  // 	审批状态 1 2 3 对应待借用|已借用|已归还
     processResult: '', // 	处置结果
     applyType: '2', // 申请类型 借用2
     createUser: '', // 创建人
@@ -193,27 +193,8 @@
   })
 }
 
-onMounted(async () => {
-  await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
-    active.value = window.sessionStorage.getItem('buttonBoxActive')!
-  }
-  else {
-    active.value = menu.value.find(item => item.name === '全部')!.id // 全部
-    activeTitle.value === '全部'
-  }
-  nextTick(() => {
-    fetchData(true) // 获取表格数据
-    fetchDeptTreeList() // 获取使用部门
-    fetchUserList() // 获取人员列表
-  })
-})
 const $router = useRouter()
 
-onUnmounted(() => {
-  window.sessionStorage.setItem('buttonBoxActive', '') // 清除
-})
-
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
@@ -434,6 +415,21 @@
     }
   }
 }
+onMounted(async () => {
+  await getDict() // 获取字典-审批状态
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+    active.value = window.sessionStorage.getItem('buttonBoxActive')!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '全部')!.id // 全部
+    activeTitle.value === '全部'
+  }
+  nextTick(() => {
+    fetchData(true) // 获取表格数据
+    fetchDeptTreeList() // 获取使用部门
+    fetchUserList() // 获取人员列表
+  })
+})
 </script>
 
 <template>
@@ -446,6 +442,7 @@
         <el-input
           v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
+          class="short-input"
           clearable
         />
       </search-item>
@@ -453,6 +450,7 @@
         <el-input
           v-model.trim="listQuery.applyName"
           placeholder="申请名称"
+          class="short-input"
           clearable
         />
       </search-item>
@@ -506,7 +504,7 @@
           <el-table-column
             label="操作"
             align="center"
-            :width="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 70 : 200"
+            :width="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 140 : 200"
             fixed="right"
           >
             <template #default="{ row }">
@@ -557,6 +555,17 @@
               >
                 编辑
               </el-button>
+
+              <el-button
+                v-if="proxy.hasPerm('/device/borrow/borrowapply/update') && activeTitle === '未通过'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName.search('驳回') === -1 "
+                @click="handleEdit(row, '编辑', 'edit')"
+              >
+                编辑
+              </el-button>
               <el-button
                 v-if="proxy.hasPerm('/device/borrow/borrowapply/update') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
                 size="small"
diff --git a/src/views/device/borrow/components/approvalActionDialog.vue b/src/views/device/borrow/components/approvalActionDialog.vue
deleted file mode 100644
index 9375861..0000000
--- a/src/views/device/borrow/components/approvalActionDialog.vue
+++ /dev/null
@@ -1,109 +0,0 @@
-<!-- 审批操作弹窗 -->
-<script lang="ts" setup>
-import type { FormInstance, FormRules } from 'element-plus'
-import dayjs from 'dayjs'
-import useUserStore from '@/store/modules/user'
-const emits = defineEmits(['resetData'])
-const userInfo = useUserStore()
-const dialogVisibleApprove = ref(false)
-const form = reactive({
-  radio: '1',
-  certificateNo: '',
-  certificateName: '',
-  certificateCompany: '',
-  certificateDate: '',
-  validDate: '',
-})
-const ruleFormRef = ref<FormInstance>()
-const rules = reactive<FormRules>({
-})
-// 重置
-const resetData = () => {
-  form.certificateNo = ''
-  form.certificateName = ''
-  form.certificateCompany = ''
-  form.certificateDate = ''
-  form.validDate = ''
-}
-const approvetime = ref('') // 审批时间
-const initDialog = (row: any) => {
-  dialogVisibleApprove.value = true
-  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
-  form.radio = row.radio
-}
-defineExpose({ initDialog })
-
-// 点击保存
-const submitForm = async (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  await formEl.validate((valid, fields) => {
-    if (valid) {
-      dialogVisibleApprove.value = false
-      emits('resetData')
-    }
-  })
-}
-// 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  formEl.resetFields()
-  dialogVisibleApprove.value = false
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
-    <el-form
-      ref="ruleFormRef" :model="form"
-      :rules="rules" label-width="110px"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见">
-            <el-radio-group v-model="form.radio" style="width: 100%;">
-              <el-radio label="1">
-                同意
-              </el-radio>
-              <el-radio label="2">
-                拒绝
-              </el-radio>
-              <el-radio label="3">
-                驳回
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论">
-            <el-input
-              :rows="4"
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人">
-            <el-input disabled :value="userInfo.$state.name" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间">
-            <el-input disabled :value="approvetime" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
-        <el-button @click="resetForm(ruleFormRef)">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/device/borrow/editHandle.vue b/src/views/device/borrow/editHandle.vue
index d2e423c..9a5b2a6 100644
--- a/src/views/device/borrow/editHandle.vue
+++ b/src/views/device/borrow/editHandle.vue
@@ -1,4 +1,5 @@
-<script lang="ts" setup name="Detail">
+<!-- 设备借用处理详情/编辑 -->
+<script lang="ts" setup name="EditHandle">
 import { onMounted, ref } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { ElLoading } from 'element-plus'
@@ -17,7 +18,6 @@
 const { proxy } = getCurrentInstance() as any
 const useDeptList = ref<deptType[]>([]) // 部门列表
 const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
-const total = ref(20)// 总数
 // 表单数据
 const form = ref({
   id: '',
@@ -29,19 +29,7 @@
   applyDesc: '', // 申请说明
 })
 const list = ref<IdeviceList[]>([])// 表格数据
-// 查询条件
-const listQuery: Ref<IdeviceListQuery> = ref({
-  equipmentName: '', // 仪器名称
-  equipmentNo: '', // 设备编号
-  modelNo: '', // 型号
-  mesureRange: '', // 测量范围
-  useDeptName: '', // 使用部门
-  usePersonName: '', // 使用人
-  managerStateName: '', // 管理状态
-  validDate: '', // 有效日期
-  offset: 1,
-  limit: 20,
-})
+
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '设备编号', value: 'equipmentNo', align: 'center', width: '230' },
@@ -82,11 +70,11 @@
   $router.back()
 }
 
-// 打印
+// 设备借用处理详情打印
 const printObj = ref({
   id: 'lysq', // 需要打印元素的id
   popTitle: '设备借用处理', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备借用处理</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备借用处理详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
@@ -125,7 +113,7 @@
   <app-container>
     <detail-page title="设备借用处理-详情">
       <template #btns>
-        <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/device/borrow/borrowhandle/print')" v-print="printObj" type="primary">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -225,22 +213,6 @@
     background-color: #fff;
     // padding: 10px;
 
-    .title-button {
-      display: flex;
-      align-items: center;
-
-      &::before {
-        content: "";
-        flex: 1;
-      }
-
-      .button-group {
-        flex: 1;
-        display: flex;
-        justify-content: flex-end;
-      }
-    }
-
     .form-area {
       margin-top: 40px;
     }
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index b76ab3e..18879cc 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -352,6 +352,7 @@
   formInline.value.acceptanceCheckId = object.id
   checkIdObject.value = object
   // 获取到详情
+
   equipmentApplyInfo({ id: object.id }).then((res) => {
     res.data.equipmentInfoList.map((item: objectReturn) => {
       if (item.id) {
@@ -492,11 +493,11 @@
         <el-row :gutter="20" class="marg">
           <el-col :span="14">
             <el-form-item label="附件:">
-              <show-photo v-if="formInline.fileList[0].minioFileName" :minio-file-name="formInline.fileList[0].minioFileName" />
+              <show-photo v-if="formInline.fileList" :minio-file-name="formInline.fileList.length && formInline.fileList[0].minioFileName ? formInline.fileList[0].minioFileName : ''" />
               <span v-else-if="pageType === 'detail'">无</span>
               <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.fileList[0].minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                {{ formInline.fileList[0].minioFileName === '' ? '上传' : '更换附件' }}
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.fileList.length && formInline.fileList[0].minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.fileList.length && formInline.fileList[0].minioFileName ? '上传' : '更换附件' }}
               </el-button>
             </el-form-item>
           </el-col>
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 73b9c0b..b21f663 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -543,6 +543,20 @@
 const addId = ref('')
 // 点击顶部一排按钮
 const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  // 添加校验条件
+  if (fromListInfo.value.fixedAssetsList) {
+    if (!fromListInfo.value.fixedAssetsList[0]?.id) {
+      ElMessage.warning('标准配套设备更换不能为空!')
+      return
+    }
+  }
+  if (fromListInfo.value.fileList) {
+    if (!fromListInfo.value.fileList[0]?.fileName) {
+      ElMessage.warning('申请文档不能为空!')
+      return
+    }
+  }
+
   if (item === '保存' && pageType.value === 'add') {
     if (!formEl) {
       return
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 0f8a9d5..3452009 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -148,7 +148,7 @@
     ABCList.value = response.data
   })
   // 获取检定方式
-  getDictByCode('mesureType').then((response) => {
+  getDictByCode('measureType').then((response) => {
     mesureTypeList.value = response.data
   })
   // 获取专业分类
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index e261313..0c76e05 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -116,7 +116,7 @@
     }
   })
   // 获取检定方式
-  getDictByCode('mesureType').then((response) => {
+  getDictByCode('measureType').then((response) => {
     mesureTypeList.value = response.data
   })
   // 获取管理状态
@@ -199,8 +199,15 @@
 }
 // 重置
 const reset = () => {
-  // searchQuery.fileNo = ''
   validDate.value = ''
+  searchQuery.equipmentNo = '' // 设备编号
+  searchQuery.equipmentName = ''
+  searchQuery.mesureType = ''
+  searchQuery.managerState = ''
+  searchQuery.useDept = ''
+  searchQuery.validStartDate = ''
+  searchQuery.validEndDate = ''
+  searchQuery.abc = ''
   getList()
 }
 // 模板下载
@@ -347,7 +354,7 @@
           <el-date-picker
             v-model="validDate"
             type="daterange"
-            format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+            format="YYYY-MM-DD" value-format="YYYY-MM-DD"
             range-separator="至"
             start-placeholder="有效开始日期"
             end-placeholder="有效结束日期"
diff --git a/src/views/device/stateManage/components/status-interface.ts b/src/views/device/stateManage/components/status-interface.ts
index caa43b1..93410a7 100644
--- a/src/views/device/stateManage/components/status-interface.ts
+++ b/src/views/device/stateManage/components/status-interface.ts
@@ -29,7 +29,7 @@
   equipmentName: string // 设备名称
   equipmentNo: string // 设备编号
   fileList: string // 文件列表
-  id: number // 主键id
+  id: number | string // 主键id
   isDel: number // 删除标记
   managerState: string //  管理状态
   managerStateName: string // 管理状态名称
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 05ba922..c53574f 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -1,5 +1,5 @@
-<!-- 新增或详情弹窗 -->
-<script lang="ts" setup name="add">
+<!-- 新增或详情弹窗 设备借用处理新增编辑 -->
+<script lang="ts" setup name="TemplateAdd">
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import type { EquipmentListRow, IdeviceList, IdeviceListQuery } from './status-interface'
@@ -14,7 +14,7 @@
 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, submitApply } from '@/api/device/borrow'
+import { addApply, deleteApply, detailApply, editApply, failUpdate, submitApply } from '@/api/device/borrow'
 import { addStatus, detailStatus, updateStatus } from '@/api/device/stateManage'
 import type { borrowDeviceType } from '@/views/device/borrow/borrow'
 import useUserStore from '@/store/modules/user'
@@ -60,6 +60,7 @@
   applyType: '', // 申请类型
   applyName: '', // 申请名称
   createUser: userInfo.$state.id,
+  approvalStatus: '',
   createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
   id: '',
 })
@@ -116,21 +117,6 @@
 const usePersonList = ref<userType[]>([]) // 使用人列表
 const useDeptList = ref<deptType[]>([]) // 使用部门列表
 const useDeptListNoTree = ref([]) // 使用部门列表非树结构
-const isWhether = ref<selectType[]>([
-  {
-    name: '是',
-    id: 'shi',
-    value: '1',
-  },
-  {
-    name: '否',
-    id: 'fou',
-    value: '0',
-  },
-])
-const deptProps = reactive({
-  parent: 'pid', value: 'id', label: 'name', children: 'children',
-})
 // 获取下拉框数
 const fetchData = () => {
 // 获取资产类型
@@ -209,7 +195,12 @@
       detailApply({ id: row.id }).then((res) => {
         processId.value = res.data.processId // 流程id存在的时候赋值
         ruleForm2.value = res.data
-        borrowList.value = res.data.equipmentInfoList
+        borrowList.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
+          return {
+            ...item,
+            validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+          }
+        })
       })
     }
   }
@@ -286,28 +277,58 @@
     //  设备借用
     if (!formEl2) { return }
     if (ruleForm2.value.id) {
-      await formEl2.validate((valid, fields) => {
-        if (valid) {
-          ElMessageBox.confirm(
-            '确认提交吗?',
-            '提示',
-            {
-              confirmButtonText: '确认',
-              cancelButtonText: '取消',
-              type: 'warning',
-            },
-          ).then(() => {
-            const params = {
-              id: ruleForm2.value.id,
-              formId: SCHEDULE.DEVICE_BORROW_APPROVAL, // 表单id
-            }
-            submitApply(params).then(() => {
-              ElMessage.success('操作成功!')
-              $router.go(-1)
+      // 如果是编辑-驳回时候发起单独的接口
+      if (ruleForm2.value.approvalStatus === '7') {
+        await formEl2.validate((valid, fields) => {
+          if (valid) {
+            ElMessageBox.confirm(
+              '确认提交吗?',
+              '提示',
+              {
+                confirmButtonText: '确认',
+                cancelButtonText: '取消',
+                type: 'warning',
+              },
+            ).then(() => {
+              ruleForm2.value.applyType = '2'
+              // const params = {
+              //   ...ruleForm2.value,
+              //   equipmentList: borrowList.value.map(item => ({
+              //     equipmentId: item.id,
+              //   })),
+              // }
+              failUpdate({ ...ruleForm2.value }).then(() => {
+                ElMessage.success('操作成功!')
+                $router.go(-1)
+              })
             })
-          })
-        }
-      })
+          }
+        })
+      }
+      else {
+        await formEl2.validate((valid, fields) => {
+          if (valid) {
+            ElMessageBox.confirm(
+              '确认提交吗?',
+              '提示',
+              {
+                confirmButtonText: '确认',
+                cancelButtonText: '取消',
+                type: 'warning',
+              },
+            ).then(() => {
+              const params = {
+                id: ruleForm2.value.id,
+                formId: SCHEDULE.DEVICE_BORROW_APPROVAL, // 表单id
+              }
+              submitApply(params).then(() => {
+                ElMessage.success('操作成功!')
+                $router.go(-1)
+              })
+            })
+          }
+        })
+      }
     }
     else {
       ElMessage.info('请先保存再提交！')
@@ -443,14 +464,15 @@
 }
 const columns = ref<TableColumn[]>([
   {
-    text: '设备名称',
-    value: 'equipmentName',
-    align: 'center',
-  },
-  {
     text: '设备编号',
     value: 'equipmentNo',
     align: 'center',
+    width: 240,
+  },
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
   },
   {
     text: '型号',
@@ -657,9 +679,6 @@
         <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'refuse' })">
           拒绝
         </el-button> -->
-        <el-button v-if="title === '详情' && isPrint" type="primary">
-          打印
-        </el-button>
         <!-- <el-button v-if="title === '详情' && isCancel" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
           提交
         </el-button> -->

diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index dbce999..5bd4111 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -45,6 +45,15 @@
     data,
   })
 }
+
+// 设备借用驳回后编辑
+export function failUpdate(data: object) {
+  return request({
+    url: '/equipmentApply/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 // 设备借用申请删除
 export function deleteApply(data: object) {
   return request({
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 9049282..7f9431b 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -1,6 +1,6 @@
 // 状态管理相关接口api
 import request from '../index'
-import type { ISearchQuery, ITableRow, Iapprove } from '@/views/device/stateManage/components/status-interface.ts'
+import type { ISearchQuery, Iapprove } from '@/views/device/stateManage/components/status-interface'
 
 // 设备申请列表
 export function getStatusList(data: ISearchQuery) {
@@ -11,7 +11,7 @@
   })
 }
 // 状态管理新建
-export function addStatus(data: ITableRow) {
+export function addStatus(data: Object) {
   return request({
     url: '/meter/stateManage/addStateManageInfo',
     method: 'post',
@@ -20,7 +20,7 @@
 }
 
 // 状态管理编辑
-export function updateStatus(data: ITableRow) {
+export function updateStatus(data: Object) {
   return request({
     url: '/meter/stateManage/updateStateManageInfo',
     method: 'post',
@@ -53,7 +53,7 @@
   })
 }
 // 状态管理详情
-export function detailStatus(data: ITableRow) {
+export function detailStatus(data: object) {
   return request({
     url: '/meter/stateManage/selectStateManageInfo',
     method: 'post',
diff --git a/src/components/SearchArea/SearchItem.vue b/src/components/SearchArea/SearchItem.vue
index 3adef93..dc53b08 100644
--- a/src/components/SearchArea/SearchItem.vue
+++ b/src/components/SearchArea/SearchItem.vue
@@ -23,7 +23,6 @@
   display: inline-block;
   margin-bottom: 10px;
   vertical-align: top;
-  box-sizing: inherit;
   margin-right: 5px;
 }
 
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index 12d7290..e3c72af 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -1,5 +1,9 @@
 // 证书打印查询
 export interface ICertPrintSearch {
+  certificateClass: string
+  certificateNo: string
+  createUserId: number
+  printStatus: number | null
   certificationReportCode: string // 证书编号
   orderNo: string // 委托书编号
   customerName: string // 委托方名称
@@ -13,7 +17,7 @@
   reason: string // 操作原因
   sampleId: string // 样品id
   status: string // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
-  ids?: []
+  ids?: [] | null
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 3daa2b5..391931b 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -22,6 +22,10 @@
 const activeTitle = ref('') // active对应的审批状态名字
 // 查询条件
 const listQuery = ref<ICertPrintSearch>({
+  certificateClass: '',
+  certificateNo: '', // 证书编号
+  createUserId: 0,
+  printStatus: 0, // 可打印(证书可打印传0,全部传null)
   certificationReportCode: '', // 证书编号
   orderNo: '', // 委托书编号
   customerName: '', // 委托方名称
@@ -30,11 +34,12 @@
   certificateReportType: '', // 证书类型
   printNum: '', // 打印次数 -未打印和全部用
   approvalStatus: '', // 审批状态-审批查询用
-  orderId: '0', // 委托书id
+  orderId: '', // 委托书id
   reason: '', // 操作原因
-  sampleId: '0', // 样品id
+  sampleId: '', // 样品id
   status: '', // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
   formId: SCHEDULE.BUSINESS_CERT_PRINT,
+  ids: null, // 设置默认值
   offset: 1,
   limit: 20,
 })
@@ -78,22 +83,30 @@
         }
       }
     })
+    if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+      active.value = window.sessionStorage.getItem('buttonBoxActive')!
+      activeTitle.value === '未通过'
+    }
+    else {
+      active.value = menu.value.find(item => item.name === '可打印')!.id // 可打印
+      activeTitle.value === '可打印'
+    }
   })
 }
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationReportCode', width: '110', align: 'center' },
-  { text: '证书名称', value: 'certificationReportName', width: '120', align: 'center' },
+  { text: '证书编号', value: 'certificateNo', width: '110', align: 'center' },
+  { text: '证书名称', value: 'certificateName', width: '120', align: 'center' },
   { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', width: '120', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', width: '120', align: 'center' },
   { text: '委托书编号', value: 'orderNo', width: '120', align: 'center' },
-  { text: '检校类别', value: 'customerNo', width: '120', align: 'center' },
-  { text: '检定人员', value: 'customerName', width: '120', align: 'center' },
-  { text: '证书类型', value: 'certificateReportTypeName', width: '120', align: 'center' },
-  { text: '打印状态', value: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
+  { text: '检校类别', value: 'measureType', width: '120', align: 'center' },
+  { text: '检定人员', value: 'measurePersonId', width: '120', align: 'center' },
+  { text: '证书类型', value: 'certificateType', width: '120', align: 'center' },
+  { text: '打印状态', value: 'printNum', align: 'center', width: '85px', filter: (row: ICerPrintList) => { var cnum = ['未打印', '一', '二', '三', '四', '五', '六', '七', '八', '九', '十']; return row.printNum == 0 ? '未打印' : `${cnum[parseInt(row.printNum)]}次打印` } },
   { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
 ])
 // 表格数据
@@ -107,37 +120,35 @@
 
 // 根据过滤查询条件
 function filterQuery() {
-  console.log(activeTitle)
+  const approvalStatus = menu.value.find(item => item.name === activeTitle.value)!.id
+  listQuery.value.approvalStatus = approvalStatus
   switch (activeTitle.value) {
     case '可打印':
-      listQuery.value.printNum = 0
+      listQuery.value.printStatus = 0
       listQuery.value.approvalStatus = ''
       break
     case '全部':
-      listQuery.value.printNum = 0
+      listQuery.value.printStatus = 2
       listQuery.value.approvalStatus = ''
       break
     case '待审批':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '1'
+      listQuery.value.printStatus = 2
       break
     case '审批中':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '2'
+      listQuery.value.printStatus = 2
       break
     case '已通过':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '3'
+      listQuery.value.printStatus = 2
       break
     case '未通过':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '4'
+      listQuery.value.printStatus = 2
       break
   }
 }
 
 // 数据查询
 function fetchData(isNowPage = false) {
+  console.log(listQuery)
   filterQuery()
   loadingTable.value = true
   if (!isNowPage) {
@@ -146,15 +157,11 @@
   }
   // 模拟数据
   loadingTable.value = false
-  list.value = [
-    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '0', printStatusName: '未打印', certificateReportTypeName: '自检', approvalStatusName: '待审批', taskId: '100', id: '10' },
-    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '1', printStatusName: '已打印', certificateReportTypeName: '自检', approvalStatusName: '待审批', taskId: '1001', id: '101' },
-  ]
-  // getCertList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getCertList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -167,7 +174,12 @@
 }
 // 点击重置
 const clearList = () => {
+  const approvalStatus = menu.value.find(item => item.name === activeTitle.value)!.id
   listQuery.value = {
+    certificateClass: '',
+    certificateNo: '', // 证书编号
+    createUserId: 0,
+    printStatus: 0, // 可打印(证书可打印传0,全部传null)
     certificationReportCode: '', // 证书编号
     orderNo: '', // 委托书编号
     customerName: '', // 委托方名称
@@ -176,14 +188,18 @@
     certificateReportType: '', // 证书类型
     printNum: '', // 打印次数 -未打印和全部用
     approvalStatus: '', // 审批状态-审批查询用
-    orderId: '0', // 委托书id
+    orderId: '', // 委托书id
     reason: '', // 操作原因
-    sampleId: '0', // 样品id
+    sampleId: '', // 样品id
     status: '', // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
     formId: SCHEDULE.BUSINESS_CERT_PRINT,
     offset: 1,
     limit: 20,
   }
+  listQuery.value.approvalStatus = approvalStatus
+  if (activeTitle.value === '可打印' || activeTitle.value === '全部') {
+    listQuery.value.approvalStatus = ''
+  }
   fetchData(true)
 }
 // 点击详情
@@ -226,14 +242,14 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   if (list.value.length > 0) {
-    // const params = {
-    //   ...listQuery.value,
-    //   ids: checkoutList.value,
-    // }
-    // exportCert(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '证书打印列表.xlsx')
-    // })
+    const params = {
+      ...listQuery.value,
+      ids: checkoutList.value,
+    }
+    exportCert(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '证书打印列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
@@ -243,10 +259,9 @@
 
 // 打印
 const bindLabel = (row: ICerPrintList) => {
-  console.log(1)
-  row.printNum = 1
+  console.log(row)
   // 判断状态第一次可以直接打印,之后的打印需要审批
-  if (row.printNum == 1) {
+  if (row.printNum == 0) {
     ElMessageBox.confirm(
       '确定要打印吗？',
       '确认操作',
@@ -319,18 +334,9 @@
 
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
-    active.value = window.sessionStorage.getItem('buttonBoxActive')!
-  }
-  else {
-    active.value = menu.value.find(item => item.name === '可打印')!.id // 可打
-    activeTitle.value === '可打印'
-  }
+
   fetchData(true)
 })
-onUnmounted(() => {
-  window.sessionStorage.setItem('buttonBoxActive', '') // 清除
-})
 </script>
 
 <template>
@@ -342,7 +348,7 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.certificationReportCode"
+          v-model.trim="listQuery.certificateNo"
           placeholder="证书编号"
           class="short-input"
           clearable
@@ -373,7 +379,7 @@
         />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 120px;" clearable>
+        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 160px;" clearable>
           <el-option v-for="item in certificationClassList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
@@ -388,19 +394,19 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column v-if="listQuery.printNum === ''" label="审批状态" align="center" width="90px" prop="approvalStatusName" />
+          <el-table-column label="审批状态" align="center" width="90px" prop="approvalStatusName" />
           <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.printNum === 0 || (listQuery.approvalStatus === '3')" size="small" link type="primary" @click="bindLabel(row)">
+              <el-button v-if="activeTitle === '全部' || activeTitle === '可打印'" size="small" link type="primary" @click="bindLabel(row)">
                 打印
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'agree')">
+              <el-button v-if="activeTitle === '待审批'" size="small" type="primary" link @click="handleDistribute(row, 'agree')">
                 同意
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'refuse')">
+              <el-button v-if="activeTitle === '待审批'" size="small" type="primary" link @click="handleDistribute(row, 'refuse')">
                 拒绝
               </el-button>
             </template>
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 2f8f8a4..fa8e6b0 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -392,4 +392,7 @@
 
 <style lang="scss" scoped>
 // 样式
+.short-input {
+  width: 180px !important;
+}
 </style>
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 2e8e4a7..5d7fc0f 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,5 +1,5 @@
 <!-- 设备借用处理 -->
-<script lang="ts" setup name="borrowApply">
+<script lang="ts" setup name="BorrowHandle">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
@@ -44,7 +44,7 @@
   applyPersonName: '', // 申请人姓名
   startTime: '', // 领用开始日期
   endTime: '', // 领用结束日期
-  approvalStatus: '4', // 	审批状态
+  approvalStatus: '4', // 	审批状态 (已完成)
   processResult: '1' || active.value, // 	处置结果 (3个状态字典值)
   applyType: '2', // 申请类型 借用2
   createUser: '', // 创建人
@@ -373,7 +373,7 @@
     active.value = window.sessionStorage.getItem('buttonBoxActive')!
   }
   else {
-    active.value = menu.value.find(item => item.name === '待借用')!.id // 全部
+    active.value = menu.value.find(item => item.name === '待借用')!.id // 待借用
     activeTitle.value === '待借用'
   }
   nextTick(() => {
@@ -394,6 +394,7 @@
         <el-input
           v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
+          class="short-input"
           clearable
         />
       </search-item>
@@ -401,6 +402,7 @@
         <el-input
           v-model.trim="listQuery.applyName"
           placeholder="申请名称"
+          class="short-input"
           clearable
         />
       </search-item>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index aae69c7..a59267d 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,5 +1,5 @@
 <!-- 设备借用申请 -->
-<script lang="ts" setup name="borrowApply">
+<script lang="ts" setup name="BorrowApply">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
@@ -49,7 +49,7 @@
   applyPersonName: '', // 申请人姓名
   startTime: '', // 领用开始日期
   endTime: '', // 领用结束日期
-  approvalStatus: active.value, // 	审批状态
+  approvalStatus: active.value, // 	审批状态 1 2 3 对应待借用|已借用|已归还
   processResult: '', // 	处置结果
   applyType: '2', // 申请类型 借用2
   createUser: '', // 创建人
@@ -156,7 +156,7 @@
     applyPerson: '', // 申请人
     startTime: '', // 申请开始日期
     endTime: '', // 申请结束日期
-    approvalStatus: active.value, // 	审批状态
+    approvalStatus: active.value, // 	审批状态  // 	审批状态 1 2 3 对应待借用|已借用|已归还
     processResult: '', // 	处置结果
     applyType: '2', // 申请类型 借用2
     createUser: '', // 创建人
@@ -193,27 +193,8 @@
   })
 }
 
-onMounted(async () => {
-  await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
-    active.value = window.sessionStorage.getItem('buttonBoxActive')!
-  }
-  else {
-    active.value = menu.value.find(item => item.name === '全部')!.id // 全部
-    activeTitle.value === '全部'
-  }
-  nextTick(() => {
-    fetchData(true) // 获取表格数据
-    fetchDeptTreeList() // 获取使用部门
-    fetchUserList() // 获取人员列表
-  })
-})
 const $router = useRouter()
 
-onUnmounted(() => {
-  window.sessionStorage.setItem('buttonBoxActive', '') // 清除
-})
-
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
@@ -434,6 +415,21 @@
     }
   }
 }
+onMounted(async () => {
+  await getDict() // 获取字典-审批状态
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+    active.value = window.sessionStorage.getItem('buttonBoxActive')!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '全部')!.id // 全部
+    activeTitle.value === '全部'
+  }
+  nextTick(() => {
+    fetchData(true) // 获取表格数据
+    fetchDeptTreeList() // 获取使用部门
+    fetchUserList() // 获取人员列表
+  })
+})
 </script>
 
 <template>
@@ -446,6 +442,7 @@
         <el-input
           v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
+          class="short-input"
           clearable
         />
       </search-item>
@@ -453,6 +450,7 @@
         <el-input
           v-model.trim="listQuery.applyName"
           placeholder="申请名称"
+          class="short-input"
           clearable
         />
       </search-item>
@@ -506,7 +504,7 @@
           <el-table-column
             label="操作"
             align="center"
-            :width="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 70 : 200"
+            :width="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 140 : 200"
             fixed="right"
           >
             <template #default="{ row }">
@@ -557,6 +555,17 @@
               >
                 编辑
               </el-button>
+
+              <el-button
+                v-if="proxy.hasPerm('/device/borrow/borrowapply/update') && activeTitle === '未通过'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName.search('驳回') === -1 "
+                @click="handleEdit(row, '编辑', 'edit')"
+              >
+                编辑
+              </el-button>
               <el-button
                 v-if="proxy.hasPerm('/device/borrow/borrowapply/update') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
                 size="small"
diff --git a/src/views/device/borrow/components/approvalActionDialog.vue b/src/views/device/borrow/components/approvalActionDialog.vue
deleted file mode 100644
index 9375861..0000000
--- a/src/views/device/borrow/components/approvalActionDialog.vue
+++ /dev/null
@@ -1,109 +0,0 @@
-<!-- 审批操作弹窗 -->
-<script lang="ts" setup>
-import type { FormInstance, FormRules } from 'element-plus'
-import dayjs from 'dayjs'
-import useUserStore from '@/store/modules/user'
-const emits = defineEmits(['resetData'])
-const userInfo = useUserStore()
-const dialogVisibleApprove = ref(false)
-const form = reactive({
-  radio: '1',
-  certificateNo: '',
-  certificateName: '',
-  certificateCompany: '',
-  certificateDate: '',
-  validDate: '',
-})
-const ruleFormRef = ref<FormInstance>()
-const rules = reactive<FormRules>({
-})
-// 重置
-const resetData = () => {
-  form.certificateNo = ''
-  form.certificateName = ''
-  form.certificateCompany = ''
-  form.certificateDate = ''
-  form.validDate = ''
-}
-const approvetime = ref('') // 审批时间
-const initDialog = (row: any) => {
-  dialogVisibleApprove.value = true
-  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
-  form.radio = row.radio
-}
-defineExpose({ initDialog })
-
-// 点击保存
-const submitForm = async (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  await formEl.validate((valid, fields) => {
-    if (valid) {
-      dialogVisibleApprove.value = false
-      emits('resetData')
-    }
-  })
-}
-// 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  formEl.resetFields()
-  dialogVisibleApprove.value = false
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
-    <el-form
-      ref="ruleFormRef" :model="form"
-      :rules="rules" label-width="110px"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见">
-            <el-radio-group v-model="form.radio" style="width: 100%;">
-              <el-radio label="1">
-                同意
-              </el-radio>
-              <el-radio label="2">
-                拒绝
-              </el-radio>
-              <el-radio label="3">
-                驳回
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论">
-            <el-input
-              :rows="4"
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人">
-            <el-input disabled :value="userInfo.$state.name" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间">
-            <el-input disabled :value="approvetime" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
-        <el-button @click="resetForm(ruleFormRef)">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/device/borrow/editHandle.vue b/src/views/device/borrow/editHandle.vue
index d2e423c..9a5b2a6 100644
--- a/src/views/device/borrow/editHandle.vue
+++ b/src/views/device/borrow/editHandle.vue
@@ -1,4 +1,5 @@
-<script lang="ts" setup name="Detail">
+<!-- 设备借用处理详情/编辑 -->
+<script lang="ts" setup name="EditHandle">
 import { onMounted, ref } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { ElLoading } from 'element-plus'
@@ -17,7 +18,6 @@
 const { proxy } = getCurrentInstance() as any
 const useDeptList = ref<deptType[]>([]) // 部门列表
 const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
-const total = ref(20)// 总数
 // 表单数据
 const form = ref({
   id: '',
@@ -29,19 +29,7 @@
   applyDesc: '', // 申请说明
 })
 const list = ref<IdeviceList[]>([])// 表格数据
-// 查询条件
-const listQuery: Ref<IdeviceListQuery> = ref({
-  equipmentName: '', // 仪器名称
-  equipmentNo: '', // 设备编号
-  modelNo: '', // 型号
-  mesureRange: '', // 测量范围
-  useDeptName: '', // 使用部门
-  usePersonName: '', // 使用人
-  managerStateName: '', // 管理状态
-  validDate: '', // 有效日期
-  offset: 1,
-  limit: 20,
-})
+
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '设备编号', value: 'equipmentNo', align: 'center', width: '230' },
@@ -82,11 +70,11 @@
   $router.back()
 }
 
-// 打印
+// 设备借用处理详情打印
 const printObj = ref({
   id: 'lysq', // 需要打印元素的id
   popTitle: '设备借用处理', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备借用处理</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备借用处理详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
@@ -125,7 +113,7 @@
   <app-container>
     <detail-page title="设备借用处理-详情">
       <template #btns>
-        <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/device/borrow/borrowhandle/print')" v-print="printObj" type="primary">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -225,22 +213,6 @@
     background-color: #fff;
     // padding: 10px;
 
-    .title-button {
-      display: flex;
-      align-items: center;
-
-      &::before {
-        content: "";
-        flex: 1;
-      }
-
-      .button-group {
-        flex: 1;
-        display: flex;
-        justify-content: flex-end;
-      }
-    }
-
     .form-area {
       margin-top: 40px;
     }
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index b76ab3e..18879cc 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -352,6 +352,7 @@
   formInline.value.acceptanceCheckId = object.id
   checkIdObject.value = object
   // 获取到详情
+
   equipmentApplyInfo({ id: object.id }).then((res) => {
     res.data.equipmentInfoList.map((item: objectReturn) => {
       if (item.id) {
@@ -492,11 +493,11 @@
         <el-row :gutter="20" class="marg">
           <el-col :span="14">
             <el-form-item label="附件:">
-              <show-photo v-if="formInline.fileList[0].minioFileName" :minio-file-name="formInline.fileList[0].minioFileName" />
+              <show-photo v-if="formInline.fileList" :minio-file-name="formInline.fileList.length && formInline.fileList[0].minioFileName ? formInline.fileList[0].minioFileName : ''" />
               <span v-else-if="pageType === 'detail'">无</span>
               <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.fileList[0].minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                {{ formInline.fileList[0].minioFileName === '' ? '上传' : '更换附件' }}
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.fileList.length && formInline.fileList[0].minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.fileList.length && formInline.fileList[0].minioFileName ? '上传' : '更换附件' }}
               </el-button>
             </el-form-item>
           </el-col>
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 73b9c0b..b21f663 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -543,6 +543,20 @@
 const addId = ref('')
 // 点击顶部一排按钮
 const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  // 添加校验条件
+  if (fromListInfo.value.fixedAssetsList) {
+    if (!fromListInfo.value.fixedAssetsList[0]?.id) {
+      ElMessage.warning('标准配套设备更换不能为空!')
+      return
+    }
+  }
+  if (fromListInfo.value.fileList) {
+    if (!fromListInfo.value.fileList[0]?.fileName) {
+      ElMessage.warning('申请文档不能为空!')
+      return
+    }
+  }
+
   if (item === '保存' && pageType.value === 'add') {
     if (!formEl) {
       return
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 0f8a9d5..3452009 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -148,7 +148,7 @@
     ABCList.value = response.data
   })
   // 获取检定方式
-  getDictByCode('mesureType').then((response) => {
+  getDictByCode('measureType').then((response) => {
     mesureTypeList.value = response.data
   })
   // 获取专业分类
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index e261313..0c76e05 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -116,7 +116,7 @@
     }
   })
   // 获取检定方式
-  getDictByCode('mesureType').then((response) => {
+  getDictByCode('measureType').then((response) => {
     mesureTypeList.value = response.data
   })
   // 获取管理状态
@@ -199,8 +199,15 @@
 }
 // 重置
 const reset = () => {
-  // searchQuery.fileNo = ''
   validDate.value = ''
+  searchQuery.equipmentNo = '' // 设备编号
+  searchQuery.equipmentName = ''
+  searchQuery.mesureType = ''
+  searchQuery.managerState = ''
+  searchQuery.useDept = ''
+  searchQuery.validStartDate = ''
+  searchQuery.validEndDate = ''
+  searchQuery.abc = ''
   getList()
 }
 // 模板下载
@@ -347,7 +354,7 @@
           <el-date-picker
             v-model="validDate"
             type="daterange"
-            format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+            format="YYYY-MM-DD" value-format="YYYY-MM-DD"
             range-separator="至"
             start-placeholder="有效开始日期"
             end-placeholder="有效结束日期"
diff --git a/src/views/device/stateManage/components/status-interface.ts b/src/views/device/stateManage/components/status-interface.ts
index caa43b1..93410a7 100644
--- a/src/views/device/stateManage/components/status-interface.ts
+++ b/src/views/device/stateManage/components/status-interface.ts
@@ -29,7 +29,7 @@
   equipmentName: string // 设备名称
   equipmentNo: string // 设备编号
   fileList: string // 文件列表
-  id: number // 主键id
+  id: number | string // 主键id
   isDel: number // 删除标记
   managerState: string //  管理状态
   managerStateName: string // 管理状态名称
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 05ba922..c53574f 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -1,5 +1,5 @@
-<!-- 新增或详情弹窗 -->
-<script lang="ts" setup name="add">
+<!-- 新增或详情弹窗 设备借用处理新增编辑 -->
+<script lang="ts" setup name="TemplateAdd">
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import type { EquipmentListRow, IdeviceList, IdeviceListQuery } from './status-interface'
@@ -14,7 +14,7 @@
 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, submitApply } from '@/api/device/borrow'
+import { addApply, deleteApply, detailApply, editApply, failUpdate, submitApply } from '@/api/device/borrow'
 import { addStatus, detailStatus, updateStatus } from '@/api/device/stateManage'
 import type { borrowDeviceType } from '@/views/device/borrow/borrow'
 import useUserStore from '@/store/modules/user'
@@ -60,6 +60,7 @@
   applyType: '', // 申请类型
   applyName: '', // 申请名称
   createUser: userInfo.$state.id,
+  approvalStatus: '',
   createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
   id: '',
 })
@@ -116,21 +117,6 @@
 const usePersonList = ref<userType[]>([]) // 使用人列表
 const useDeptList = ref<deptType[]>([]) // 使用部门列表
 const useDeptListNoTree = ref([]) // 使用部门列表非树结构
-const isWhether = ref<selectType[]>([
-  {
-    name: '是',
-    id: 'shi',
-    value: '1',
-  },
-  {
-    name: '否',
-    id: 'fou',
-    value: '0',
-  },
-])
-const deptProps = reactive({
-  parent: 'pid', value: 'id', label: 'name', children: 'children',
-})
 // 获取下拉框数
 const fetchData = () => {
 // 获取资产类型
@@ -209,7 +195,12 @@
       detailApply({ id: row.id }).then((res) => {
         processId.value = res.data.processId // 流程id存在的时候赋值
         ruleForm2.value = res.data
-        borrowList.value = res.data.equipmentInfoList
+        borrowList.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
+          return {
+            ...item,
+            validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+          }
+        })
       })
     }
   }
@@ -286,28 +277,58 @@
     //  设备借用
     if (!formEl2) { return }
     if (ruleForm2.value.id) {
-      await formEl2.validate((valid, fields) => {
-        if (valid) {
-          ElMessageBox.confirm(
-            '确认提交吗?',
-            '提示',
-            {
-              confirmButtonText: '确认',
-              cancelButtonText: '取消',
-              type: 'warning',
-            },
-          ).then(() => {
-            const params = {
-              id: ruleForm2.value.id,
-              formId: SCHEDULE.DEVICE_BORROW_APPROVAL, // 表单id
-            }
-            submitApply(params).then(() => {
-              ElMessage.success('操作成功!')
-              $router.go(-1)
+      // 如果是编辑-驳回时候发起单独的接口
+      if (ruleForm2.value.approvalStatus === '7') {
+        await formEl2.validate((valid, fields) => {
+          if (valid) {
+            ElMessageBox.confirm(
+              '确认提交吗?',
+              '提示',
+              {
+                confirmButtonText: '确认',
+                cancelButtonText: '取消',
+                type: 'warning',
+              },
+            ).then(() => {
+              ruleForm2.value.applyType = '2'
+              // const params = {
+              //   ...ruleForm2.value,
+              //   equipmentList: borrowList.value.map(item => ({
+              //     equipmentId: item.id,
+              //   })),
+              // }
+              failUpdate({ ...ruleForm2.value }).then(() => {
+                ElMessage.success('操作成功!')
+                $router.go(-1)
+              })
             })
-          })
-        }
-      })
+          }
+        })
+      }
+      else {
+        await formEl2.validate((valid, fields) => {
+          if (valid) {
+            ElMessageBox.confirm(
+              '确认提交吗?',
+              '提示',
+              {
+                confirmButtonText: '确认',
+                cancelButtonText: '取消',
+                type: 'warning',
+              },
+            ).then(() => {
+              const params = {
+                id: ruleForm2.value.id,
+                formId: SCHEDULE.DEVICE_BORROW_APPROVAL, // 表单id
+              }
+              submitApply(params).then(() => {
+                ElMessage.success('操作成功!')
+                $router.go(-1)
+              })
+            })
+          }
+        })
+      }
     }
     else {
       ElMessage.info('请先保存再提交！')
@@ -443,14 +464,15 @@
 }
 const columns = ref<TableColumn[]>([
   {
-    text: '设备名称',
-    value: 'equipmentName',
-    align: 'center',
-  },
-  {
     text: '设备编号',
     value: 'equipmentNo',
     align: 'center',
+    width: 240,
+  },
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
   },
   {
     text: '型号',
@@ -657,9 +679,6 @@
         <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'refuse' })">
           拒绝
         </el-button> -->
-        <el-button v-if="title === '详情' && isPrint" type="primary">
-          打印
-        </el-button>
         <!-- <el-button v-if="title === '详情' && isCancel" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
           提交
         </el-button> -->
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 0c22c33..9696d06 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -571,8 +571,7 @@
                   type="primary"
                   link
                   :disabled="
-                    (row.approvalStatus !== '待审批'
-                      && row.approvalStatus !== '审批中')
+                    (row.approvalStatus !== '审批中')
                       || row.decisionItem === 3"
                   @click="agree(row)"
                 >

diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index dbce999..5bd4111 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -45,6 +45,15 @@
     data,
   })
 }
+
+// 设备借用驳回后编辑
+export function failUpdate(data: object) {
+  return request({
+    url: '/equipmentApply/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 // 设备借用申请删除
 export function deleteApply(data: object) {
   return request({
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 9049282..7f9431b 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -1,6 +1,6 @@
 // 状态管理相关接口api
 import request from '../index'
-import type { ISearchQuery, ITableRow, Iapprove } from '@/views/device/stateManage/components/status-interface.ts'
+import type { ISearchQuery, Iapprove } from '@/views/device/stateManage/components/status-interface'
 
 // 设备申请列表
 export function getStatusList(data: ISearchQuery) {
@@ -11,7 +11,7 @@
   })
 }
 // 状态管理新建
-export function addStatus(data: ITableRow) {
+export function addStatus(data: Object) {
   return request({
     url: '/meter/stateManage/addStateManageInfo',
     method: 'post',
@@ -20,7 +20,7 @@
 }
 
 // 状态管理编辑
-export function updateStatus(data: ITableRow) {
+export function updateStatus(data: Object) {
   return request({
     url: '/meter/stateManage/updateStateManageInfo',
     method: 'post',
@@ -53,7 +53,7 @@
   })
 }
 // 状态管理详情
-export function detailStatus(data: ITableRow) {
+export function detailStatus(data: object) {
   return request({
     url: '/meter/stateManage/selectStateManageInfo',
     method: 'post',
diff --git a/src/components/SearchArea/SearchItem.vue b/src/components/SearchArea/SearchItem.vue
index 3adef93..dc53b08 100644
--- a/src/components/SearchArea/SearchItem.vue
+++ b/src/components/SearchArea/SearchItem.vue
@@ -23,7 +23,6 @@
   display: inline-block;
   margin-bottom: 10px;
   vertical-align: top;
-  box-sizing: inherit;
   margin-right: 5px;
 }
 
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index 12d7290..e3c72af 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -1,5 +1,9 @@
 // 证书打印查询
 export interface ICertPrintSearch {
+  certificateClass: string
+  certificateNo: string
+  createUserId: number
+  printStatus: number | null
   certificationReportCode: string // 证书编号
   orderNo: string // 委托书编号
   customerName: string // 委托方名称
@@ -13,7 +17,7 @@
   reason: string // 操作原因
   sampleId: string // 样品id
   status: string // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
-  ids?: []
+  ids?: [] | null
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 3daa2b5..391931b 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -22,6 +22,10 @@
 const activeTitle = ref('') // active对应的审批状态名字
 // 查询条件
 const listQuery = ref<ICertPrintSearch>({
+  certificateClass: '',
+  certificateNo: '', // 证书编号
+  createUserId: 0,
+  printStatus: 0, // 可打印(证书可打印传0,全部传null)
   certificationReportCode: '', // 证书编号
   orderNo: '', // 委托书编号
   customerName: '', // 委托方名称
@@ -30,11 +34,12 @@
   certificateReportType: '', // 证书类型
   printNum: '', // 打印次数 -未打印和全部用
   approvalStatus: '', // 审批状态-审批查询用
-  orderId: '0', // 委托书id
+  orderId: '', // 委托书id
   reason: '', // 操作原因
-  sampleId: '0', // 样品id
+  sampleId: '', // 样品id
   status: '', // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
   formId: SCHEDULE.BUSINESS_CERT_PRINT,
+  ids: null, // 设置默认值
   offset: 1,
   limit: 20,
 })
@@ -78,22 +83,30 @@
         }
       }
     })
+    if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+      active.value = window.sessionStorage.getItem('buttonBoxActive')!
+      activeTitle.value === '未通过'
+    }
+    else {
+      active.value = menu.value.find(item => item.name === '可打印')!.id // 可打印
+      activeTitle.value === '可打印'
+    }
   })
 }
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationReportCode', width: '110', align: 'center' },
-  { text: '证书名称', value: 'certificationReportName', width: '120', align: 'center' },
+  { text: '证书编号', value: 'certificateNo', width: '110', align: 'center' },
+  { text: '证书名称', value: 'certificateName', width: '120', align: 'center' },
   { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', width: '120', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', width: '120', align: 'center' },
   { text: '委托书编号', value: 'orderNo', width: '120', align: 'center' },
-  { text: '检校类别', value: 'customerNo', width: '120', align: 'center' },
-  { text: '检定人员', value: 'customerName', width: '120', align: 'center' },
-  { text: '证书类型', value: 'certificateReportTypeName', width: '120', align: 'center' },
-  { text: '打印状态', value: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
+  { text: '检校类别', value: 'measureType', width: '120', align: 'center' },
+  { text: '检定人员', value: 'measurePersonId', width: '120', align: 'center' },
+  { text: '证书类型', value: 'certificateType', width: '120', align: 'center' },
+  { text: '打印状态', value: 'printNum', align: 'center', width: '85px', filter: (row: ICerPrintList) => { var cnum = ['未打印', '一', '二', '三', '四', '五', '六', '七', '八', '九', '十']; return row.printNum == 0 ? '未打印' : `${cnum[parseInt(row.printNum)]}次打印` } },
   { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
 ])
 // 表格数据
@@ -107,37 +120,35 @@
 
 // 根据过滤查询条件
 function filterQuery() {
-  console.log(activeTitle)
+  const approvalStatus = menu.value.find(item => item.name === activeTitle.value)!.id
+  listQuery.value.approvalStatus = approvalStatus
   switch (activeTitle.value) {
     case '可打印':
-      listQuery.value.printNum = 0
+      listQuery.value.printStatus = 0
       listQuery.value.approvalStatus = ''
       break
     case '全部':
-      listQuery.value.printNum = 0
+      listQuery.value.printStatus = 2
       listQuery.value.approvalStatus = ''
       break
     case '待审批':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '1'
+      listQuery.value.printStatus = 2
       break
     case '审批中':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '2'
+      listQuery.value.printStatus = 2
       break
     case '已通过':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '3'
+      listQuery.value.printStatus = 2
       break
     case '未通过':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '4'
+      listQuery.value.printStatus = 2
       break
   }
 }
 
 // 数据查询
 function fetchData(isNowPage = false) {
+  console.log(listQuery)
   filterQuery()
   loadingTable.value = true
   if (!isNowPage) {
@@ -146,15 +157,11 @@
   }
   // 模拟数据
   loadingTable.value = false
-  list.value = [
-    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '0', printStatusName: '未打印', certificateReportTypeName: '自检', approvalStatusName: '待审批', taskId: '100', id: '10' },
-    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '1', printStatusName: '已打印', certificateReportTypeName: '自检', approvalStatusName: '待审批', taskId: '1001', id: '101' },
-  ]
-  // getCertList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getCertList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -167,7 +174,12 @@
 }
 // 点击重置
 const clearList = () => {
+  const approvalStatus = menu.value.find(item => item.name === activeTitle.value)!.id
   listQuery.value = {
+    certificateClass: '',
+    certificateNo: '', // 证书编号
+    createUserId: 0,
+    printStatus: 0, // 可打印(证书可打印传0,全部传null)
     certificationReportCode: '', // 证书编号
     orderNo: '', // 委托书编号
     customerName: '', // 委托方名称
@@ -176,14 +188,18 @@
     certificateReportType: '', // 证书类型
     printNum: '', // 打印次数 -未打印和全部用
     approvalStatus: '', // 审批状态-审批查询用
-    orderId: '0', // 委托书id
+    orderId: '', // 委托书id
     reason: '', // 操作原因
-    sampleId: '0', // 样品id
+    sampleId: '', // 样品id
     status: '', // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
     formId: SCHEDULE.BUSINESS_CERT_PRINT,
     offset: 1,
     limit: 20,
   }
+  listQuery.value.approvalStatus = approvalStatus
+  if (activeTitle.value === '可打印' || activeTitle.value === '全部') {
+    listQuery.value.approvalStatus = ''
+  }
   fetchData(true)
 }
 // 点击详情
@@ -226,14 +242,14 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   if (list.value.length > 0) {
-    // const params = {
-    //   ...listQuery.value,
-    //   ids: checkoutList.value,
-    // }
-    // exportCert(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '证书打印列表.xlsx')
-    // })
+    const params = {
+      ...listQuery.value,
+      ids: checkoutList.value,
+    }
+    exportCert(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '证书打印列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
@@ -243,10 +259,9 @@
 
 // 打印
 const bindLabel = (row: ICerPrintList) => {
-  console.log(1)
-  row.printNum = 1
+  console.log(row)
   // 判断状态第一次可以直接打印,之后的打印需要审批
-  if (row.printNum == 1) {
+  if (row.printNum == 0) {
     ElMessageBox.confirm(
       '确定要打印吗？',
       '确认操作',
@@ -319,18 +334,9 @@
 
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
-    active.value = window.sessionStorage.getItem('buttonBoxActive')!
-  }
-  else {
-    active.value = menu.value.find(item => item.name === '可打印')!.id // 可打
-    activeTitle.value === '可打印'
-  }
+
   fetchData(true)
 })
-onUnmounted(() => {
-  window.sessionStorage.setItem('buttonBoxActive', '') // 清除
-})
 </script>
 
 <template>
@@ -342,7 +348,7 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.certificationReportCode"
+          v-model.trim="listQuery.certificateNo"
           placeholder="证书编号"
           class="short-input"
           clearable
@@ -373,7 +379,7 @@
         />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 120px;" clearable>
+        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 160px;" clearable>
           <el-option v-for="item in certificationClassList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
@@ -388,19 +394,19 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column v-if="listQuery.printNum === ''" label="审批状态" align="center" width="90px" prop="approvalStatusName" />
+          <el-table-column label="审批状态" align="center" width="90px" prop="approvalStatusName" />
           <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.printNum === 0 || (listQuery.approvalStatus === '3')" size="small" link type="primary" @click="bindLabel(row)">
+              <el-button v-if="activeTitle === '全部' || activeTitle === '可打印'" size="small" link type="primary" @click="bindLabel(row)">
                 打印
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'agree')">
+              <el-button v-if="activeTitle === '待审批'" size="small" type="primary" link @click="handleDistribute(row, 'agree')">
                 同意
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'refuse')">
+              <el-button v-if="activeTitle === '待审批'" size="small" type="primary" link @click="handleDistribute(row, 'refuse')">
                 拒绝
               </el-button>
             </template>
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 2f8f8a4..fa8e6b0 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -392,4 +392,7 @@
 
 <style lang="scss" scoped>
 // 样式
+.short-input {
+  width: 180px !important;
+}
 </style>
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 2e8e4a7..5d7fc0f 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,5 +1,5 @@
 <!-- 设备借用处理 -->
-<script lang="ts" setup name="borrowApply">
+<script lang="ts" setup name="BorrowHandle">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
@@ -44,7 +44,7 @@
   applyPersonName: '', // 申请人姓名
   startTime: '', // 领用开始日期
   endTime: '', // 领用结束日期
-  approvalStatus: '4', // 	审批状态
+  approvalStatus: '4', // 	审批状态 (已完成)
   processResult: '1' || active.value, // 	处置结果 (3个状态字典值)
   applyType: '2', // 申请类型 借用2
   createUser: '', // 创建人
@@ -373,7 +373,7 @@
     active.value = window.sessionStorage.getItem('buttonBoxActive')!
   }
   else {
-    active.value = menu.value.find(item => item.name === '待借用')!.id // 全部
+    active.value = menu.value.find(item => item.name === '待借用')!.id // 待借用
     activeTitle.value === '待借用'
   }
   nextTick(() => {
@@ -394,6 +394,7 @@
         <el-input
           v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
+          class="short-input"
           clearable
         />
       </search-item>
@@ -401,6 +402,7 @@
         <el-input
           v-model.trim="listQuery.applyName"
           placeholder="申请名称"
+          class="short-input"
           clearable
         />
       </search-item>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index aae69c7..a59267d 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,5 +1,5 @@
 <!-- 设备借用申请 -->
-<script lang="ts" setup name="borrowApply">
+<script lang="ts" setup name="BorrowApply">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
@@ -49,7 +49,7 @@
   applyPersonName: '', // 申请人姓名
   startTime: '', // 领用开始日期
   endTime: '', // 领用结束日期
-  approvalStatus: active.value, // 	审批状态
+  approvalStatus: active.value, // 	审批状态 1 2 3 对应待借用|已借用|已归还
   processResult: '', // 	处置结果
   applyType: '2', // 申请类型 借用2
   createUser: '', // 创建人
@@ -156,7 +156,7 @@
     applyPerson: '', // 申请人
     startTime: '', // 申请开始日期
     endTime: '', // 申请结束日期
-    approvalStatus: active.value, // 	审批状态
+    approvalStatus: active.value, // 	审批状态  // 	审批状态 1 2 3 对应待借用|已借用|已归还
     processResult: '', // 	处置结果
     applyType: '2', // 申请类型 借用2
     createUser: '', // 创建人
@@ -193,27 +193,8 @@
   })
 }
 
-onMounted(async () => {
-  await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
-    active.value = window.sessionStorage.getItem('buttonBoxActive')!
-  }
-  else {
-    active.value = menu.value.find(item => item.name === '全部')!.id // 全部
-    activeTitle.value === '全部'
-  }
-  nextTick(() => {
-    fetchData(true) // 获取表格数据
-    fetchDeptTreeList() // 获取使用部门
-    fetchUserList() // 获取人员列表
-  })
-})
 const $router = useRouter()
 
-onUnmounted(() => {
-  window.sessionStorage.setItem('buttonBoxActive', '') // 清除
-})
-
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
@@ -434,6 +415,21 @@
     }
   }
 }
+onMounted(async () => {
+  await getDict() // 获取字典-审批状态
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+    active.value = window.sessionStorage.getItem('buttonBoxActive')!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '全部')!.id // 全部
+    activeTitle.value === '全部'
+  }
+  nextTick(() => {
+    fetchData(true) // 获取表格数据
+    fetchDeptTreeList() // 获取使用部门
+    fetchUserList() // 获取人员列表
+  })
+})
 </script>
 
 <template>
@@ -446,6 +442,7 @@
         <el-input
           v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
+          class="short-input"
           clearable
         />
       </search-item>
@@ -453,6 +450,7 @@
         <el-input
           v-model.trim="listQuery.applyName"
           placeholder="申请名称"
+          class="short-input"
           clearable
         />
       </search-item>
@@ -506,7 +504,7 @@
           <el-table-column
             label="操作"
             align="center"
-            :width="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 70 : 200"
+            :width="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 140 : 200"
             fixed="right"
           >
             <template #default="{ row }">
@@ -557,6 +555,17 @@
               >
                 编辑
               </el-button>
+
+              <el-button
+                v-if="proxy.hasPerm('/device/borrow/borrowapply/update') && activeTitle === '未通过'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName.search('驳回') === -1 "
+                @click="handleEdit(row, '编辑', 'edit')"
+              >
+                编辑
+              </el-button>
               <el-button
                 v-if="proxy.hasPerm('/device/borrow/borrowapply/update') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
                 size="small"
diff --git a/src/views/device/borrow/components/approvalActionDialog.vue b/src/views/device/borrow/components/approvalActionDialog.vue
deleted file mode 100644
index 9375861..0000000
--- a/src/views/device/borrow/components/approvalActionDialog.vue
+++ /dev/null
@@ -1,109 +0,0 @@
-<!-- 审批操作弹窗 -->
-<script lang="ts" setup>
-import type { FormInstance, FormRules } from 'element-plus'
-import dayjs from 'dayjs'
-import useUserStore from '@/store/modules/user'
-const emits = defineEmits(['resetData'])
-const userInfo = useUserStore()
-const dialogVisibleApprove = ref(false)
-const form = reactive({
-  radio: '1',
-  certificateNo: '',
-  certificateName: '',
-  certificateCompany: '',
-  certificateDate: '',
-  validDate: '',
-})
-const ruleFormRef = ref<FormInstance>()
-const rules = reactive<FormRules>({
-})
-// 重置
-const resetData = () => {
-  form.certificateNo = ''
-  form.certificateName = ''
-  form.certificateCompany = ''
-  form.certificateDate = ''
-  form.validDate = ''
-}
-const approvetime = ref('') // 审批时间
-const initDialog = (row: any) => {
-  dialogVisibleApprove.value = true
-  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
-  form.radio = row.radio
-}
-defineExpose({ initDialog })
-
-// 点击保存
-const submitForm = async (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  await formEl.validate((valid, fields) => {
-    if (valid) {
-      dialogVisibleApprove.value = false
-      emits('resetData')
-    }
-  })
-}
-// 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  formEl.resetFields()
-  dialogVisibleApprove.value = false
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
-    <el-form
-      ref="ruleFormRef" :model="form"
-      :rules="rules" label-width="110px"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见">
-            <el-radio-group v-model="form.radio" style="width: 100%;">
-              <el-radio label="1">
-                同意
-              </el-radio>
-              <el-radio label="2">
-                拒绝
-              </el-radio>
-              <el-radio label="3">
-                驳回
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论">
-            <el-input
-              :rows="4"
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人">
-            <el-input disabled :value="userInfo.$state.name" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间">
-            <el-input disabled :value="approvetime" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
-        <el-button @click="resetForm(ruleFormRef)">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/device/borrow/editHandle.vue b/src/views/device/borrow/editHandle.vue
index d2e423c..9a5b2a6 100644
--- a/src/views/device/borrow/editHandle.vue
+++ b/src/views/device/borrow/editHandle.vue
@@ -1,4 +1,5 @@
-<script lang="ts" setup name="Detail">
+<!-- 设备借用处理详情/编辑 -->
+<script lang="ts" setup name="EditHandle">
 import { onMounted, ref } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { ElLoading } from 'element-plus'
@@ -17,7 +18,6 @@
 const { proxy } = getCurrentInstance() as any
 const useDeptList = ref<deptType[]>([]) // 部门列表
 const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
-const total = ref(20)// 总数
 // 表单数据
 const form = ref({
   id: '',
@@ -29,19 +29,7 @@
   applyDesc: '', // 申请说明
 })
 const list = ref<IdeviceList[]>([])// 表格数据
-// 查询条件
-const listQuery: Ref<IdeviceListQuery> = ref({
-  equipmentName: '', // 仪器名称
-  equipmentNo: '', // 设备编号
-  modelNo: '', // 型号
-  mesureRange: '', // 测量范围
-  useDeptName: '', // 使用部门
-  usePersonName: '', // 使用人
-  managerStateName: '', // 管理状态
-  validDate: '', // 有效日期
-  offset: 1,
-  limit: 20,
-})
+
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '设备编号', value: 'equipmentNo', align: 'center', width: '230' },
@@ -82,11 +70,11 @@
   $router.back()
 }
 
-// 打印
+// 设备借用处理详情打印
 const printObj = ref({
   id: 'lysq', // 需要打印元素的id
   popTitle: '设备借用处理', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备借用处理</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备借用处理详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
@@ -125,7 +113,7 @@
   <app-container>
     <detail-page title="设备借用处理-详情">
       <template #btns>
-        <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/device/borrow/borrowhandle/print')" v-print="printObj" type="primary">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -225,22 +213,6 @@
     background-color: #fff;
     // padding: 10px;
 
-    .title-button {
-      display: flex;
-      align-items: center;
-
-      &::before {
-        content: "";
-        flex: 1;
-      }
-
-      .button-group {
-        flex: 1;
-        display: flex;
-        justify-content: flex-end;
-      }
-    }
-
     .form-area {
       margin-top: 40px;
     }
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index b76ab3e..18879cc 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -352,6 +352,7 @@
   formInline.value.acceptanceCheckId = object.id
   checkIdObject.value = object
   // 获取到详情
+
   equipmentApplyInfo({ id: object.id }).then((res) => {
     res.data.equipmentInfoList.map((item: objectReturn) => {
       if (item.id) {
@@ -492,11 +493,11 @@
         <el-row :gutter="20" class="marg">
           <el-col :span="14">
             <el-form-item label="附件:">
-              <show-photo v-if="formInline.fileList[0].minioFileName" :minio-file-name="formInline.fileList[0].minioFileName" />
+              <show-photo v-if="formInline.fileList" :minio-file-name="formInline.fileList.length && formInline.fileList[0].minioFileName ? formInline.fileList[0].minioFileName : ''" />
               <span v-else-if="pageType === 'detail'">无</span>
               <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.fileList[0].minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                {{ formInline.fileList[0].minioFileName === '' ? '上传' : '更换附件' }}
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.fileList.length && formInline.fileList[0].minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.fileList.length && formInline.fileList[0].minioFileName ? '上传' : '更换附件' }}
               </el-button>
             </el-form-item>
           </el-col>
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 73b9c0b..b21f663 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -543,6 +543,20 @@
 const addId = ref('')
 // 点击顶部一排按钮
 const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  // 添加校验条件
+  if (fromListInfo.value.fixedAssetsList) {
+    if (!fromListInfo.value.fixedAssetsList[0]?.id) {
+      ElMessage.warning('标准配套设备更换不能为空!')
+      return
+    }
+  }
+  if (fromListInfo.value.fileList) {
+    if (!fromListInfo.value.fileList[0]?.fileName) {
+      ElMessage.warning('申请文档不能为空!')
+      return
+    }
+  }
+
   if (item === '保存' && pageType.value === 'add') {
     if (!formEl) {
       return
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 0f8a9d5..3452009 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -148,7 +148,7 @@
     ABCList.value = response.data
   })
   // 获取检定方式
-  getDictByCode('mesureType').then((response) => {
+  getDictByCode('measureType').then((response) => {
     mesureTypeList.value = response.data
   })
   // 获取专业分类
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index e261313..0c76e05 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -116,7 +116,7 @@
     }
   })
   // 获取检定方式
-  getDictByCode('mesureType').then((response) => {
+  getDictByCode('measureType').then((response) => {
     mesureTypeList.value = response.data
   })
   // 获取管理状态
@@ -199,8 +199,15 @@
 }
 // 重置
 const reset = () => {
-  // searchQuery.fileNo = ''
   validDate.value = ''
+  searchQuery.equipmentNo = '' // 设备编号
+  searchQuery.equipmentName = ''
+  searchQuery.mesureType = ''
+  searchQuery.managerState = ''
+  searchQuery.useDept = ''
+  searchQuery.validStartDate = ''
+  searchQuery.validEndDate = ''
+  searchQuery.abc = ''
   getList()
 }
 // 模板下载
@@ -347,7 +354,7 @@
           <el-date-picker
             v-model="validDate"
             type="daterange"
-            format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+            format="YYYY-MM-DD" value-format="YYYY-MM-DD"
             range-separator="至"
             start-placeholder="有效开始日期"
             end-placeholder="有效结束日期"
diff --git a/src/views/device/stateManage/components/status-interface.ts b/src/views/device/stateManage/components/status-interface.ts
index caa43b1..93410a7 100644
--- a/src/views/device/stateManage/components/status-interface.ts
+++ b/src/views/device/stateManage/components/status-interface.ts
@@ -29,7 +29,7 @@
   equipmentName: string // 设备名称
   equipmentNo: string // 设备编号
   fileList: string // 文件列表
-  id: number // 主键id
+  id: number | string // 主键id
   isDel: number // 删除标记
   managerState: string //  管理状态
   managerStateName: string // 管理状态名称
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 05ba922..c53574f 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -1,5 +1,5 @@
-<!-- 新增或详情弹窗 -->
-<script lang="ts" setup name="add">
+<!-- 新增或详情弹窗 设备借用处理新增编辑 -->
+<script lang="ts" setup name="TemplateAdd">
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import type { EquipmentListRow, IdeviceList, IdeviceListQuery } from './status-interface'
@@ -14,7 +14,7 @@
 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, submitApply } from '@/api/device/borrow'
+import { addApply, deleteApply, detailApply, editApply, failUpdate, submitApply } from '@/api/device/borrow'
 import { addStatus, detailStatus, updateStatus } from '@/api/device/stateManage'
 import type { borrowDeviceType } from '@/views/device/borrow/borrow'
 import useUserStore from '@/store/modules/user'
@@ -60,6 +60,7 @@
   applyType: '', // 申请类型
   applyName: '', // 申请名称
   createUser: userInfo.$state.id,
+  approvalStatus: '',
   createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
   id: '',
 })
@@ -116,21 +117,6 @@
 const usePersonList = ref<userType[]>([]) // 使用人列表
 const useDeptList = ref<deptType[]>([]) // 使用部门列表
 const useDeptListNoTree = ref([]) // 使用部门列表非树结构
-const isWhether = ref<selectType[]>([
-  {
-    name: '是',
-    id: 'shi',
-    value: '1',
-  },
-  {
-    name: '否',
-    id: 'fou',
-    value: '0',
-  },
-])
-const deptProps = reactive({
-  parent: 'pid', value: 'id', label: 'name', children: 'children',
-})
 // 获取下拉框数
 const fetchData = () => {
 // 获取资产类型
@@ -209,7 +195,12 @@
       detailApply({ id: row.id }).then((res) => {
         processId.value = res.data.processId // 流程id存在的时候赋值
         ruleForm2.value = res.data
-        borrowList.value = res.data.equipmentInfoList
+        borrowList.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
+          return {
+            ...item,
+            validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+          }
+        })
       })
     }
   }
@@ -286,28 +277,58 @@
     //  设备借用
     if (!formEl2) { return }
     if (ruleForm2.value.id) {
-      await formEl2.validate((valid, fields) => {
-        if (valid) {
-          ElMessageBox.confirm(
-            '确认提交吗?',
-            '提示',
-            {
-              confirmButtonText: '确认',
-              cancelButtonText: '取消',
-              type: 'warning',
-            },
-          ).then(() => {
-            const params = {
-              id: ruleForm2.value.id,
-              formId: SCHEDULE.DEVICE_BORROW_APPROVAL, // 表单id
-            }
-            submitApply(params).then(() => {
-              ElMessage.success('操作成功!')
-              $router.go(-1)
+      // 如果是编辑-驳回时候发起单独的接口
+      if (ruleForm2.value.approvalStatus === '7') {
+        await formEl2.validate((valid, fields) => {
+          if (valid) {
+            ElMessageBox.confirm(
+              '确认提交吗?',
+              '提示',
+              {
+                confirmButtonText: '确认',
+                cancelButtonText: '取消',
+                type: 'warning',
+              },
+            ).then(() => {
+              ruleForm2.value.applyType = '2'
+              // const params = {
+              //   ...ruleForm2.value,
+              //   equipmentList: borrowList.value.map(item => ({
+              //     equipmentId: item.id,
+              //   })),
+              // }
+              failUpdate({ ...ruleForm2.value }).then(() => {
+                ElMessage.success('操作成功!')
+                $router.go(-1)
+              })
             })
-          })
-        }
-      })
+          }
+        })
+      }
+      else {
+        await formEl2.validate((valid, fields) => {
+          if (valid) {
+            ElMessageBox.confirm(
+              '确认提交吗?',
+              '提示',
+              {
+                confirmButtonText: '确认',
+                cancelButtonText: '取消',
+                type: 'warning',
+              },
+            ).then(() => {
+              const params = {
+                id: ruleForm2.value.id,
+                formId: SCHEDULE.DEVICE_BORROW_APPROVAL, // 表单id
+              }
+              submitApply(params).then(() => {
+                ElMessage.success('操作成功!')
+                $router.go(-1)
+              })
+            })
+          }
+        })
+      }
     }
     else {
       ElMessage.info('请先保存再提交！')
@@ -443,14 +464,15 @@
 }
 const columns = ref<TableColumn[]>([
   {
-    text: '设备名称',
-    value: 'equipmentName',
-    align: 'center',
-  },
-  {
     text: '设备编号',
     value: 'equipmentNo',
     align: 'center',
+    width: 240,
+  },
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
   },
   {
     text: '型号',
@@ -657,9 +679,6 @@
         <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'refuse' })">
           拒绝
         </el-button> -->
-        <el-button v-if="title === '详情' && isPrint" type="primary">
-          打印
-        </el-button>
         <!-- <el-button v-if="title === '详情' && isCancel" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
           提交
         </el-button> -->
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 0c22c33..9696d06 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -571,8 +571,7 @@
                   type="primary"
                   link
                   :disabled="
-                    (row.approvalStatus !== '待审批'
-                      && row.approvalStatus !== '审批中')
+                    (row.approvalStatus !== '审批中')
                       || row.decisionItem === 3"
                   @click="agree(row)"
                 >
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 531fe0d..1bce5f9 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -328,12 +328,5 @@
 </template>
 
 <style lang="scss" scoped>
-.isDetail {
-  ::v-deep {
-    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-      display: none;
-    }
-  }
-}
+// 样式
 </style>

diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index dbce999..5bd4111 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -45,6 +45,15 @@
     data,
   })
 }
+
+// 设备借用驳回后编辑
+export function failUpdate(data: object) {
+  return request({
+    url: '/equipmentApply/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 // 设备借用申请删除
 export function deleteApply(data: object) {
   return request({
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 9049282..7f9431b 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -1,6 +1,6 @@
 // 状态管理相关接口api
 import request from '../index'
-import type { ISearchQuery, ITableRow, Iapprove } from '@/views/device/stateManage/components/status-interface.ts'
+import type { ISearchQuery, Iapprove } from '@/views/device/stateManage/components/status-interface'
 
 // 设备申请列表
 export function getStatusList(data: ISearchQuery) {
@@ -11,7 +11,7 @@
   })
 }
 // 状态管理新建
-export function addStatus(data: ITableRow) {
+export function addStatus(data: Object) {
   return request({
     url: '/meter/stateManage/addStateManageInfo',
     method: 'post',
@@ -20,7 +20,7 @@
 }
 
 // 状态管理编辑
-export function updateStatus(data: ITableRow) {
+export function updateStatus(data: Object) {
   return request({
     url: '/meter/stateManage/updateStateManageInfo',
     method: 'post',
@@ -53,7 +53,7 @@
   })
 }
 // 状态管理详情
-export function detailStatus(data: ITableRow) {
+export function detailStatus(data: object) {
   return request({
     url: '/meter/stateManage/selectStateManageInfo',
     method: 'post',
diff --git a/src/components/SearchArea/SearchItem.vue b/src/components/SearchArea/SearchItem.vue
index 3adef93..dc53b08 100644
--- a/src/components/SearchArea/SearchItem.vue
+++ b/src/components/SearchArea/SearchItem.vue
@@ -23,7 +23,6 @@
   display: inline-block;
   margin-bottom: 10px;
   vertical-align: top;
-  box-sizing: inherit;
   margin-right: 5px;
 }
 
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index 12d7290..e3c72af 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -1,5 +1,9 @@
 // 证书打印查询
 export interface ICertPrintSearch {
+  certificateClass: string
+  certificateNo: string
+  createUserId: number
+  printStatus: number | null
   certificationReportCode: string // 证书编号
   orderNo: string // 委托书编号
   customerName: string // 委托方名称
@@ -13,7 +17,7 @@
   reason: string // 操作原因
   sampleId: string // 样品id
   status: string // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
-  ids?: []
+  ids?: [] | null
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 3daa2b5..391931b 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -22,6 +22,10 @@
 const activeTitle = ref('') // active对应的审批状态名字
 // 查询条件
 const listQuery = ref<ICertPrintSearch>({
+  certificateClass: '',
+  certificateNo: '', // 证书编号
+  createUserId: 0,
+  printStatus: 0, // 可打印(证书可打印传0,全部传null)
   certificationReportCode: '', // 证书编号
   orderNo: '', // 委托书编号
   customerName: '', // 委托方名称
@@ -30,11 +34,12 @@
   certificateReportType: '', // 证书类型
   printNum: '', // 打印次数 -未打印和全部用
   approvalStatus: '', // 审批状态-审批查询用
-  orderId: '0', // 委托书id
+  orderId: '', // 委托书id
   reason: '', // 操作原因
-  sampleId: '0', // 样品id
+  sampleId: '', // 样品id
   status: '', // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
   formId: SCHEDULE.BUSINESS_CERT_PRINT,
+  ids: null, // 设置默认值
   offset: 1,
   limit: 20,
 })
@@ -78,22 +83,30 @@
         }
       }
     })
+    if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+      active.value = window.sessionStorage.getItem('buttonBoxActive')!
+      activeTitle.value === '未通过'
+    }
+    else {
+      active.value = menu.value.find(item => item.name === '可打印')!.id // 可打印
+      activeTitle.value === '可打印'
+    }
   })
 }
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationReportCode', width: '110', align: 'center' },
-  { text: '证书名称', value: 'certificationReportName', width: '120', align: 'center' },
+  { text: '证书编号', value: 'certificateNo', width: '110', align: 'center' },
+  { text: '证书名称', value: 'certificateName', width: '120', align: 'center' },
   { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', width: '120', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', width: '120', align: 'center' },
   { text: '委托书编号', value: 'orderNo', width: '120', align: 'center' },
-  { text: '检校类别', value: 'customerNo', width: '120', align: 'center' },
-  { text: '检定人员', value: 'customerName', width: '120', align: 'center' },
-  { text: '证书类型', value: 'certificateReportTypeName', width: '120', align: 'center' },
-  { text: '打印状态', value: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
+  { text: '检校类别', value: 'measureType', width: '120', align: 'center' },
+  { text: '检定人员', value: 'measurePersonId', width: '120', align: 'center' },
+  { text: '证书类型', value: 'certificateType', width: '120', align: 'center' },
+  { text: '打印状态', value: 'printNum', align: 'center', width: '85px', filter: (row: ICerPrintList) => { var cnum = ['未打印', '一', '二', '三', '四', '五', '六', '七', '八', '九', '十']; return row.printNum == 0 ? '未打印' : `${cnum[parseInt(row.printNum)]}次打印` } },
   { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
 ])
 // 表格数据
@@ -107,37 +120,35 @@
 
 // 根据过滤查询条件
 function filterQuery() {
-  console.log(activeTitle)
+  const approvalStatus = menu.value.find(item => item.name === activeTitle.value)!.id
+  listQuery.value.approvalStatus = approvalStatus
   switch (activeTitle.value) {
     case '可打印':
-      listQuery.value.printNum = 0
+      listQuery.value.printStatus = 0
       listQuery.value.approvalStatus = ''
       break
     case '全部':
-      listQuery.value.printNum = 0
+      listQuery.value.printStatus = 2
       listQuery.value.approvalStatus = ''
       break
     case '待审批':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '1'
+      listQuery.value.printStatus = 2
       break
     case '审批中':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '2'
+      listQuery.value.printStatus = 2
       break
     case '已通过':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '3'
+      listQuery.value.printStatus = 2
       break
     case '未通过':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '4'
+      listQuery.value.printStatus = 2
       break
   }
 }
 
 // 数据查询
 function fetchData(isNowPage = false) {
+  console.log(listQuery)
   filterQuery()
   loadingTable.value = true
   if (!isNowPage) {
@@ -146,15 +157,11 @@
   }
   // 模拟数据
   loadingTable.value = false
-  list.value = [
-    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '0', printStatusName: '未打印', certificateReportTypeName: '自检', approvalStatusName: '待审批', taskId: '100', id: '10' },
-    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '1', printStatusName: '已打印', certificateReportTypeName: '自检', approvalStatusName: '待审批', taskId: '1001', id: '101' },
-  ]
-  // getCertList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getCertList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -167,7 +174,12 @@
 }
 // 点击重置
 const clearList = () => {
+  const approvalStatus = menu.value.find(item => item.name === activeTitle.value)!.id
   listQuery.value = {
+    certificateClass: '',
+    certificateNo: '', // 证书编号
+    createUserId: 0,
+    printStatus: 0, // 可打印(证书可打印传0,全部传null)
     certificationReportCode: '', // 证书编号
     orderNo: '', // 委托书编号
     customerName: '', // 委托方名称
@@ -176,14 +188,18 @@
     certificateReportType: '', // 证书类型
     printNum: '', // 打印次数 -未打印和全部用
     approvalStatus: '', // 审批状态-审批查询用
-    orderId: '0', // 委托书id
+    orderId: '', // 委托书id
     reason: '', // 操作原因
-    sampleId: '0', // 样品id
+    sampleId: '', // 样品id
     status: '', // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
     formId: SCHEDULE.BUSINESS_CERT_PRINT,
     offset: 1,
     limit: 20,
   }
+  listQuery.value.approvalStatus = approvalStatus
+  if (activeTitle.value === '可打印' || activeTitle.value === '全部') {
+    listQuery.value.approvalStatus = ''
+  }
   fetchData(true)
 }
 // 点击详情
@@ -226,14 +242,14 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   if (list.value.length > 0) {
-    // const params = {
-    //   ...listQuery.value,
-    //   ids: checkoutList.value,
-    // }
-    // exportCert(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '证书打印列表.xlsx')
-    // })
+    const params = {
+      ...listQuery.value,
+      ids: checkoutList.value,
+    }
+    exportCert(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '证书打印列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
@@ -243,10 +259,9 @@
 
 // 打印
 const bindLabel = (row: ICerPrintList) => {
-  console.log(1)
-  row.printNum = 1
+  console.log(row)
   // 判断状态第一次可以直接打印,之后的打印需要审批
-  if (row.printNum == 1) {
+  if (row.printNum == 0) {
     ElMessageBox.confirm(
       '确定要打印吗？',
       '确认操作',
@@ -319,18 +334,9 @@
 
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
-    active.value = window.sessionStorage.getItem('buttonBoxActive')!
-  }
-  else {
-    active.value = menu.value.find(item => item.name === '可打印')!.id // 可打
-    activeTitle.value === '可打印'
-  }
+
   fetchData(true)
 })
-onUnmounted(() => {
-  window.sessionStorage.setItem('buttonBoxActive', '') // 清除
-})
 </script>
 
 <template>
@@ -342,7 +348,7 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.certificationReportCode"
+          v-model.trim="listQuery.certificateNo"
           placeholder="证书编号"
           class="short-input"
           clearable
@@ -373,7 +379,7 @@
         />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 120px;" clearable>
+        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 160px;" clearable>
           <el-option v-for="item in certificationClassList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
@@ -388,19 +394,19 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column v-if="listQuery.printNum === ''" label="审批状态" align="center" width="90px" prop="approvalStatusName" />
+          <el-table-column label="审批状态" align="center" width="90px" prop="approvalStatusName" />
           <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.printNum === 0 || (listQuery.approvalStatus === '3')" size="small" link type="primary" @click="bindLabel(row)">
+              <el-button v-if="activeTitle === '全部' || activeTitle === '可打印'" size="small" link type="primary" @click="bindLabel(row)">
                 打印
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'agree')">
+              <el-button v-if="activeTitle === '待审批'" size="small" type="primary" link @click="handleDistribute(row, 'agree')">
                 同意
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'refuse')">
+              <el-button v-if="activeTitle === '待审批'" size="small" type="primary" link @click="handleDistribute(row, 'refuse')">
                 拒绝
               </el-button>
             </template>
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 2f8f8a4..fa8e6b0 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -392,4 +392,7 @@
 
 <style lang="scss" scoped>
 // 样式
+.short-input {
+  width: 180px !important;
+}
 </style>
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 2e8e4a7..5d7fc0f 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,5 +1,5 @@
 <!-- 设备借用处理 -->
-<script lang="ts" setup name="borrowApply">
+<script lang="ts" setup name="BorrowHandle">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
@@ -44,7 +44,7 @@
   applyPersonName: '', // 申请人姓名
   startTime: '', // 领用开始日期
   endTime: '', // 领用结束日期
-  approvalStatus: '4', // 	审批状态
+  approvalStatus: '4', // 	审批状态 (已完成)
   processResult: '1' || active.value, // 	处置结果 (3个状态字典值)
   applyType: '2', // 申请类型 借用2
   createUser: '', // 创建人
@@ -373,7 +373,7 @@
     active.value = window.sessionStorage.getItem('buttonBoxActive')!
   }
   else {
-    active.value = menu.value.find(item => item.name === '待借用')!.id // 全部
+    active.value = menu.value.find(item => item.name === '待借用')!.id // 待借用
     activeTitle.value === '待借用'
   }
   nextTick(() => {
@@ -394,6 +394,7 @@
         <el-input
           v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
+          class="short-input"
           clearable
         />
       </search-item>
@@ -401,6 +402,7 @@
         <el-input
           v-model.trim="listQuery.applyName"
           placeholder="申请名称"
+          class="short-input"
           clearable
         />
       </search-item>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index aae69c7..a59267d 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,5 +1,5 @@
 <!-- 设备借用申请 -->
-<script lang="ts" setup name="borrowApply">
+<script lang="ts" setup name="BorrowApply">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
@@ -49,7 +49,7 @@
   applyPersonName: '', // 申请人姓名
   startTime: '', // 领用开始日期
   endTime: '', // 领用结束日期
-  approvalStatus: active.value, // 	审批状态
+  approvalStatus: active.value, // 	审批状态 1 2 3 对应待借用|已借用|已归还
   processResult: '', // 	处置结果
   applyType: '2', // 申请类型 借用2
   createUser: '', // 创建人
@@ -156,7 +156,7 @@
     applyPerson: '', // 申请人
     startTime: '', // 申请开始日期
     endTime: '', // 申请结束日期
-    approvalStatus: active.value, // 	审批状态
+    approvalStatus: active.value, // 	审批状态  // 	审批状态 1 2 3 对应待借用|已借用|已归还
     processResult: '', // 	处置结果
     applyType: '2', // 申请类型 借用2
     createUser: '', // 创建人
@@ -193,27 +193,8 @@
   })
 }
 
-onMounted(async () => {
-  await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
-    active.value = window.sessionStorage.getItem('buttonBoxActive')!
-  }
-  else {
-    active.value = menu.value.find(item => item.name === '全部')!.id // 全部
-    activeTitle.value === '全部'
-  }
-  nextTick(() => {
-    fetchData(true) // 获取表格数据
-    fetchDeptTreeList() // 获取使用部门
-    fetchUserList() // 获取人员列表
-  })
-})
 const $router = useRouter()
 
-onUnmounted(() => {
-  window.sessionStorage.setItem('buttonBoxActive', '') // 清除
-})
-
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
@@ -434,6 +415,21 @@
     }
   }
 }
+onMounted(async () => {
+  await getDict() // 获取字典-审批状态
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+    active.value = window.sessionStorage.getItem('buttonBoxActive')!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '全部')!.id // 全部
+    activeTitle.value === '全部'
+  }
+  nextTick(() => {
+    fetchData(true) // 获取表格数据
+    fetchDeptTreeList() // 获取使用部门
+    fetchUserList() // 获取人员列表
+  })
+})
 </script>
 
 <template>
@@ -446,6 +442,7 @@
         <el-input
           v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
+          class="short-input"
           clearable
         />
       </search-item>
@@ -453,6 +450,7 @@
         <el-input
           v-model.trim="listQuery.applyName"
           placeholder="申请名称"
+          class="short-input"
           clearable
         />
       </search-item>
@@ -506,7 +504,7 @@
           <el-table-column
             label="操作"
             align="center"
-            :width="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 70 : 200"
+            :width="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 140 : 200"
             fixed="right"
           >
             <template #default="{ row }">
@@ -557,6 +555,17 @@
               >
                 编辑
               </el-button>
+
+              <el-button
+                v-if="proxy.hasPerm('/device/borrow/borrowapply/update') && activeTitle === '未通过'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName.search('驳回') === -1 "
+                @click="handleEdit(row, '编辑', 'edit')"
+              >
+                编辑
+              </el-button>
               <el-button
                 v-if="proxy.hasPerm('/device/borrow/borrowapply/update') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
                 size="small"
diff --git a/src/views/device/borrow/components/approvalActionDialog.vue b/src/views/device/borrow/components/approvalActionDialog.vue
deleted file mode 100644
index 9375861..0000000
--- a/src/views/device/borrow/components/approvalActionDialog.vue
+++ /dev/null
@@ -1,109 +0,0 @@
-<!-- 审批操作弹窗 -->
-<script lang="ts" setup>
-import type { FormInstance, FormRules } from 'element-plus'
-import dayjs from 'dayjs'
-import useUserStore from '@/store/modules/user'
-const emits = defineEmits(['resetData'])
-const userInfo = useUserStore()
-const dialogVisibleApprove = ref(false)
-const form = reactive({
-  radio: '1',
-  certificateNo: '',
-  certificateName: '',
-  certificateCompany: '',
-  certificateDate: '',
-  validDate: '',
-})
-const ruleFormRef = ref<FormInstance>()
-const rules = reactive<FormRules>({
-})
-// 重置
-const resetData = () => {
-  form.certificateNo = ''
-  form.certificateName = ''
-  form.certificateCompany = ''
-  form.certificateDate = ''
-  form.validDate = ''
-}
-const approvetime = ref('') // 审批时间
-const initDialog = (row: any) => {
-  dialogVisibleApprove.value = true
-  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
-  form.radio = row.radio
-}
-defineExpose({ initDialog })
-
-// 点击保存
-const submitForm = async (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  await formEl.validate((valid, fields) => {
-    if (valid) {
-      dialogVisibleApprove.value = false
-      emits('resetData')
-    }
-  })
-}
-// 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  formEl.resetFields()
-  dialogVisibleApprove.value = false
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
-    <el-form
-      ref="ruleFormRef" :model="form"
-      :rules="rules" label-width="110px"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见">
-            <el-radio-group v-model="form.radio" style="width: 100%;">
-              <el-radio label="1">
-                同意
-              </el-radio>
-              <el-radio label="2">
-                拒绝
-              </el-radio>
-              <el-radio label="3">
-                驳回
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论">
-            <el-input
-              :rows="4"
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人">
-            <el-input disabled :value="userInfo.$state.name" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间">
-            <el-input disabled :value="approvetime" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
-        <el-button @click="resetForm(ruleFormRef)">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/device/borrow/editHandle.vue b/src/views/device/borrow/editHandle.vue
index d2e423c..9a5b2a6 100644
--- a/src/views/device/borrow/editHandle.vue
+++ b/src/views/device/borrow/editHandle.vue
@@ -1,4 +1,5 @@
-<script lang="ts" setup name="Detail">
+<!-- 设备借用处理详情/编辑 -->
+<script lang="ts" setup name="EditHandle">
 import { onMounted, ref } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { ElLoading } from 'element-plus'
@@ -17,7 +18,6 @@
 const { proxy } = getCurrentInstance() as any
 const useDeptList = ref<deptType[]>([]) // 部门列表
 const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
-const total = ref(20)// 总数
 // 表单数据
 const form = ref({
   id: '',
@@ -29,19 +29,7 @@
   applyDesc: '', // 申请说明
 })
 const list = ref<IdeviceList[]>([])// 表格数据
-// 查询条件
-const listQuery: Ref<IdeviceListQuery> = ref({
-  equipmentName: '', // 仪器名称
-  equipmentNo: '', // 设备编号
-  modelNo: '', // 型号
-  mesureRange: '', // 测量范围
-  useDeptName: '', // 使用部门
-  usePersonName: '', // 使用人
-  managerStateName: '', // 管理状态
-  validDate: '', // 有效日期
-  offset: 1,
-  limit: 20,
-})
+
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '设备编号', value: 'equipmentNo', align: 'center', width: '230' },
@@ -82,11 +70,11 @@
   $router.back()
 }
 
-// 打印
+// 设备借用处理详情打印
 const printObj = ref({
   id: 'lysq', // 需要打印元素的id
   popTitle: '设备借用处理', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备借用处理</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备借用处理详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
@@ -125,7 +113,7 @@
   <app-container>
     <detail-page title="设备借用处理-详情">
       <template #btns>
-        <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/device/borrow/borrowhandle/print')" v-print="printObj" type="primary">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -225,22 +213,6 @@
     background-color: #fff;
     // padding: 10px;
 
-    .title-button {
-      display: flex;
-      align-items: center;
-
-      &::before {
-        content: "";
-        flex: 1;
-      }
-
-      .button-group {
-        flex: 1;
-        display: flex;
-        justify-content: flex-end;
-      }
-    }
-
     .form-area {
       margin-top: 40px;
     }
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index b76ab3e..18879cc 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -352,6 +352,7 @@
   formInline.value.acceptanceCheckId = object.id
   checkIdObject.value = object
   // 获取到详情
+
   equipmentApplyInfo({ id: object.id }).then((res) => {
     res.data.equipmentInfoList.map((item: objectReturn) => {
       if (item.id) {
@@ -492,11 +493,11 @@
         <el-row :gutter="20" class="marg">
           <el-col :span="14">
             <el-form-item label="附件:">
-              <show-photo v-if="formInline.fileList[0].minioFileName" :minio-file-name="formInline.fileList[0].minioFileName" />
+              <show-photo v-if="formInline.fileList" :minio-file-name="formInline.fileList.length && formInline.fileList[0].minioFileName ? formInline.fileList[0].minioFileName : ''" />
               <span v-else-if="pageType === 'detail'">无</span>
               <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.fileList[0].minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                {{ formInline.fileList[0].minioFileName === '' ? '上传' : '更换附件' }}
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.fileList.length && formInline.fileList[0].minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.fileList.length && formInline.fileList[0].minioFileName ? '上传' : '更换附件' }}
               </el-button>
             </el-form-item>
           </el-col>
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 73b9c0b..b21f663 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -543,6 +543,20 @@
 const addId = ref('')
 // 点击顶部一排按钮
 const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  // 添加校验条件
+  if (fromListInfo.value.fixedAssetsList) {
+    if (!fromListInfo.value.fixedAssetsList[0]?.id) {
+      ElMessage.warning('标准配套设备更换不能为空!')
+      return
+    }
+  }
+  if (fromListInfo.value.fileList) {
+    if (!fromListInfo.value.fileList[0]?.fileName) {
+      ElMessage.warning('申请文档不能为空!')
+      return
+    }
+  }
+
   if (item === '保存' && pageType.value === 'add') {
     if (!formEl) {
       return
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 0f8a9d5..3452009 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -148,7 +148,7 @@
     ABCList.value = response.data
   })
   // 获取检定方式
-  getDictByCode('mesureType').then((response) => {
+  getDictByCode('measureType').then((response) => {
     mesureTypeList.value = response.data
   })
   // 获取专业分类
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index e261313..0c76e05 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -116,7 +116,7 @@
     }
   })
   // 获取检定方式
-  getDictByCode('mesureType').then((response) => {
+  getDictByCode('measureType').then((response) => {
     mesureTypeList.value = response.data
   })
   // 获取管理状态
@@ -199,8 +199,15 @@
 }
 // 重置
 const reset = () => {
-  // searchQuery.fileNo = ''
   validDate.value = ''
+  searchQuery.equipmentNo = '' // 设备编号
+  searchQuery.equipmentName = ''
+  searchQuery.mesureType = ''
+  searchQuery.managerState = ''
+  searchQuery.useDept = ''
+  searchQuery.validStartDate = ''
+  searchQuery.validEndDate = ''
+  searchQuery.abc = ''
   getList()
 }
 // 模板下载
@@ -347,7 +354,7 @@
           <el-date-picker
             v-model="validDate"
             type="daterange"
-            format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+            format="YYYY-MM-DD" value-format="YYYY-MM-DD"
             range-separator="至"
             start-placeholder="有效开始日期"
             end-placeholder="有效结束日期"
diff --git a/src/views/device/stateManage/components/status-interface.ts b/src/views/device/stateManage/components/status-interface.ts
index caa43b1..93410a7 100644
--- a/src/views/device/stateManage/components/status-interface.ts
+++ b/src/views/device/stateManage/components/status-interface.ts
@@ -29,7 +29,7 @@
   equipmentName: string // 设备名称
   equipmentNo: string // 设备编号
   fileList: string // 文件列表
-  id: number // 主键id
+  id: number | string // 主键id
   isDel: number // 删除标记
   managerState: string //  管理状态
   managerStateName: string // 管理状态名称
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 05ba922..c53574f 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -1,5 +1,5 @@
-<!-- 新增或详情弹窗 -->
-<script lang="ts" setup name="add">
+<!-- 新增或详情弹窗 设备借用处理新增编辑 -->
+<script lang="ts" setup name="TemplateAdd">
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import type { EquipmentListRow, IdeviceList, IdeviceListQuery } from './status-interface'
@@ -14,7 +14,7 @@
 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, submitApply } from '@/api/device/borrow'
+import { addApply, deleteApply, detailApply, editApply, failUpdate, submitApply } from '@/api/device/borrow'
 import { addStatus, detailStatus, updateStatus } from '@/api/device/stateManage'
 import type { borrowDeviceType } from '@/views/device/borrow/borrow'
 import useUserStore from '@/store/modules/user'
@@ -60,6 +60,7 @@
   applyType: '', // 申请类型
   applyName: '', // 申请名称
   createUser: userInfo.$state.id,
+  approvalStatus: '',
   createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
   id: '',
 })
@@ -116,21 +117,6 @@
 const usePersonList = ref<userType[]>([]) // 使用人列表
 const useDeptList = ref<deptType[]>([]) // 使用部门列表
 const useDeptListNoTree = ref([]) // 使用部门列表非树结构
-const isWhether = ref<selectType[]>([
-  {
-    name: '是',
-    id: 'shi',
-    value: '1',
-  },
-  {
-    name: '否',
-    id: 'fou',
-    value: '0',
-  },
-])
-const deptProps = reactive({
-  parent: 'pid', value: 'id', label: 'name', children: 'children',
-})
 // 获取下拉框数
 const fetchData = () => {
 // 获取资产类型
@@ -209,7 +195,12 @@
       detailApply({ id: row.id }).then((res) => {
         processId.value = res.data.processId // 流程id存在的时候赋值
         ruleForm2.value = res.data
-        borrowList.value = res.data.equipmentInfoList
+        borrowList.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
+          return {
+            ...item,
+            validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+          }
+        })
       })
     }
   }
@@ -286,28 +277,58 @@
     //  设备借用
     if (!formEl2) { return }
     if (ruleForm2.value.id) {
-      await formEl2.validate((valid, fields) => {
-        if (valid) {
-          ElMessageBox.confirm(
-            '确认提交吗?',
-            '提示',
-            {
-              confirmButtonText: '确认',
-              cancelButtonText: '取消',
-              type: 'warning',
-            },
-          ).then(() => {
-            const params = {
-              id: ruleForm2.value.id,
-              formId: SCHEDULE.DEVICE_BORROW_APPROVAL, // 表单id
-            }
-            submitApply(params).then(() => {
-              ElMessage.success('操作成功!')
-              $router.go(-1)
+      // 如果是编辑-驳回时候发起单独的接口
+      if (ruleForm2.value.approvalStatus === '7') {
+        await formEl2.validate((valid, fields) => {
+          if (valid) {
+            ElMessageBox.confirm(
+              '确认提交吗?',
+              '提示',
+              {
+                confirmButtonText: '确认',
+                cancelButtonText: '取消',
+                type: 'warning',
+              },
+            ).then(() => {
+              ruleForm2.value.applyType = '2'
+              // const params = {
+              //   ...ruleForm2.value,
+              //   equipmentList: borrowList.value.map(item => ({
+              //     equipmentId: item.id,
+              //   })),
+              // }
+              failUpdate({ ...ruleForm2.value }).then(() => {
+                ElMessage.success('操作成功!')
+                $router.go(-1)
+              })
             })
-          })
-        }
-      })
+          }
+        })
+      }
+      else {
+        await formEl2.validate((valid, fields) => {
+          if (valid) {
+            ElMessageBox.confirm(
+              '确认提交吗?',
+              '提示',
+              {
+                confirmButtonText: '确认',
+                cancelButtonText: '取消',
+                type: 'warning',
+              },
+            ).then(() => {
+              const params = {
+                id: ruleForm2.value.id,
+                formId: SCHEDULE.DEVICE_BORROW_APPROVAL, // 表单id
+              }
+              submitApply(params).then(() => {
+                ElMessage.success('操作成功!')
+                $router.go(-1)
+              })
+            })
+          }
+        })
+      }
     }
     else {
       ElMessage.info('请先保存再提交！')
@@ -443,14 +464,15 @@
 }
 const columns = ref<TableColumn[]>([
   {
-    text: '设备名称',
-    value: 'equipmentName',
-    align: 'center',
-  },
-  {
     text: '设备编号',
     value: 'equipmentNo',
     align: 'center',
+    width: 240,
+  },
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
   },
   {
     text: '型号',
@@ -657,9 +679,6 @@
         <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'refuse' })">
           拒绝
         </el-button> -->
-        <el-button v-if="title === '详情' && isPrint" type="primary">
-          打印
-        </el-button>
         <!-- <el-button v-if="title === '详情' && isCancel" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
           提交
         </el-button> -->
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 0c22c33..9696d06 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -571,8 +571,7 @@
                   type="primary"
                   link
                   :disabled="
-                    (row.approvalStatus !== '待审批'
-                      && row.approvalStatus !== '审批中')
+                    (row.approvalStatus !== '审批中')
                       || row.decisionItem === 3"
                   @click="agree(row)"
                 >
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 531fe0d..1bce5f9 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -328,12 +328,5 @@
 </template>
 
 <style lang="scss" scoped>
-.isDetail {
-  ::v-deep {
-    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-      display: none;
-    }
-  }
-}
+// 样式
 </style>
diff --git a/src/views/measure/file/components/approve/addDialog.vue b/src/views/measure/file/components/approve/addDialog.vue
index c4d646a..6e8414b 100644
--- a/src/views/measure/file/components/approve/addDialog.vue
+++ b/src/views/measure/file/components/approve/addDialog.vue
@@ -211,9 +211,15 @@
   approvalDialog.value.initDialog(type, processId)
 }
 // 打印
-const print = () => {
-  printHtml('print')
-}
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: `文件审批${title.value}`, // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备领用详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -299,7 +305,7 @@
           </el-button>
         </div>
         <div v-if="approvalStatusName === '已通过' || approvalStatusName === '未通过'">
-          <el-button type="primary" @click="print">
+          <el-button v-print="printObj" type="primary">
             打印
           </el-button>
           <el-button type="info" @click="resetForm(ruleFormRef)">

diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index dbce999..5bd4111 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -45,6 +45,15 @@
     data,
   })
 }
+
+// 设备借用驳回后编辑
+export function failUpdate(data: object) {
+  return request({
+    url: '/equipmentApply/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 // 设备借用申请删除
 export function deleteApply(data: object) {
   return request({
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 9049282..7f9431b 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -1,6 +1,6 @@
 // 状态管理相关接口api
 import request from '../index'
-import type { ISearchQuery, ITableRow, Iapprove } from '@/views/device/stateManage/components/status-interface.ts'
+import type { ISearchQuery, Iapprove } from '@/views/device/stateManage/components/status-interface'
 
 // 设备申请列表
 export function getStatusList(data: ISearchQuery) {
@@ -11,7 +11,7 @@
   })
 }
 // 状态管理新建
-export function addStatus(data: ITableRow) {
+export function addStatus(data: Object) {
   return request({
     url: '/meter/stateManage/addStateManageInfo',
     method: 'post',
@@ -20,7 +20,7 @@
 }
 
 // 状态管理编辑
-export function updateStatus(data: ITableRow) {
+export function updateStatus(data: Object) {
   return request({
     url: '/meter/stateManage/updateStateManageInfo',
     method: 'post',
@@ -53,7 +53,7 @@
   })
 }
 // 状态管理详情
-export function detailStatus(data: ITableRow) {
+export function detailStatus(data: object) {
   return request({
     url: '/meter/stateManage/selectStateManageInfo',
     method: 'post',
diff --git a/src/components/SearchArea/SearchItem.vue b/src/components/SearchArea/SearchItem.vue
index 3adef93..dc53b08 100644
--- a/src/components/SearchArea/SearchItem.vue
+++ b/src/components/SearchArea/SearchItem.vue
@@ -23,7 +23,6 @@
   display: inline-block;
   margin-bottom: 10px;
   vertical-align: top;
-  box-sizing: inherit;
   margin-right: 5px;
 }
 
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index 12d7290..e3c72af 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -1,5 +1,9 @@
 // 证书打印查询
 export interface ICertPrintSearch {
+  certificateClass: string
+  certificateNo: string
+  createUserId: number
+  printStatus: number | null
   certificationReportCode: string // 证书编号
   orderNo: string // 委托书编号
   customerName: string // 委托方名称
@@ -13,7 +17,7 @@
   reason: string // 操作原因
   sampleId: string // 样品id
   status: string // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
-  ids?: []
+  ids?: [] | null
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 3daa2b5..391931b 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -22,6 +22,10 @@
 const activeTitle = ref('') // active对应的审批状态名字
 // 查询条件
 const listQuery = ref<ICertPrintSearch>({
+  certificateClass: '',
+  certificateNo: '', // 证书编号
+  createUserId: 0,
+  printStatus: 0, // 可打印(证书可打印传0,全部传null)
   certificationReportCode: '', // 证书编号
   orderNo: '', // 委托书编号
   customerName: '', // 委托方名称
@@ -30,11 +34,12 @@
   certificateReportType: '', // 证书类型
   printNum: '', // 打印次数 -未打印和全部用
   approvalStatus: '', // 审批状态-审批查询用
-  orderId: '0', // 委托书id
+  orderId: '', // 委托书id
   reason: '', // 操作原因
-  sampleId: '0', // 样品id
+  sampleId: '', // 样品id
   status: '', // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
   formId: SCHEDULE.BUSINESS_CERT_PRINT,
+  ids: null, // 设置默认值
   offset: 1,
   limit: 20,
 })
@@ -78,22 +83,30 @@
         }
       }
     })
+    if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+      active.value = window.sessionStorage.getItem('buttonBoxActive')!
+      activeTitle.value === '未通过'
+    }
+    else {
+      active.value = menu.value.find(item => item.name === '可打印')!.id // 可打印
+      activeTitle.value === '可打印'
+    }
   })
 }
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationReportCode', width: '110', align: 'center' },
-  { text: '证书名称', value: 'certificationReportName', width: '120', align: 'center' },
+  { text: '证书编号', value: 'certificateNo', width: '110', align: 'center' },
+  { text: '证书名称', value: 'certificateName', width: '120', align: 'center' },
   { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', width: '120', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', width: '120', align: 'center' },
   { text: '委托书编号', value: 'orderNo', width: '120', align: 'center' },
-  { text: '检校类别', value: 'customerNo', width: '120', align: 'center' },
-  { text: '检定人员', value: 'customerName', width: '120', align: 'center' },
-  { text: '证书类型', value: 'certificateReportTypeName', width: '120', align: 'center' },
-  { text: '打印状态', value: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
+  { text: '检校类别', value: 'measureType', width: '120', align: 'center' },
+  { text: '检定人员', value: 'measurePersonId', width: '120', align: 'center' },
+  { text: '证书类型', value: 'certificateType', width: '120', align: 'center' },
+  { text: '打印状态', value: 'printNum', align: 'center', width: '85px', filter: (row: ICerPrintList) => { var cnum = ['未打印', '一', '二', '三', '四', '五', '六', '七', '八', '九', '十']; return row.printNum == 0 ? '未打印' : `${cnum[parseInt(row.printNum)]}次打印` } },
   { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
 ])
 // 表格数据
@@ -107,37 +120,35 @@
 
 // 根据过滤查询条件
 function filterQuery() {
-  console.log(activeTitle)
+  const approvalStatus = menu.value.find(item => item.name === activeTitle.value)!.id
+  listQuery.value.approvalStatus = approvalStatus
   switch (activeTitle.value) {
     case '可打印':
-      listQuery.value.printNum = 0
+      listQuery.value.printStatus = 0
       listQuery.value.approvalStatus = ''
       break
     case '全部':
-      listQuery.value.printNum = 0
+      listQuery.value.printStatus = 2
       listQuery.value.approvalStatus = ''
       break
     case '待审批':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '1'
+      listQuery.value.printStatus = 2
       break
     case '审批中':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '2'
+      listQuery.value.printStatus = 2
       break
     case '已通过':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '3'
+      listQuery.value.printStatus = 2
       break
     case '未通过':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '4'
+      listQuery.value.printStatus = 2
       break
   }
 }
 
 // 数据查询
 function fetchData(isNowPage = false) {
+  console.log(listQuery)
   filterQuery()
   loadingTable.value = true
   if (!isNowPage) {
@@ -146,15 +157,11 @@
   }
   // 模拟数据
   loadingTable.value = false
-  list.value = [
-    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '0', printStatusName: '未打印', certificateReportTypeName: '自检', approvalStatusName: '待审批', taskId: '100', id: '10' },
-    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '1', printStatusName: '已打印', certificateReportTypeName: '自检', approvalStatusName: '待审批', taskId: '1001', id: '101' },
-  ]
-  // getCertList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getCertList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -167,7 +174,12 @@
 }
 // 点击重置
 const clearList = () => {
+  const approvalStatus = menu.value.find(item => item.name === activeTitle.value)!.id
   listQuery.value = {
+    certificateClass: '',
+    certificateNo: '', // 证书编号
+    createUserId: 0,
+    printStatus: 0, // 可打印(证书可打印传0,全部传null)
     certificationReportCode: '', // 证书编号
     orderNo: '', // 委托书编号
     customerName: '', // 委托方名称
@@ -176,14 +188,18 @@
     certificateReportType: '', // 证书类型
     printNum: '', // 打印次数 -未打印和全部用
     approvalStatus: '', // 审批状态-审批查询用
-    orderId: '0', // 委托书id
+    orderId: '', // 委托书id
     reason: '', // 操作原因
-    sampleId: '0', // 样品id
+    sampleId: '', // 样品id
     status: '', // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
     formId: SCHEDULE.BUSINESS_CERT_PRINT,
     offset: 1,
     limit: 20,
   }
+  listQuery.value.approvalStatus = approvalStatus
+  if (activeTitle.value === '可打印' || activeTitle.value === '全部') {
+    listQuery.value.approvalStatus = ''
+  }
   fetchData(true)
 }
 // 点击详情
@@ -226,14 +242,14 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   if (list.value.length > 0) {
-    // const params = {
-    //   ...listQuery.value,
-    //   ids: checkoutList.value,
-    // }
-    // exportCert(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '证书打印列表.xlsx')
-    // })
+    const params = {
+      ...listQuery.value,
+      ids: checkoutList.value,
+    }
+    exportCert(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '证书打印列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
@@ -243,10 +259,9 @@
 
 // 打印
 const bindLabel = (row: ICerPrintList) => {
-  console.log(1)
-  row.printNum = 1
+  console.log(row)
   // 判断状态第一次可以直接打印,之后的打印需要审批
-  if (row.printNum == 1) {
+  if (row.printNum == 0) {
     ElMessageBox.confirm(
       '确定要打印吗？',
       '确认操作',
@@ -319,18 +334,9 @@
 
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
-    active.value = window.sessionStorage.getItem('buttonBoxActive')!
-  }
-  else {
-    active.value = menu.value.find(item => item.name === '可打印')!.id // 可打
-    activeTitle.value === '可打印'
-  }
+
   fetchData(true)
 })
-onUnmounted(() => {
-  window.sessionStorage.setItem('buttonBoxActive', '') // 清除
-})
 </script>
 
 <template>
@@ -342,7 +348,7 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.certificationReportCode"
+          v-model.trim="listQuery.certificateNo"
           placeholder="证书编号"
           class="short-input"
           clearable
@@ -373,7 +379,7 @@
         />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 120px;" clearable>
+        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 160px;" clearable>
           <el-option v-for="item in certificationClassList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
@@ -388,19 +394,19 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column v-if="listQuery.printNum === ''" label="审批状态" align="center" width="90px" prop="approvalStatusName" />
+          <el-table-column label="审批状态" align="center" width="90px" prop="approvalStatusName" />
           <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.printNum === 0 || (listQuery.approvalStatus === '3')" size="small" link type="primary" @click="bindLabel(row)">
+              <el-button v-if="activeTitle === '全部' || activeTitle === '可打印'" size="small" link type="primary" @click="bindLabel(row)">
                 打印
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'agree')">
+              <el-button v-if="activeTitle === '待审批'" size="small" type="primary" link @click="handleDistribute(row, 'agree')">
                 同意
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'refuse')">
+              <el-button v-if="activeTitle === '待审批'" size="small" type="primary" link @click="handleDistribute(row, 'refuse')">
                 拒绝
               </el-button>
             </template>
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 2f8f8a4..fa8e6b0 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -392,4 +392,7 @@
 
 <style lang="scss" scoped>
 // 样式
+.short-input {
+  width: 180px !important;
+}
 </style>
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 2e8e4a7..5d7fc0f 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,5 +1,5 @@
 <!-- 设备借用处理 -->
-<script lang="ts" setup name="borrowApply">
+<script lang="ts" setup name="BorrowHandle">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
@@ -44,7 +44,7 @@
   applyPersonName: '', // 申请人姓名
   startTime: '', // 领用开始日期
   endTime: '', // 领用结束日期
-  approvalStatus: '4', // 	审批状态
+  approvalStatus: '4', // 	审批状态 (已完成)
   processResult: '1' || active.value, // 	处置结果 (3个状态字典值)
   applyType: '2', // 申请类型 借用2
   createUser: '', // 创建人
@@ -373,7 +373,7 @@
     active.value = window.sessionStorage.getItem('buttonBoxActive')!
   }
   else {
-    active.value = menu.value.find(item => item.name === '待借用')!.id // 全部
+    active.value = menu.value.find(item => item.name === '待借用')!.id // 待借用
     activeTitle.value === '待借用'
   }
   nextTick(() => {
@@ -394,6 +394,7 @@
         <el-input
           v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
+          class="short-input"
           clearable
         />
       </search-item>
@@ -401,6 +402,7 @@
         <el-input
           v-model.trim="listQuery.applyName"
           placeholder="申请名称"
+          class="short-input"
           clearable
         />
       </search-item>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index aae69c7..a59267d 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,5 +1,5 @@
 <!-- 设备借用申请 -->
-<script lang="ts" setup name="borrowApply">
+<script lang="ts" setup name="BorrowApply">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
@@ -49,7 +49,7 @@
   applyPersonName: '', // 申请人姓名
   startTime: '', // 领用开始日期
   endTime: '', // 领用结束日期
-  approvalStatus: active.value, // 	审批状态
+  approvalStatus: active.value, // 	审批状态 1 2 3 对应待借用|已借用|已归还
   processResult: '', // 	处置结果
   applyType: '2', // 申请类型 借用2
   createUser: '', // 创建人
@@ -156,7 +156,7 @@
     applyPerson: '', // 申请人
     startTime: '', // 申请开始日期
     endTime: '', // 申请结束日期
-    approvalStatus: active.value, // 	审批状态
+    approvalStatus: active.value, // 	审批状态  // 	审批状态 1 2 3 对应待借用|已借用|已归还
     processResult: '', // 	处置结果
     applyType: '2', // 申请类型 借用2
     createUser: '', // 创建人
@@ -193,27 +193,8 @@
   })
 }
 
-onMounted(async () => {
-  await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
-    active.value = window.sessionStorage.getItem('buttonBoxActive')!
-  }
-  else {
-    active.value = menu.value.find(item => item.name === '全部')!.id // 全部
-    activeTitle.value === '全部'
-  }
-  nextTick(() => {
-    fetchData(true) // 获取表格数据
-    fetchDeptTreeList() // 获取使用部门
-    fetchUserList() // 获取人员列表
-  })
-})
 const $router = useRouter()
 
-onUnmounted(() => {
-  window.sessionStorage.setItem('buttonBoxActive', '') // 清除
-})
-
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
@@ -434,6 +415,21 @@
     }
   }
 }
+onMounted(async () => {
+  await getDict() // 获取字典-审批状态
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+    active.value = window.sessionStorage.getItem('buttonBoxActive')!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '全部')!.id // 全部
+    activeTitle.value === '全部'
+  }
+  nextTick(() => {
+    fetchData(true) // 获取表格数据
+    fetchDeptTreeList() // 获取使用部门
+    fetchUserList() // 获取人员列表
+  })
+})
 </script>
 
 <template>
@@ -446,6 +442,7 @@
         <el-input
           v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
+          class="short-input"
           clearable
         />
       </search-item>
@@ -453,6 +450,7 @@
         <el-input
           v-model.trim="listQuery.applyName"
           placeholder="申请名称"
+          class="short-input"
           clearable
         />
       </search-item>
@@ -506,7 +504,7 @@
           <el-table-column
             label="操作"
             align="center"
-            :width="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 70 : 200"
+            :width="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 140 : 200"
             fixed="right"
           >
             <template #default="{ row }">
@@ -557,6 +555,17 @@
               >
                 编辑
               </el-button>
+
+              <el-button
+                v-if="proxy.hasPerm('/device/borrow/borrowapply/update') && activeTitle === '未通过'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName.search('驳回') === -1 "
+                @click="handleEdit(row, '编辑', 'edit')"
+              >
+                编辑
+              </el-button>
               <el-button
                 v-if="proxy.hasPerm('/device/borrow/borrowapply/update') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
                 size="small"
diff --git a/src/views/device/borrow/components/approvalActionDialog.vue b/src/views/device/borrow/components/approvalActionDialog.vue
deleted file mode 100644
index 9375861..0000000
--- a/src/views/device/borrow/components/approvalActionDialog.vue
+++ /dev/null
@@ -1,109 +0,0 @@
-<!-- 审批操作弹窗 -->
-<script lang="ts" setup>
-import type { FormInstance, FormRules } from 'element-plus'
-import dayjs from 'dayjs'
-import useUserStore from '@/store/modules/user'
-const emits = defineEmits(['resetData'])
-const userInfo = useUserStore()
-const dialogVisibleApprove = ref(false)
-const form = reactive({
-  radio: '1',
-  certificateNo: '',
-  certificateName: '',
-  certificateCompany: '',
-  certificateDate: '',
-  validDate: '',
-})
-const ruleFormRef = ref<FormInstance>()
-const rules = reactive<FormRules>({
-})
-// 重置
-const resetData = () => {
-  form.certificateNo = ''
-  form.certificateName = ''
-  form.certificateCompany = ''
-  form.certificateDate = ''
-  form.validDate = ''
-}
-const approvetime = ref('') // 审批时间
-const initDialog = (row: any) => {
-  dialogVisibleApprove.value = true
-  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
-  form.radio = row.radio
-}
-defineExpose({ initDialog })
-
-// 点击保存
-const submitForm = async (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  await formEl.validate((valid, fields) => {
-    if (valid) {
-      dialogVisibleApprove.value = false
-      emits('resetData')
-    }
-  })
-}
-// 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  formEl.resetFields()
-  dialogVisibleApprove.value = false
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
-    <el-form
-      ref="ruleFormRef" :model="form"
-      :rules="rules" label-width="110px"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见">
-            <el-radio-group v-model="form.radio" style="width: 100%;">
-              <el-radio label="1">
-                同意
-              </el-radio>
-              <el-radio label="2">
-                拒绝
-              </el-radio>
-              <el-radio label="3">
-                驳回
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论">
-            <el-input
-              :rows="4"
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人">
-            <el-input disabled :value="userInfo.$state.name" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间">
-            <el-input disabled :value="approvetime" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
-        <el-button @click="resetForm(ruleFormRef)">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/device/borrow/editHandle.vue b/src/views/device/borrow/editHandle.vue
index d2e423c..9a5b2a6 100644
--- a/src/views/device/borrow/editHandle.vue
+++ b/src/views/device/borrow/editHandle.vue
@@ -1,4 +1,5 @@
-<script lang="ts" setup name="Detail">
+<!-- 设备借用处理详情/编辑 -->
+<script lang="ts" setup name="EditHandle">
 import { onMounted, ref } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { ElLoading } from 'element-plus'
@@ -17,7 +18,6 @@
 const { proxy } = getCurrentInstance() as any
 const useDeptList = ref<deptType[]>([]) // 部门列表
 const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
-const total = ref(20)// 总数
 // 表单数据
 const form = ref({
   id: '',
@@ -29,19 +29,7 @@
   applyDesc: '', // 申请说明
 })
 const list = ref<IdeviceList[]>([])// 表格数据
-// 查询条件
-const listQuery: Ref<IdeviceListQuery> = ref({
-  equipmentName: '', // 仪器名称
-  equipmentNo: '', // 设备编号
-  modelNo: '', // 型号
-  mesureRange: '', // 测量范围
-  useDeptName: '', // 使用部门
-  usePersonName: '', // 使用人
-  managerStateName: '', // 管理状态
-  validDate: '', // 有效日期
-  offset: 1,
-  limit: 20,
-})
+
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '设备编号', value: 'equipmentNo', align: 'center', width: '230' },
@@ -82,11 +70,11 @@
   $router.back()
 }
 
-// 打印
+// 设备借用处理详情打印
 const printObj = ref({
   id: 'lysq', // 需要打印元素的id
   popTitle: '设备借用处理', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备借用处理</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备借用处理详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
@@ -125,7 +113,7 @@
   <app-container>
     <detail-page title="设备借用处理-详情">
       <template #btns>
-        <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/device/borrow/borrowhandle/print')" v-print="printObj" type="primary">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -225,22 +213,6 @@
     background-color: #fff;
     // padding: 10px;
 
-    .title-button {
-      display: flex;
-      align-items: center;
-
-      &::before {
-        content: "";
-        flex: 1;
-      }
-
-      .button-group {
-        flex: 1;
-        display: flex;
-        justify-content: flex-end;
-      }
-    }
-
     .form-area {
       margin-top: 40px;
     }
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index b76ab3e..18879cc 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -352,6 +352,7 @@
   formInline.value.acceptanceCheckId = object.id
   checkIdObject.value = object
   // 获取到详情
+
   equipmentApplyInfo({ id: object.id }).then((res) => {
     res.data.equipmentInfoList.map((item: objectReturn) => {
       if (item.id) {
@@ -492,11 +493,11 @@
         <el-row :gutter="20" class="marg">
           <el-col :span="14">
             <el-form-item label="附件:">
-              <show-photo v-if="formInline.fileList[0].minioFileName" :minio-file-name="formInline.fileList[0].minioFileName" />
+              <show-photo v-if="formInline.fileList" :minio-file-name="formInline.fileList.length && formInline.fileList[0].minioFileName ? formInline.fileList[0].minioFileName : ''" />
               <span v-else-if="pageType === 'detail'">无</span>
               <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.fileList[0].minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                {{ formInline.fileList[0].minioFileName === '' ? '上传' : '更换附件' }}
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.fileList.length && formInline.fileList[0].minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.fileList.length && formInline.fileList[0].minioFileName ? '上传' : '更换附件' }}
               </el-button>
             </el-form-item>
           </el-col>
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 73b9c0b..b21f663 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -543,6 +543,20 @@
 const addId = ref('')
 // 点击顶部一排按钮
 const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  // 添加校验条件
+  if (fromListInfo.value.fixedAssetsList) {
+    if (!fromListInfo.value.fixedAssetsList[0]?.id) {
+      ElMessage.warning('标准配套设备更换不能为空!')
+      return
+    }
+  }
+  if (fromListInfo.value.fileList) {
+    if (!fromListInfo.value.fileList[0]?.fileName) {
+      ElMessage.warning('申请文档不能为空!')
+      return
+    }
+  }
+
   if (item === '保存' && pageType.value === 'add') {
     if (!formEl) {
       return
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 0f8a9d5..3452009 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -148,7 +148,7 @@
     ABCList.value = response.data
   })
   // 获取检定方式
-  getDictByCode('mesureType').then((response) => {
+  getDictByCode('measureType').then((response) => {
     mesureTypeList.value = response.data
   })
   // 获取专业分类
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index e261313..0c76e05 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -116,7 +116,7 @@
     }
   })
   // 获取检定方式
-  getDictByCode('mesureType').then((response) => {
+  getDictByCode('measureType').then((response) => {
     mesureTypeList.value = response.data
   })
   // 获取管理状态
@@ -199,8 +199,15 @@
 }
 // 重置
 const reset = () => {
-  // searchQuery.fileNo = ''
   validDate.value = ''
+  searchQuery.equipmentNo = '' // 设备编号
+  searchQuery.equipmentName = ''
+  searchQuery.mesureType = ''
+  searchQuery.managerState = ''
+  searchQuery.useDept = ''
+  searchQuery.validStartDate = ''
+  searchQuery.validEndDate = ''
+  searchQuery.abc = ''
   getList()
 }
 // 模板下载
@@ -347,7 +354,7 @@
           <el-date-picker
             v-model="validDate"
             type="daterange"
-            format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+            format="YYYY-MM-DD" value-format="YYYY-MM-DD"
             range-separator="至"
             start-placeholder="有效开始日期"
             end-placeholder="有效结束日期"
diff --git a/src/views/device/stateManage/components/status-interface.ts b/src/views/device/stateManage/components/status-interface.ts
index caa43b1..93410a7 100644
--- a/src/views/device/stateManage/components/status-interface.ts
+++ b/src/views/device/stateManage/components/status-interface.ts
@@ -29,7 +29,7 @@
   equipmentName: string // 设备名称
   equipmentNo: string // 设备编号
   fileList: string // 文件列表
-  id: number // 主键id
+  id: number | string // 主键id
   isDel: number // 删除标记
   managerState: string //  管理状态
   managerStateName: string // 管理状态名称
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 05ba922..c53574f 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -1,5 +1,5 @@
-<!-- 新增或详情弹窗 -->
-<script lang="ts" setup name="add">
+<!-- 新增或详情弹窗 设备借用处理新增编辑 -->
+<script lang="ts" setup name="TemplateAdd">
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import type { EquipmentListRow, IdeviceList, IdeviceListQuery } from './status-interface'
@@ -14,7 +14,7 @@
 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, submitApply } from '@/api/device/borrow'
+import { addApply, deleteApply, detailApply, editApply, failUpdate, submitApply } from '@/api/device/borrow'
 import { addStatus, detailStatus, updateStatus } from '@/api/device/stateManage'
 import type { borrowDeviceType } from '@/views/device/borrow/borrow'
 import useUserStore from '@/store/modules/user'
@@ -60,6 +60,7 @@
   applyType: '', // 申请类型
   applyName: '', // 申请名称
   createUser: userInfo.$state.id,
+  approvalStatus: '',
   createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
   id: '',
 })
@@ -116,21 +117,6 @@
 const usePersonList = ref<userType[]>([]) // 使用人列表
 const useDeptList = ref<deptType[]>([]) // 使用部门列表
 const useDeptListNoTree = ref([]) // 使用部门列表非树结构
-const isWhether = ref<selectType[]>([
-  {
-    name: '是',
-    id: 'shi',
-    value: '1',
-  },
-  {
-    name: '否',
-    id: 'fou',
-    value: '0',
-  },
-])
-const deptProps = reactive({
-  parent: 'pid', value: 'id', label: 'name', children: 'children',
-})
 // 获取下拉框数
 const fetchData = () => {
 // 获取资产类型
@@ -209,7 +195,12 @@
       detailApply({ id: row.id }).then((res) => {
         processId.value = res.data.processId // 流程id存在的时候赋值
         ruleForm2.value = res.data
-        borrowList.value = res.data.equipmentInfoList
+        borrowList.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
+          return {
+            ...item,
+            validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+          }
+        })
       })
     }
   }
@@ -286,28 +277,58 @@
     //  设备借用
     if (!formEl2) { return }
     if (ruleForm2.value.id) {
-      await formEl2.validate((valid, fields) => {
-        if (valid) {
-          ElMessageBox.confirm(
-            '确认提交吗?',
-            '提示',
-            {
-              confirmButtonText: '确认',
-              cancelButtonText: '取消',
-              type: 'warning',
-            },
-          ).then(() => {
-            const params = {
-              id: ruleForm2.value.id,
-              formId: SCHEDULE.DEVICE_BORROW_APPROVAL, // 表单id
-            }
-            submitApply(params).then(() => {
-              ElMessage.success('操作成功!')
-              $router.go(-1)
+      // 如果是编辑-驳回时候发起单独的接口
+      if (ruleForm2.value.approvalStatus === '7') {
+        await formEl2.validate((valid, fields) => {
+          if (valid) {
+            ElMessageBox.confirm(
+              '确认提交吗?',
+              '提示',
+              {
+                confirmButtonText: '确认',
+                cancelButtonText: '取消',
+                type: 'warning',
+              },
+            ).then(() => {
+              ruleForm2.value.applyType = '2'
+              // const params = {
+              //   ...ruleForm2.value,
+              //   equipmentList: borrowList.value.map(item => ({
+              //     equipmentId: item.id,
+              //   })),
+              // }
+              failUpdate({ ...ruleForm2.value }).then(() => {
+                ElMessage.success('操作成功!')
+                $router.go(-1)
+              })
             })
-          })
-        }
-      })
+          }
+        })
+      }
+      else {
+        await formEl2.validate((valid, fields) => {
+          if (valid) {
+            ElMessageBox.confirm(
+              '确认提交吗?',
+              '提示',
+              {
+                confirmButtonText: '确认',
+                cancelButtonText: '取消',
+                type: 'warning',
+              },
+            ).then(() => {
+              const params = {
+                id: ruleForm2.value.id,
+                formId: SCHEDULE.DEVICE_BORROW_APPROVAL, // 表单id
+              }
+              submitApply(params).then(() => {
+                ElMessage.success('操作成功!')
+                $router.go(-1)
+              })
+            })
+          }
+        })
+      }
     }
     else {
       ElMessage.info('请先保存再提交！')
@@ -443,14 +464,15 @@
 }
 const columns = ref<TableColumn[]>([
   {
-    text: '设备名称',
-    value: 'equipmentName',
-    align: 'center',
-  },
-  {
     text: '设备编号',
     value: 'equipmentNo',
     align: 'center',
+    width: 240,
+  },
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
   },
   {
     text: '型号',
@@ -657,9 +679,6 @@
         <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'refuse' })">
           拒绝
         </el-button> -->
-        <el-button v-if="title === '详情' && isPrint" type="primary">
-          打印
-        </el-button>
         <!-- <el-button v-if="title === '详情' && isCancel" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
           提交
         </el-button> -->
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 0c22c33..9696d06 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -571,8 +571,7 @@
                   type="primary"
                   link
                   :disabled="
-                    (row.approvalStatus !== '待审批'
-                      && row.approvalStatus !== '审批中')
+                    (row.approvalStatus !== '审批中')
                       || row.decisionItem === 3"
                   @click="agree(row)"
                 >
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 531fe0d..1bce5f9 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -328,12 +328,5 @@
 </template>
 
 <style lang="scss" scoped>
-.isDetail {
-  ::v-deep {
-    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-      display: none;
-    }
-  }
-}
+// 样式
 </style>
diff --git a/src/views/measure/file/components/approve/addDialog.vue b/src/views/measure/file/components/approve/addDialog.vue
index c4d646a..6e8414b 100644
--- a/src/views/measure/file/components/approve/addDialog.vue
+++ b/src/views/measure/file/components/approve/addDialog.vue
@@ -211,9 +211,15 @@
   approvalDialog.value.initDialog(type, processId)
 }
 // 打印
-const print = () => {
-  printHtml('print')
-}
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: `文件审批${title.value}`, // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备领用详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -299,7 +305,7 @@
           </el-button>
         </div>
         <div v-if="approvalStatusName === '已通过' || approvalStatusName === '未通过'">
-          <el-button type="primary" @click="print">
+          <el-button v-print="printObj" type="primary">
             打印
           </el-button>
           <el-button type="info" @click="resetForm(ruleFormRef)">
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 64eff7b..088cb52 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -477,7 +477,6 @@
 // 提交
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
-  console.log(changeList)
   // 当前选中的证书基本信息列表
   const currentData = currentShow.value.data
   await formEl.validate((valid, fields) => {
@@ -491,7 +490,10 @@
           type: 'warning',
         },
       ).then(() => {
-        changeList.value[0].data = changeList.value[0].data.filter(item => item.certificateName !== '')
+        changeList.value[0].data = changeList.value[0].data.filter(item => item.certificateName !== '').map((item) => {
+          item.id = ''
+          return item
+        })
         if (changeList.value[0].data.length) {
           for (const key in ruleForm.value) {
             if (ruleForm.value[key] === '') {

diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index dbce999..5bd4111 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -45,6 +45,15 @@
     data,
   })
 }
+
+// 设备借用驳回后编辑
+export function failUpdate(data: object) {
+  return request({
+    url: '/equipmentApply/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 // 设备借用申请删除
 export function deleteApply(data: object) {
   return request({
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 9049282..7f9431b 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -1,6 +1,6 @@
 // 状态管理相关接口api
 import request from '../index'
-import type { ISearchQuery, ITableRow, Iapprove } from '@/views/device/stateManage/components/status-interface.ts'
+import type { ISearchQuery, Iapprove } from '@/views/device/stateManage/components/status-interface'
 
 // 设备申请列表
 export function getStatusList(data: ISearchQuery) {
@@ -11,7 +11,7 @@
   })
 }
 // 状态管理新建
-export function addStatus(data: ITableRow) {
+export function addStatus(data: Object) {
   return request({
     url: '/meter/stateManage/addStateManageInfo',
     method: 'post',
@@ -20,7 +20,7 @@
 }
 
 // 状态管理编辑
-export function updateStatus(data: ITableRow) {
+export function updateStatus(data: Object) {
   return request({
     url: '/meter/stateManage/updateStateManageInfo',
     method: 'post',
@@ -53,7 +53,7 @@
   })
 }
 // 状态管理详情
-export function detailStatus(data: ITableRow) {
+export function detailStatus(data: object) {
   return request({
     url: '/meter/stateManage/selectStateManageInfo',
     method: 'post',
diff --git a/src/components/SearchArea/SearchItem.vue b/src/components/SearchArea/SearchItem.vue
index 3adef93..dc53b08 100644
--- a/src/components/SearchArea/SearchItem.vue
+++ b/src/components/SearchArea/SearchItem.vue
@@ -23,7 +23,6 @@
   display: inline-block;
   margin-bottom: 10px;
   vertical-align: top;
-  box-sizing: inherit;
   margin-right: 5px;
 }
 
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index 12d7290..e3c72af 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -1,5 +1,9 @@
 // 证书打印查询
 export interface ICertPrintSearch {
+  certificateClass: string
+  certificateNo: string
+  createUserId: number
+  printStatus: number | null
   certificationReportCode: string // 证书编号
   orderNo: string // 委托书编号
   customerName: string // 委托方名称
@@ -13,7 +17,7 @@
   reason: string // 操作原因
   sampleId: string // 样品id
   status: string // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
-  ids?: []
+  ids?: [] | null
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 3daa2b5..391931b 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -22,6 +22,10 @@
 const activeTitle = ref('') // active对应的审批状态名字
 // 查询条件
 const listQuery = ref<ICertPrintSearch>({
+  certificateClass: '',
+  certificateNo: '', // 证书编号
+  createUserId: 0,
+  printStatus: 0, // 可打印(证书可打印传0,全部传null)
   certificationReportCode: '', // 证书编号
   orderNo: '', // 委托书编号
   customerName: '', // 委托方名称
@@ -30,11 +34,12 @@
   certificateReportType: '', // 证书类型
   printNum: '', // 打印次数 -未打印和全部用
   approvalStatus: '', // 审批状态-审批查询用
-  orderId: '0', // 委托书id
+  orderId: '', // 委托书id
   reason: '', // 操作原因
-  sampleId: '0', // 样品id
+  sampleId: '', // 样品id
   status: '', // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
   formId: SCHEDULE.BUSINESS_CERT_PRINT,
+  ids: null, // 设置默认值
   offset: 1,
   limit: 20,
 })
@@ -78,22 +83,30 @@
         }
       }
     })
+    if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+      active.value = window.sessionStorage.getItem('buttonBoxActive')!
+      activeTitle.value === '未通过'
+    }
+    else {
+      active.value = menu.value.find(item => item.name === '可打印')!.id // 可打印
+      activeTitle.value === '可打印'
+    }
   })
 }
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationReportCode', width: '110', align: 'center' },
-  { text: '证书名称', value: 'certificationReportName', width: '120', align: 'center' },
+  { text: '证书编号', value: 'certificateNo', width: '110', align: 'center' },
+  { text: '证书名称', value: 'certificateName', width: '120', align: 'center' },
   { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', width: '120', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', width: '120', align: 'center' },
   { text: '委托书编号', value: 'orderNo', width: '120', align: 'center' },
-  { text: '检校类别', value: 'customerNo', width: '120', align: 'center' },
-  { text: '检定人员', value: 'customerName', width: '120', align: 'center' },
-  { text: '证书类型', value: 'certificateReportTypeName', width: '120', align: 'center' },
-  { text: '打印状态', value: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
+  { text: '检校类别', value: 'measureType', width: '120', align: 'center' },
+  { text: '检定人员', value: 'measurePersonId', width: '120', align: 'center' },
+  { text: '证书类型', value: 'certificateType', width: '120', align: 'center' },
+  { text: '打印状态', value: 'printNum', align: 'center', width: '85px', filter: (row: ICerPrintList) => { var cnum = ['未打印', '一', '二', '三', '四', '五', '六', '七', '八', '九', '十']; return row.printNum == 0 ? '未打印' : `${cnum[parseInt(row.printNum)]}次打印` } },
   { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
 ])
 // 表格数据
@@ -107,37 +120,35 @@
 
 // 根据过滤查询条件
 function filterQuery() {
-  console.log(activeTitle)
+  const approvalStatus = menu.value.find(item => item.name === activeTitle.value)!.id
+  listQuery.value.approvalStatus = approvalStatus
   switch (activeTitle.value) {
     case '可打印':
-      listQuery.value.printNum = 0
+      listQuery.value.printStatus = 0
       listQuery.value.approvalStatus = ''
       break
     case '全部':
-      listQuery.value.printNum = 0
+      listQuery.value.printStatus = 2
       listQuery.value.approvalStatus = ''
       break
     case '待审批':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '1'
+      listQuery.value.printStatus = 2
       break
     case '审批中':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '2'
+      listQuery.value.printStatus = 2
       break
     case '已通过':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '3'
+      listQuery.value.printStatus = 2
       break
     case '未通过':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '4'
+      listQuery.value.printStatus = 2
       break
   }
 }
 
 // 数据查询
 function fetchData(isNowPage = false) {
+  console.log(listQuery)
   filterQuery()
   loadingTable.value = true
   if (!isNowPage) {
@@ -146,15 +157,11 @@
   }
   // 模拟数据
   loadingTable.value = false
-  list.value = [
-    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '0', printStatusName: '未打印', certificateReportTypeName: '自检', approvalStatusName: '待审批', taskId: '100', id: '10' },
-    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '1', printStatusName: '已打印', certificateReportTypeName: '自检', approvalStatusName: '待审批', taskId: '1001', id: '101' },
-  ]
-  // getCertList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getCertList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -167,7 +174,12 @@
 }
 // 点击重置
 const clearList = () => {
+  const approvalStatus = menu.value.find(item => item.name === activeTitle.value)!.id
   listQuery.value = {
+    certificateClass: '',
+    certificateNo: '', // 证书编号
+    createUserId: 0,
+    printStatus: 0, // 可打印(证书可打印传0,全部传null)
     certificationReportCode: '', // 证书编号
     orderNo: '', // 委托书编号
     customerName: '', // 委托方名称
@@ -176,14 +188,18 @@
     certificateReportType: '', // 证书类型
     printNum: '', // 打印次数 -未打印和全部用
     approvalStatus: '', // 审批状态-审批查询用
-    orderId: '0', // 委托书id
+    orderId: '', // 委托书id
     reason: '', // 操作原因
-    sampleId: '0', // 样品id
+    sampleId: '', // 样品id
     status: '', // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
     formId: SCHEDULE.BUSINESS_CERT_PRINT,
     offset: 1,
     limit: 20,
   }
+  listQuery.value.approvalStatus = approvalStatus
+  if (activeTitle.value === '可打印' || activeTitle.value === '全部') {
+    listQuery.value.approvalStatus = ''
+  }
   fetchData(true)
 }
 // 点击详情
@@ -226,14 +242,14 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   if (list.value.length > 0) {
-    // const params = {
-    //   ...listQuery.value,
-    //   ids: checkoutList.value,
-    // }
-    // exportCert(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '证书打印列表.xlsx')
-    // })
+    const params = {
+      ...listQuery.value,
+      ids: checkoutList.value,
+    }
+    exportCert(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '证书打印列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
@@ -243,10 +259,9 @@
 
 // 打印
 const bindLabel = (row: ICerPrintList) => {
-  console.log(1)
-  row.printNum = 1
+  console.log(row)
   // 判断状态第一次可以直接打印,之后的打印需要审批
-  if (row.printNum == 1) {
+  if (row.printNum == 0) {
     ElMessageBox.confirm(
       '确定要打印吗？',
       '确认操作',
@@ -319,18 +334,9 @@
 
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
-    active.value = window.sessionStorage.getItem('buttonBoxActive')!
-  }
-  else {
-    active.value = menu.value.find(item => item.name === '可打印')!.id // 可打
-    activeTitle.value === '可打印'
-  }
+
   fetchData(true)
 })
-onUnmounted(() => {
-  window.sessionStorage.setItem('buttonBoxActive', '') // 清除
-})
 </script>
 
 <template>
@@ -342,7 +348,7 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.certificationReportCode"
+          v-model.trim="listQuery.certificateNo"
           placeholder="证书编号"
           class="short-input"
           clearable
@@ -373,7 +379,7 @@
         />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 120px;" clearable>
+        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 160px;" clearable>
           <el-option v-for="item in certificationClassList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
@@ -388,19 +394,19 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column v-if="listQuery.printNum === ''" label="审批状态" align="center" width="90px" prop="approvalStatusName" />
+          <el-table-column label="审批状态" align="center" width="90px" prop="approvalStatusName" />
           <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.printNum === 0 || (listQuery.approvalStatus === '3')" size="small" link type="primary" @click="bindLabel(row)">
+              <el-button v-if="activeTitle === '全部' || activeTitle === '可打印'" size="small" link type="primary" @click="bindLabel(row)">
                 打印
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'agree')">
+              <el-button v-if="activeTitle === '待审批'" size="small" type="primary" link @click="handleDistribute(row, 'agree')">
                 同意
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'refuse')">
+              <el-button v-if="activeTitle === '待审批'" size="small" type="primary" link @click="handleDistribute(row, 'refuse')">
                 拒绝
               </el-button>
             </template>
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 2f8f8a4..fa8e6b0 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -392,4 +392,7 @@
 
 <style lang="scss" scoped>
 // 样式
+.short-input {
+  width: 180px !important;
+}
 </style>
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 2e8e4a7..5d7fc0f 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,5 +1,5 @@
 <!-- 设备借用处理 -->
-<script lang="ts" setup name="borrowApply">
+<script lang="ts" setup name="BorrowHandle">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
@@ -44,7 +44,7 @@
   applyPersonName: '', // 申请人姓名
   startTime: '', // 领用开始日期
   endTime: '', // 领用结束日期
-  approvalStatus: '4', // 	审批状态
+  approvalStatus: '4', // 	审批状态 (已完成)
   processResult: '1' || active.value, // 	处置结果 (3个状态字典值)
   applyType: '2', // 申请类型 借用2
   createUser: '', // 创建人
@@ -373,7 +373,7 @@
     active.value = window.sessionStorage.getItem('buttonBoxActive')!
   }
   else {
-    active.value = menu.value.find(item => item.name === '待借用')!.id // 全部
+    active.value = menu.value.find(item => item.name === '待借用')!.id // 待借用
     activeTitle.value === '待借用'
   }
   nextTick(() => {
@@ -394,6 +394,7 @@
         <el-input
           v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
+          class="short-input"
           clearable
         />
       </search-item>
@@ -401,6 +402,7 @@
         <el-input
           v-model.trim="listQuery.applyName"
           placeholder="申请名称"
+          class="short-input"
           clearable
         />
       </search-item>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index aae69c7..a59267d 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,5 +1,5 @@
 <!-- 设备借用申请 -->
-<script lang="ts" setup name="borrowApply">
+<script lang="ts" setup name="BorrowApply">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
@@ -49,7 +49,7 @@
   applyPersonName: '', // 申请人姓名
   startTime: '', // 领用开始日期
   endTime: '', // 领用结束日期
-  approvalStatus: active.value, // 	审批状态
+  approvalStatus: active.value, // 	审批状态 1 2 3 对应待借用|已借用|已归还
   processResult: '', // 	处置结果
   applyType: '2', // 申请类型 借用2
   createUser: '', // 创建人
@@ -156,7 +156,7 @@
     applyPerson: '', // 申请人
     startTime: '', // 申请开始日期
     endTime: '', // 申请结束日期
-    approvalStatus: active.value, // 	审批状态
+    approvalStatus: active.value, // 	审批状态  // 	审批状态 1 2 3 对应待借用|已借用|已归还
     processResult: '', // 	处置结果
     applyType: '2', // 申请类型 借用2
     createUser: '', // 创建人
@@ -193,27 +193,8 @@
   })
 }
 
-onMounted(async () => {
-  await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
-    active.value = window.sessionStorage.getItem('buttonBoxActive')!
-  }
-  else {
-    active.value = menu.value.find(item => item.name === '全部')!.id // 全部
-    activeTitle.value === '全部'
-  }
-  nextTick(() => {
-    fetchData(true) // 获取表格数据
-    fetchDeptTreeList() // 获取使用部门
-    fetchUserList() // 获取人员列表
-  })
-})
 const $router = useRouter()
 
-onUnmounted(() => {
-  window.sessionStorage.setItem('buttonBoxActive', '') // 清除
-})
-
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
@@ -434,6 +415,21 @@
     }
   }
 }
+onMounted(async () => {
+  await getDict() // 获取字典-审批状态
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+    active.value = window.sessionStorage.getItem('buttonBoxActive')!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '全部')!.id // 全部
+    activeTitle.value === '全部'
+  }
+  nextTick(() => {
+    fetchData(true) // 获取表格数据
+    fetchDeptTreeList() // 获取使用部门
+    fetchUserList() // 获取人员列表
+  })
+})
 </script>
 
 <template>
@@ -446,6 +442,7 @@
         <el-input
           v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
+          class="short-input"
           clearable
         />
       </search-item>
@@ -453,6 +450,7 @@
         <el-input
           v-model.trim="listQuery.applyName"
           placeholder="申请名称"
+          class="short-input"
           clearable
         />
       </search-item>
@@ -506,7 +504,7 @@
           <el-table-column
             label="操作"
             align="center"
-            :width="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 70 : 200"
+            :width="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 140 : 200"
             fixed="right"
           >
             <template #default="{ row }">
@@ -557,6 +555,17 @@
               >
                 编辑
               </el-button>
+
+              <el-button
+                v-if="proxy.hasPerm('/device/borrow/borrowapply/update') && activeTitle === '未通过'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName.search('驳回') === -1 "
+                @click="handleEdit(row, '编辑', 'edit')"
+              >
+                编辑
+              </el-button>
               <el-button
                 v-if="proxy.hasPerm('/device/borrow/borrowapply/update') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
                 size="small"
diff --git a/src/views/device/borrow/components/approvalActionDialog.vue b/src/views/device/borrow/components/approvalActionDialog.vue
deleted file mode 100644
index 9375861..0000000
--- a/src/views/device/borrow/components/approvalActionDialog.vue
+++ /dev/null
@@ -1,109 +0,0 @@
-<!-- 审批操作弹窗 -->
-<script lang="ts" setup>
-import type { FormInstance, FormRules } from 'element-plus'
-import dayjs from 'dayjs'
-import useUserStore from '@/store/modules/user'
-const emits = defineEmits(['resetData'])
-const userInfo = useUserStore()
-const dialogVisibleApprove = ref(false)
-const form = reactive({
-  radio: '1',
-  certificateNo: '',
-  certificateName: '',
-  certificateCompany: '',
-  certificateDate: '',
-  validDate: '',
-})
-const ruleFormRef = ref<FormInstance>()
-const rules = reactive<FormRules>({
-})
-// 重置
-const resetData = () => {
-  form.certificateNo = ''
-  form.certificateName = ''
-  form.certificateCompany = ''
-  form.certificateDate = ''
-  form.validDate = ''
-}
-const approvetime = ref('') // 审批时间
-const initDialog = (row: any) => {
-  dialogVisibleApprove.value = true
-  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
-  form.radio = row.radio
-}
-defineExpose({ initDialog })
-
-// 点击保存
-const submitForm = async (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  await formEl.validate((valid, fields) => {
-    if (valid) {
-      dialogVisibleApprove.value = false
-      emits('resetData')
-    }
-  })
-}
-// 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  formEl.resetFields()
-  dialogVisibleApprove.value = false
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
-    <el-form
-      ref="ruleFormRef" :model="form"
-      :rules="rules" label-width="110px"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见">
-            <el-radio-group v-model="form.radio" style="width: 100%;">
-              <el-radio label="1">
-                同意
-              </el-radio>
-              <el-radio label="2">
-                拒绝
-              </el-radio>
-              <el-radio label="3">
-                驳回
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论">
-            <el-input
-              :rows="4"
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人">
-            <el-input disabled :value="userInfo.$state.name" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间">
-            <el-input disabled :value="approvetime" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
-        <el-button @click="resetForm(ruleFormRef)">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/device/borrow/editHandle.vue b/src/views/device/borrow/editHandle.vue
index d2e423c..9a5b2a6 100644
--- a/src/views/device/borrow/editHandle.vue
+++ b/src/views/device/borrow/editHandle.vue
@@ -1,4 +1,5 @@
-<script lang="ts" setup name="Detail">
+<!-- 设备借用处理详情/编辑 -->
+<script lang="ts" setup name="EditHandle">
 import { onMounted, ref } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { ElLoading } from 'element-plus'
@@ -17,7 +18,6 @@
 const { proxy } = getCurrentInstance() as any
 const useDeptList = ref<deptType[]>([]) // 部门列表
 const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
-const total = ref(20)// 总数
 // 表单数据
 const form = ref({
   id: '',
@@ -29,19 +29,7 @@
   applyDesc: '', // 申请说明
 })
 const list = ref<IdeviceList[]>([])// 表格数据
-// 查询条件
-const listQuery: Ref<IdeviceListQuery> = ref({
-  equipmentName: '', // 仪器名称
-  equipmentNo: '', // 设备编号
-  modelNo: '', // 型号
-  mesureRange: '', // 测量范围
-  useDeptName: '', // 使用部门
-  usePersonName: '', // 使用人
-  managerStateName: '', // 管理状态
-  validDate: '', // 有效日期
-  offset: 1,
-  limit: 20,
-})
+
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '设备编号', value: 'equipmentNo', align: 'center', width: '230' },
@@ -82,11 +70,11 @@
   $router.back()
 }
 
-// 打印
+// 设备借用处理详情打印
 const printObj = ref({
   id: 'lysq', // 需要打印元素的id
   popTitle: '设备借用处理', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备借用处理</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备借用处理详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
@@ -125,7 +113,7 @@
   <app-container>
     <detail-page title="设备借用处理-详情">
       <template #btns>
-        <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/device/borrow/borrowhandle/print')" v-print="printObj" type="primary">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -225,22 +213,6 @@
     background-color: #fff;
     // padding: 10px;
 
-    .title-button {
-      display: flex;
-      align-items: center;
-
-      &::before {
-        content: "";
-        flex: 1;
-      }
-
-      .button-group {
-        flex: 1;
-        display: flex;
-        justify-content: flex-end;
-      }
-    }
-
     .form-area {
       margin-top: 40px;
     }
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index b76ab3e..18879cc 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -352,6 +352,7 @@
   formInline.value.acceptanceCheckId = object.id
   checkIdObject.value = object
   // 获取到详情
+
   equipmentApplyInfo({ id: object.id }).then((res) => {
     res.data.equipmentInfoList.map((item: objectReturn) => {
       if (item.id) {
@@ -492,11 +493,11 @@
         <el-row :gutter="20" class="marg">
           <el-col :span="14">
             <el-form-item label="附件:">
-              <show-photo v-if="formInline.fileList[0].minioFileName" :minio-file-name="formInline.fileList[0].minioFileName" />
+              <show-photo v-if="formInline.fileList" :minio-file-name="formInline.fileList.length && formInline.fileList[0].minioFileName ? formInline.fileList[0].minioFileName : ''" />
               <span v-else-if="pageType === 'detail'">无</span>
               <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.fileList[0].minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                {{ formInline.fileList[0].minioFileName === '' ? '上传' : '更换附件' }}
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.fileList.length && formInline.fileList[0].minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.fileList.length && formInline.fileList[0].minioFileName ? '上传' : '更换附件' }}
               </el-button>
             </el-form-item>
           </el-col>
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 73b9c0b..b21f663 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -543,6 +543,20 @@
 const addId = ref('')
 // 点击顶部一排按钮
 const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  // 添加校验条件
+  if (fromListInfo.value.fixedAssetsList) {
+    if (!fromListInfo.value.fixedAssetsList[0]?.id) {
+      ElMessage.warning('标准配套设备更换不能为空!')
+      return
+    }
+  }
+  if (fromListInfo.value.fileList) {
+    if (!fromListInfo.value.fileList[0]?.fileName) {
+      ElMessage.warning('申请文档不能为空!')
+      return
+    }
+  }
+
   if (item === '保存' && pageType.value === 'add') {
     if (!formEl) {
       return
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 0f8a9d5..3452009 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -148,7 +148,7 @@
     ABCList.value = response.data
   })
   // 获取检定方式
-  getDictByCode('mesureType').then((response) => {
+  getDictByCode('measureType').then((response) => {
     mesureTypeList.value = response.data
   })
   // 获取专业分类
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index e261313..0c76e05 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -116,7 +116,7 @@
     }
   })
   // 获取检定方式
-  getDictByCode('mesureType').then((response) => {
+  getDictByCode('measureType').then((response) => {
     mesureTypeList.value = response.data
   })
   // 获取管理状态
@@ -199,8 +199,15 @@
 }
 // 重置
 const reset = () => {
-  // searchQuery.fileNo = ''
   validDate.value = ''
+  searchQuery.equipmentNo = '' // 设备编号
+  searchQuery.equipmentName = ''
+  searchQuery.mesureType = ''
+  searchQuery.managerState = ''
+  searchQuery.useDept = ''
+  searchQuery.validStartDate = ''
+  searchQuery.validEndDate = ''
+  searchQuery.abc = ''
   getList()
 }
 // 模板下载
@@ -347,7 +354,7 @@
           <el-date-picker
             v-model="validDate"
             type="daterange"
-            format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+            format="YYYY-MM-DD" value-format="YYYY-MM-DD"
             range-separator="至"
             start-placeholder="有效开始日期"
             end-placeholder="有效结束日期"
diff --git a/src/views/device/stateManage/components/status-interface.ts b/src/views/device/stateManage/components/status-interface.ts
index caa43b1..93410a7 100644
--- a/src/views/device/stateManage/components/status-interface.ts
+++ b/src/views/device/stateManage/components/status-interface.ts
@@ -29,7 +29,7 @@
   equipmentName: string // 设备名称
   equipmentNo: string // 设备编号
   fileList: string // 文件列表
-  id: number // 主键id
+  id: number | string // 主键id
   isDel: number // 删除标记
   managerState: string //  管理状态
   managerStateName: string // 管理状态名称
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 05ba922..c53574f 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -1,5 +1,5 @@
-<!-- 新增或详情弹窗 -->
-<script lang="ts" setup name="add">
+<!-- 新增或详情弹窗 设备借用处理新增编辑 -->
+<script lang="ts" setup name="TemplateAdd">
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import type { EquipmentListRow, IdeviceList, IdeviceListQuery } from './status-interface'
@@ -14,7 +14,7 @@
 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, submitApply } from '@/api/device/borrow'
+import { addApply, deleteApply, detailApply, editApply, failUpdate, submitApply } from '@/api/device/borrow'
 import { addStatus, detailStatus, updateStatus } from '@/api/device/stateManage'
 import type { borrowDeviceType } from '@/views/device/borrow/borrow'
 import useUserStore from '@/store/modules/user'
@@ -60,6 +60,7 @@
   applyType: '', // 申请类型
   applyName: '', // 申请名称
   createUser: userInfo.$state.id,
+  approvalStatus: '',
   createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
   id: '',
 })
@@ -116,21 +117,6 @@
 const usePersonList = ref<userType[]>([]) // 使用人列表
 const useDeptList = ref<deptType[]>([]) // 使用部门列表
 const useDeptListNoTree = ref([]) // 使用部门列表非树结构
-const isWhether = ref<selectType[]>([
-  {
-    name: '是',
-    id: 'shi',
-    value: '1',
-  },
-  {
-    name: '否',
-    id: 'fou',
-    value: '0',
-  },
-])
-const deptProps = reactive({
-  parent: 'pid', value: 'id', label: 'name', children: 'children',
-})
 // 获取下拉框数
 const fetchData = () => {
 // 获取资产类型
@@ -209,7 +195,12 @@
       detailApply({ id: row.id }).then((res) => {
         processId.value = res.data.processId // 流程id存在的时候赋值
         ruleForm2.value = res.data
-        borrowList.value = res.data.equipmentInfoList
+        borrowList.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
+          return {
+            ...item,
+            validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+          }
+        })
       })
     }
   }
@@ -286,28 +277,58 @@
     //  设备借用
     if (!formEl2) { return }
     if (ruleForm2.value.id) {
-      await formEl2.validate((valid, fields) => {
-        if (valid) {
-          ElMessageBox.confirm(
-            '确认提交吗?',
-            '提示',
-            {
-              confirmButtonText: '确认',
-              cancelButtonText: '取消',
-              type: 'warning',
-            },
-          ).then(() => {
-            const params = {
-              id: ruleForm2.value.id,
-              formId: SCHEDULE.DEVICE_BORROW_APPROVAL, // 表单id
-            }
-            submitApply(params).then(() => {
-              ElMessage.success('操作成功!')
-              $router.go(-1)
+      // 如果是编辑-驳回时候发起单独的接口
+      if (ruleForm2.value.approvalStatus === '7') {
+        await formEl2.validate((valid, fields) => {
+          if (valid) {
+            ElMessageBox.confirm(
+              '确认提交吗?',
+              '提示',
+              {
+                confirmButtonText: '确认',
+                cancelButtonText: '取消',
+                type: 'warning',
+              },
+            ).then(() => {
+              ruleForm2.value.applyType = '2'
+              // const params = {
+              //   ...ruleForm2.value,
+              //   equipmentList: borrowList.value.map(item => ({
+              //     equipmentId: item.id,
+              //   })),
+              // }
+              failUpdate({ ...ruleForm2.value }).then(() => {
+                ElMessage.success('操作成功!')
+                $router.go(-1)
+              })
             })
-          })
-        }
-      })
+          }
+        })
+      }
+      else {
+        await formEl2.validate((valid, fields) => {
+          if (valid) {
+            ElMessageBox.confirm(
+              '确认提交吗?',
+              '提示',
+              {
+                confirmButtonText: '确认',
+                cancelButtonText: '取消',
+                type: 'warning',
+              },
+            ).then(() => {
+              const params = {
+                id: ruleForm2.value.id,
+                formId: SCHEDULE.DEVICE_BORROW_APPROVAL, // 表单id
+              }
+              submitApply(params).then(() => {
+                ElMessage.success('操作成功!')
+                $router.go(-1)
+              })
+            })
+          }
+        })
+      }
     }
     else {
       ElMessage.info('请先保存再提交！')
@@ -443,14 +464,15 @@
 }
 const columns = ref<TableColumn[]>([
   {
-    text: '设备名称',
-    value: 'equipmentName',
-    align: 'center',
-  },
-  {
     text: '设备编号',
     value: 'equipmentNo',
     align: 'center',
+    width: 240,
+  },
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
   },
   {
     text: '型号',
@@ -657,9 +679,6 @@
         <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'refuse' })">
           拒绝
         </el-button> -->
-        <el-button v-if="title === '详情' && isPrint" type="primary">
-          打印
-        </el-button>
         <!-- <el-button v-if="title === '详情' && isCancel" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
           提交
         </el-button> -->
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 0c22c33..9696d06 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -571,8 +571,7 @@
                   type="primary"
                   link
                   :disabled="
-                    (row.approvalStatus !== '待审批'
-                      && row.approvalStatus !== '审批中')
+                    (row.approvalStatus !== '审批中')
                       || row.decisionItem === 3"
                   @click="agree(row)"
                 >
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 531fe0d..1bce5f9 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -328,12 +328,5 @@
 </template>
 
 <style lang="scss" scoped>
-.isDetail {
-  ::v-deep {
-    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-      display: none;
-    }
-  }
-}
+// 样式
 </style>
diff --git a/src/views/measure/file/components/approve/addDialog.vue b/src/views/measure/file/components/approve/addDialog.vue
index c4d646a..6e8414b 100644
--- a/src/views/measure/file/components/approve/addDialog.vue
+++ b/src/views/measure/file/components/approve/addDialog.vue
@@ -211,9 +211,15 @@
   approvalDialog.value.initDialog(type, processId)
 }
 // 打印
-const print = () => {
-  printHtml('print')
-}
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: `文件审批${title.value}`, // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备领用详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -299,7 +305,7 @@
           </el-button>
         </div>
         <div v-if="approvalStatusName === '已通过' || approvalStatusName === '未通过'">
-          <el-button type="primary" @click="print">
+          <el-button v-print="printObj" type="primary">
             打印
           </el-button>
           <el-button type="info" @click="resetForm(ruleFormRef)">
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 64eff7b..088cb52 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -477,7 +477,6 @@
 // 提交
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
-  console.log(changeList)
   // 当前选中的证书基本信息列表
   const currentData = currentShow.value.data
   await formEl.validate((valid, fields) => {
@@ -491,7 +490,10 @@
           type: 'warning',
         },
       ).then(() => {
-        changeList.value[0].data = changeList.value[0].data.filter(item => item.certificateName !== '')
+        changeList.value[0].data = changeList.value[0].data.filter(item => item.certificateName !== '').map((item) => {
+          item.id = ''
+          return item
+        })
         if (changeList.value[0].data.length) {
           for (const key in ruleForm.value) {
             if (ruleForm.value[key] === '') {
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
index 13144d2..5e28d9f 100644
--- a/src/views/measure/price/list_interface.ts
+++ b/src/views/measure/price/list_interface.ts
@@ -29,6 +29,7 @@
 }
 // 价格表单对象类型
 export interface priceForm {
+  priceStandardName?: string // 依据标准
   checkType: string // 校验类型-字典value
   createTime?: null | string // 创建时间
   directorDiscountPermission: string // 负责人折扣权限-字典value

diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index dbce999..5bd4111 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -45,6 +45,15 @@
     data,
   })
 }
+
+// 设备借用驳回后编辑
+export function failUpdate(data: object) {
+  return request({
+    url: '/equipmentApply/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 // 设备借用申请删除
 export function deleteApply(data: object) {
   return request({
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 9049282..7f9431b 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -1,6 +1,6 @@
 // 状态管理相关接口api
 import request from '../index'
-import type { ISearchQuery, ITableRow, Iapprove } from '@/views/device/stateManage/components/status-interface.ts'
+import type { ISearchQuery, Iapprove } from '@/views/device/stateManage/components/status-interface'
 
 // 设备申请列表
 export function getStatusList(data: ISearchQuery) {
@@ -11,7 +11,7 @@
   })
 }
 // 状态管理新建
-export function addStatus(data: ITableRow) {
+export function addStatus(data: Object) {
   return request({
     url: '/meter/stateManage/addStateManageInfo',
     method: 'post',
@@ -20,7 +20,7 @@
 }
 
 // 状态管理编辑
-export function updateStatus(data: ITableRow) {
+export function updateStatus(data: Object) {
   return request({
     url: '/meter/stateManage/updateStateManageInfo',
     method: 'post',
@@ -53,7 +53,7 @@
   })
 }
 // 状态管理详情
-export function detailStatus(data: ITableRow) {
+export function detailStatus(data: object) {
   return request({
     url: '/meter/stateManage/selectStateManageInfo',
     method: 'post',
diff --git a/src/components/SearchArea/SearchItem.vue b/src/components/SearchArea/SearchItem.vue
index 3adef93..dc53b08 100644
--- a/src/components/SearchArea/SearchItem.vue
+++ b/src/components/SearchArea/SearchItem.vue
@@ -23,7 +23,6 @@
   display: inline-block;
   margin-bottom: 10px;
   vertical-align: top;
-  box-sizing: inherit;
   margin-right: 5px;
 }
 
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index 12d7290..e3c72af 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -1,5 +1,9 @@
 // 证书打印查询
 export interface ICertPrintSearch {
+  certificateClass: string
+  certificateNo: string
+  createUserId: number
+  printStatus: number | null
   certificationReportCode: string // 证书编号
   orderNo: string // 委托书编号
   customerName: string // 委托方名称
@@ -13,7 +17,7 @@
   reason: string // 操作原因
   sampleId: string // 样品id
   status: string // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
-  ids?: []
+  ids?: [] | null
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 3daa2b5..391931b 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -22,6 +22,10 @@
 const activeTitle = ref('') // active对应的审批状态名字
 // 查询条件
 const listQuery = ref<ICertPrintSearch>({
+  certificateClass: '',
+  certificateNo: '', // 证书编号
+  createUserId: 0,
+  printStatus: 0, // 可打印(证书可打印传0,全部传null)
   certificationReportCode: '', // 证书编号
   orderNo: '', // 委托书编号
   customerName: '', // 委托方名称
@@ -30,11 +34,12 @@
   certificateReportType: '', // 证书类型
   printNum: '', // 打印次数 -未打印和全部用
   approvalStatus: '', // 审批状态-审批查询用
-  orderId: '0', // 委托书id
+  orderId: '', // 委托书id
   reason: '', // 操作原因
-  sampleId: '0', // 样品id
+  sampleId: '', // 样品id
   status: '', // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
   formId: SCHEDULE.BUSINESS_CERT_PRINT,
+  ids: null, // 设置默认值
   offset: 1,
   limit: 20,
 })
@@ -78,22 +83,30 @@
         }
       }
     })
+    if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+      active.value = window.sessionStorage.getItem('buttonBoxActive')!
+      activeTitle.value === '未通过'
+    }
+    else {
+      active.value = menu.value.find(item => item.name === '可打印')!.id // 可打印
+      activeTitle.value === '可打印'
+    }
   })
 }
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationReportCode', width: '110', align: 'center' },
-  { text: '证书名称', value: 'certificationReportName', width: '120', align: 'center' },
+  { text: '证书编号', value: 'certificateNo', width: '110', align: 'center' },
+  { text: '证书名称', value: 'certificateName', width: '120', align: 'center' },
   { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', width: '120', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', width: '120', align: 'center' },
   { text: '委托书编号', value: 'orderNo', width: '120', align: 'center' },
-  { text: '检校类别', value: 'customerNo', width: '120', align: 'center' },
-  { text: '检定人员', value: 'customerName', width: '120', align: 'center' },
-  { text: '证书类型', value: 'certificateReportTypeName', width: '120', align: 'center' },
-  { text: '打印状态', value: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
+  { text: '检校类别', value: 'measureType', width: '120', align: 'center' },
+  { text: '检定人员', value: 'measurePersonId', width: '120', align: 'center' },
+  { text: '证书类型', value: 'certificateType', width: '120', align: 'center' },
+  { text: '打印状态', value: 'printNum', align: 'center', width: '85px', filter: (row: ICerPrintList) => { var cnum = ['未打印', '一', '二', '三', '四', '五', '六', '七', '八', '九', '十']; return row.printNum == 0 ? '未打印' : `${cnum[parseInt(row.printNum)]}次打印` } },
   { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
 ])
 // 表格数据
@@ -107,37 +120,35 @@
 
 // 根据过滤查询条件
 function filterQuery() {
-  console.log(activeTitle)
+  const approvalStatus = menu.value.find(item => item.name === activeTitle.value)!.id
+  listQuery.value.approvalStatus = approvalStatus
   switch (activeTitle.value) {
     case '可打印':
-      listQuery.value.printNum = 0
+      listQuery.value.printStatus = 0
       listQuery.value.approvalStatus = ''
       break
     case '全部':
-      listQuery.value.printNum = 0
+      listQuery.value.printStatus = 2
       listQuery.value.approvalStatus = ''
       break
     case '待审批':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '1'
+      listQuery.value.printStatus = 2
       break
     case '审批中':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '2'
+      listQuery.value.printStatus = 2
       break
     case '已通过':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '3'
+      listQuery.value.printStatus = 2
       break
     case '未通过':
-      listQuery.value.printNum = ''
-      listQuery.value.approvalStatus = '4'
+      listQuery.value.printStatus = 2
       break
   }
 }
 
 // 数据查询
 function fetchData(isNowPage = false) {
+  console.log(listQuery)
   filterQuery()
   loadingTable.value = true
   if (!isNowPage) {
@@ -146,15 +157,11 @@
   }
   // 模拟数据
   loadingTable.value = false
-  list.value = [
-    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '0', printStatusName: '未打印', certificateReportTypeName: '自检', approvalStatusName: '待审批', taskId: '100', id: '10' },
-    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '1', printStatusName: '已打印', certificateReportTypeName: '自检', approvalStatusName: '待审批', taskId: '1001', id: '101' },
-  ]
-  // getCertList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
+  getCertList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -167,7 +174,12 @@
 }
 // 点击重置
 const clearList = () => {
+  const approvalStatus = menu.value.find(item => item.name === activeTitle.value)!.id
   listQuery.value = {
+    certificateClass: '',
+    certificateNo: '', // 证书编号
+    createUserId: 0,
+    printStatus: 0, // 可打印(证书可打印传0,全部传null)
     certificationReportCode: '', // 证书编号
     orderNo: '', // 委托书编号
     customerName: '', // 委托方名称
@@ -176,14 +188,18 @@
     certificateReportType: '', // 证书类型
     printNum: '', // 打印次数 -未打印和全部用
     approvalStatus: '', // 审批状态-审批查询用
-    orderId: '0', // 委托书id
+    orderId: '', // 委托书id
     reason: '', // 操作原因
-    sampleId: '0', // 样品id
+    sampleId: '', // 样品id
     status: '', // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
     formId: SCHEDULE.BUSINESS_CERT_PRINT,
     offset: 1,
     limit: 20,
   }
+  listQuery.value.approvalStatus = approvalStatus
+  if (activeTitle.value === '可打印' || activeTitle.value === '全部') {
+    listQuery.value.approvalStatus = ''
+  }
   fetchData(true)
 }
 // 点击详情
@@ -226,14 +242,14 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   if (list.value.length > 0) {
-    // const params = {
-    //   ...listQuery.value,
-    //   ids: checkoutList.value,
-    // }
-    // exportCert(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '证书打印列表.xlsx')
-    // })
+    const params = {
+      ...listQuery.value,
+      ids: checkoutList.value,
+    }
+    exportCert(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '证书打印列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
@@ -243,10 +259,9 @@
 
 // 打印
 const bindLabel = (row: ICerPrintList) => {
-  console.log(1)
-  row.printNum = 1
+  console.log(row)
   // 判断状态第一次可以直接打印,之后的打印需要审批
-  if (row.printNum == 1) {
+  if (row.printNum == 0) {
     ElMessageBox.confirm(
       '确定要打印吗？',
       '确认操作',
@@ -319,18 +334,9 @@
 
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
-    active.value = window.sessionStorage.getItem('buttonBoxActive')!
-  }
-  else {
-    active.value = menu.value.find(item => item.name === '可打印')!.id // 可打
-    activeTitle.value === '可打印'
-  }
+
   fetchData(true)
 })
-onUnmounted(() => {
-  window.sessionStorage.setItem('buttonBoxActive', '') // 清除
-})
 </script>
 
 <template>
@@ -342,7 +348,7 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.certificationReportCode"
+          v-model.trim="listQuery.certificateNo"
           placeholder="证书编号"
           class="short-input"
           clearable
@@ -373,7 +379,7 @@
         />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 120px;" clearable>
+        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 160px;" clearable>
           <el-option v-for="item in certificationClassList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
@@ -388,19 +394,19 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column v-if="listQuery.printNum === ''" label="审批状态" align="center" width="90px" prop="approvalStatusName" />
+          <el-table-column label="审批状态" align="center" width="90px" prop="approvalStatusName" />
           <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
               </el-button>
-              <el-button v-if="listQuery.printNum === 0 || (listQuery.approvalStatus === '3')" size="small" link type="primary" @click="bindLabel(row)">
+              <el-button v-if="activeTitle === '全部' || activeTitle === '可打印'" size="small" link type="primary" @click="bindLabel(row)">
                 打印
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'agree')">
+              <el-button v-if="activeTitle === '待审批'" size="small" type="primary" link @click="handleDistribute(row, 'agree')">
                 同意
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'refuse')">
+              <el-button v-if="activeTitle === '待审批'" size="small" type="primary" link @click="handleDistribute(row, 'refuse')">
                 拒绝
               </el-button>
             </template>
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 2f8f8a4..fa8e6b0 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -392,4 +392,7 @@
 
 <style lang="scss" scoped>
 // 样式
+.short-input {
+  width: 180px !important;
+}
 </style>
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 2e8e4a7..5d7fc0f 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,5 +1,5 @@
 <!-- 设备借用处理 -->
-<script lang="ts" setup name="borrowApply">
+<script lang="ts" setup name="BorrowHandle">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
@@ -44,7 +44,7 @@
   applyPersonName: '', // 申请人姓名
   startTime: '', // 领用开始日期
   endTime: '', // 领用结束日期
-  approvalStatus: '4', // 	审批状态
+  approvalStatus: '4', // 	审批状态 (已完成)
   processResult: '1' || active.value, // 	处置结果 (3个状态字典值)
   applyType: '2', // 申请类型 借用2
   createUser: '', // 创建人
@@ -373,7 +373,7 @@
     active.value = window.sessionStorage.getItem('buttonBoxActive')!
   }
   else {
-    active.value = menu.value.find(item => item.name === '待借用')!.id // 全部
+    active.value = menu.value.find(item => item.name === '待借用')!.id // 待借用
     activeTitle.value === '待借用'
   }
   nextTick(() => {
@@ -394,6 +394,7 @@
         <el-input
           v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
+          class="short-input"
           clearable
         />
       </search-item>
@@ -401,6 +402,7 @@
         <el-input
           v-model.trim="listQuery.applyName"
           placeholder="申请名称"
+          class="short-input"
           clearable
         />
       </search-item>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index aae69c7..a59267d 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,5 +1,5 @@
 <!-- 设备借用申请 -->
-<script lang="ts" setup name="borrowApply">
+<script lang="ts" setup name="BorrowApply">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
@@ -49,7 +49,7 @@
   applyPersonName: '', // 申请人姓名
   startTime: '', // 领用开始日期
   endTime: '', // 领用结束日期
-  approvalStatus: active.value, // 	审批状态
+  approvalStatus: active.value, // 	审批状态 1 2 3 对应待借用|已借用|已归还
   processResult: '', // 	处置结果
   applyType: '2', // 申请类型 借用2
   createUser: '', // 创建人
@@ -156,7 +156,7 @@
     applyPerson: '', // 申请人
     startTime: '', // 申请开始日期
     endTime: '', // 申请结束日期
-    approvalStatus: active.value, // 	审批状态
+    approvalStatus: active.value, // 	审批状态  // 	审批状态 1 2 3 对应待借用|已借用|已归还
     processResult: '', // 	处置结果
     applyType: '2', // 申请类型 借用2
     createUser: '', // 创建人
@@ -193,27 +193,8 @@
   })
 }
 
-onMounted(async () => {
-  await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
-    active.value = window.sessionStorage.getItem('buttonBoxActive')!
-  }
-  else {
-    active.value = menu.value.find(item => item.name === '全部')!.id // 全部
-    activeTitle.value === '全部'
-  }
-  nextTick(() => {
-    fetchData(true) // 获取表格数据
-    fetchDeptTreeList() // 获取使用部门
-    fetchUserList() // 获取人员列表
-  })
-})
 const $router = useRouter()
 
-onUnmounted(() => {
-  window.sessionStorage.setItem('buttonBoxActive', '') // 清除
-})
-
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
@@ -434,6 +415,21 @@
     }
   }
 }
+onMounted(async () => {
+  await getDict() // 获取字典-审批状态
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+    active.value = window.sessionStorage.getItem('buttonBoxActive')!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '全部')!.id // 全部
+    activeTitle.value === '全部'
+  }
+  nextTick(() => {
+    fetchData(true) // 获取表格数据
+    fetchDeptTreeList() // 获取使用部门
+    fetchUserList() // 获取人员列表
+  })
+})
 </script>
 
 <template>
@@ -446,6 +442,7 @@
         <el-input
           v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
+          class="short-input"
           clearable
         />
       </search-item>
@@ -453,6 +450,7 @@
         <el-input
           v-model.trim="listQuery.applyName"
           placeholder="申请名称"
+          class="short-input"
           clearable
         />
       </search-item>
@@ -506,7 +504,7 @@
           <el-table-column
             label="操作"
             align="center"
-            :width="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 70 : 200"
+            :width="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 140 : 200"
             fixed="right"
           >
             <template #default="{ row }">
@@ -557,6 +555,17 @@
               >
                 编辑
               </el-button>
+
+              <el-button
+                v-if="proxy.hasPerm('/device/borrow/borrowapply/update') && activeTitle === '未通过'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName.search('驳回') === -1 "
+                @click="handleEdit(row, '编辑', 'edit')"
+              >
+                编辑
+              </el-button>
               <el-button
                 v-if="proxy.hasPerm('/device/borrow/borrowapply/update') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
                 size="small"
diff --git a/src/views/device/borrow/components/approvalActionDialog.vue b/src/views/device/borrow/components/approvalActionDialog.vue
deleted file mode 100644
index 9375861..0000000
--- a/src/views/device/borrow/components/approvalActionDialog.vue
+++ /dev/null
@@ -1,109 +0,0 @@
-<!-- 审批操作弹窗 -->
-<script lang="ts" setup>
-import type { FormInstance, FormRules } from 'element-plus'
-import dayjs from 'dayjs'
-import useUserStore from '@/store/modules/user'
-const emits = defineEmits(['resetData'])
-const userInfo = useUserStore()
-const dialogVisibleApprove = ref(false)
-const form = reactive({
-  radio: '1',
-  certificateNo: '',
-  certificateName: '',
-  certificateCompany: '',
-  certificateDate: '',
-  validDate: '',
-})
-const ruleFormRef = ref<FormInstance>()
-const rules = reactive<FormRules>({
-})
-// 重置
-const resetData = () => {
-  form.certificateNo = ''
-  form.certificateName = ''
-  form.certificateCompany = ''
-  form.certificateDate = ''
-  form.validDate = ''
-}
-const approvetime = ref('') // 审批时间
-const initDialog = (row: any) => {
-  dialogVisibleApprove.value = true
-  approvetime.value = dayjs().format('YYYY-MM-DD HH:mm:ss')
-  form.radio = row.radio
-}
-defineExpose({ initDialog })
-
-// 点击保存
-const submitForm = async (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  await formEl.validate((valid, fields) => {
-    if (valid) {
-      dialogVisibleApprove.value = false
-      emits('resetData')
-    }
-  })
-}
-// 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  formEl.resetFields()
-  dialogVisibleApprove.value = false
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogVisibleApprove" title="审批操作" width="50%">
-    <el-form
-      ref="ruleFormRef" :model="form"
-      :rules="rules" label-width="110px"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见">
-            <el-radio-group v-model="form.radio" style="width: 100%;">
-              <el-radio label="1">
-                同意
-              </el-radio>
-              <el-radio label="2">
-                拒绝
-              </el-radio>
-              <el-radio label="3">
-                驳回
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论">
-            <el-input
-              :rows="4"
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人">
-            <el-input disabled :value="userInfo.$state.name" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间">
-            <el-input disabled :value="approvetime" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
-        <el-button @click="resetForm(ruleFormRef)">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/device/borrow/editHandle.vue b/src/views/device/borrow/editHandle.vue
index d2e423c..9a5b2a6 100644
--- a/src/views/device/borrow/editHandle.vue
+++ b/src/views/device/borrow/editHandle.vue
@@ -1,4 +1,5 @@
-<script lang="ts" setup name="Detail">
+<!-- 设备借用处理详情/编辑 -->
+<script lang="ts" setup name="EditHandle">
 import { onMounted, ref } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { ElLoading } from 'element-plus'
@@ -17,7 +18,6 @@
 const { proxy } = getCurrentInstance() as any
 const useDeptList = ref<deptType[]>([]) // 部门列表
 const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
-const total = ref(20)// 总数
 // 表单数据
 const form = ref({
   id: '',
@@ -29,19 +29,7 @@
   applyDesc: '', // 申请说明
 })
 const list = ref<IdeviceList[]>([])// 表格数据
-// 查询条件
-const listQuery: Ref<IdeviceListQuery> = ref({
-  equipmentName: '', // 仪器名称
-  equipmentNo: '', // 设备编号
-  modelNo: '', // 型号
-  mesureRange: '', // 测量范围
-  useDeptName: '', // 使用部门
-  usePersonName: '', // 使用人
-  managerStateName: '', // 管理状态
-  validDate: '', // 有效日期
-  offset: 1,
-  limit: 20,
-})
+
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '设备编号', value: 'equipmentNo', align: 'center', width: '230' },
@@ -82,11 +70,11 @@
   $router.back()
 }
 
-// 打印
+// 设备借用处理详情打印
 const printObj = ref({
   id: 'lysq', // 需要打印元素的id
   popTitle: '设备借用处理', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备借用处理</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备借用处理详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
@@ -125,7 +113,7 @@
   <app-container>
     <detail-page title="设备借用处理-详情">
       <template #btns>
-        <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/device/borrow/borrowhandle/print')" v-print="printObj" type="primary">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -225,22 +213,6 @@
     background-color: #fff;
     // padding: 10px;
 
-    .title-button {
-      display: flex;
-      align-items: center;
-
-      &::before {
-        content: "";
-        flex: 1;
-      }
-
-      .button-group {
-        flex: 1;
-        display: flex;
-        justify-content: flex-end;
-      }
-    }
-
     .form-area {
       margin-top: 40px;
     }
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index b76ab3e..18879cc 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -352,6 +352,7 @@
   formInline.value.acceptanceCheckId = object.id
   checkIdObject.value = object
   // 获取到详情
+
   equipmentApplyInfo({ id: object.id }).then((res) => {
     res.data.equipmentInfoList.map((item: objectReturn) => {
       if (item.id) {
@@ -492,11 +493,11 @@
         <el-row :gutter="20" class="marg">
           <el-col :span="14">
             <el-form-item label="附件:">
-              <show-photo v-if="formInline.fileList[0].minioFileName" :minio-file-name="formInline.fileList[0].minioFileName" />
+              <show-photo v-if="formInline.fileList" :minio-file-name="formInline.fileList.length && formInline.fileList[0].minioFileName ? formInline.fileList[0].minioFileName : ''" />
               <span v-else-if="pageType === 'detail'">无</span>
               <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.fileList[0].minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                {{ formInline.fileList[0].minioFileName === '' ? '上传' : '更换附件' }}
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.fileList.length && formInline.fileList[0].minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.fileList.length && formInline.fileList[0].minioFileName ? '上传' : '更换附件' }}
               </el-button>
             </el-form-item>
           </el-col>
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 73b9c0b..b21f663 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -543,6 +543,20 @@
 const addId = ref('')
 // 点击顶部一排按钮
 const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  // 添加校验条件
+  if (fromListInfo.value.fixedAssetsList) {
+    if (!fromListInfo.value.fixedAssetsList[0]?.id) {
+      ElMessage.warning('标准配套设备更换不能为空!')
+      return
+    }
+  }
+  if (fromListInfo.value.fileList) {
+    if (!fromListInfo.value.fileList[0]?.fileName) {
+      ElMessage.warning('申请文档不能为空!')
+      return
+    }
+  }
+
   if (item === '保存' && pageType.value === 'add') {
     if (!formEl) {
       return
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 0f8a9d5..3452009 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -148,7 +148,7 @@
     ABCList.value = response.data
   })
   // 获取检定方式
-  getDictByCode('mesureType').then((response) => {
+  getDictByCode('measureType').then((response) => {
     mesureTypeList.value = response.data
   })
   // 获取专业分类
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index e261313..0c76e05 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -116,7 +116,7 @@
     }
   })
   // 获取检定方式
-  getDictByCode('mesureType').then((response) => {
+  getDictByCode('measureType').then((response) => {
     mesureTypeList.value = response.data
   })
   // 获取管理状态
@@ -199,8 +199,15 @@
 }
 // 重置
 const reset = () => {
-  // searchQuery.fileNo = ''
   validDate.value = ''
+  searchQuery.equipmentNo = '' // 设备编号
+  searchQuery.equipmentName = ''
+  searchQuery.mesureType = ''
+  searchQuery.managerState = ''
+  searchQuery.useDept = ''
+  searchQuery.validStartDate = ''
+  searchQuery.validEndDate = ''
+  searchQuery.abc = ''
   getList()
 }
 // 模板下载
@@ -347,7 +354,7 @@
           <el-date-picker
             v-model="validDate"
             type="daterange"
-            format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+            format="YYYY-MM-DD" value-format="YYYY-MM-DD"
             range-separator="至"
             start-placeholder="有效开始日期"
             end-placeholder="有效结束日期"
diff --git a/src/views/device/stateManage/components/status-interface.ts b/src/views/device/stateManage/components/status-interface.ts
index caa43b1..93410a7 100644
--- a/src/views/device/stateManage/components/status-interface.ts
+++ b/src/views/device/stateManage/components/status-interface.ts
@@ -29,7 +29,7 @@
   equipmentName: string // 设备名称
   equipmentNo: string // 设备编号
   fileList: string // 文件列表
-  id: number // 主键id
+  id: number | string // 主键id
   isDel: number // 删除标记
   managerState: string //  管理状态
   managerStateName: string // 管理状态名称
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 05ba922..c53574f 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -1,5 +1,5 @@
-<!-- 新增或详情弹窗 -->
-<script lang="ts" setup name="add">
+<!-- 新增或详情弹窗 设备借用处理新增编辑 -->
+<script lang="ts" setup name="TemplateAdd">
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import type { EquipmentListRow, IdeviceList, IdeviceListQuery } from './status-interface'
@@ -14,7 +14,7 @@
 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, submitApply } from '@/api/device/borrow'
+import { addApply, deleteApply, detailApply, editApply, failUpdate, submitApply } from '@/api/device/borrow'
 import { addStatus, detailStatus, updateStatus } from '@/api/device/stateManage'
 import type { borrowDeviceType } from '@/views/device/borrow/borrow'
 import useUserStore from '@/store/modules/user'
@@ -60,6 +60,7 @@
   applyType: '', // 申请类型
   applyName: '', // 申请名称
   createUser: userInfo.$state.id,
+  approvalStatus: '',
   createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
   id: '',
 })
@@ -116,21 +117,6 @@
 const usePersonList = ref<userType[]>([]) // 使用人列表
 const useDeptList = ref<deptType[]>([]) // 使用部门列表
 const useDeptListNoTree = ref([]) // 使用部门列表非树结构
-const isWhether = ref<selectType[]>([
-  {
-    name: '是',
-    id: 'shi',
-    value: '1',
-  },
-  {
-    name: '否',
-    id: 'fou',
-    value: '0',
-  },
-])
-const deptProps = reactive({
-  parent: 'pid', value: 'id', label: 'name', children: 'children',
-})
 // 获取下拉框数
 const fetchData = () => {
 // 获取资产类型
@@ -209,7 +195,12 @@
       detailApply({ id: row.id }).then((res) => {
         processId.value = res.data.processId // 流程id存在的时候赋值
         ruleForm2.value = res.data
-        borrowList.value = res.data.equipmentInfoList
+        borrowList.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
+          return {
+            ...item,
+            validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+          }
+        })
       })
     }
   }
@@ -286,28 +277,58 @@
     //  设备借用
     if (!formEl2) { return }
     if (ruleForm2.value.id) {
-      await formEl2.validate((valid, fields) => {
-        if (valid) {
-          ElMessageBox.confirm(
-            '确认提交吗?',
-            '提示',
-            {
-              confirmButtonText: '确认',
-              cancelButtonText: '取消',
-              type: 'warning',
-            },
-          ).then(() => {
-            const params = {
-              id: ruleForm2.value.id,
-              formId: SCHEDULE.DEVICE_BORROW_APPROVAL, // 表单id
-            }
-            submitApply(params).then(() => {
-              ElMessage.success('操作成功!')
-              $router.go(-1)
+      // 如果是编辑-驳回时候发起单独的接口
+      if (ruleForm2.value.approvalStatus === '7') {
+        await formEl2.validate((valid, fields) => {
+          if (valid) {
+            ElMessageBox.confirm(
+              '确认提交吗?',
+              '提示',
+              {
+                confirmButtonText: '确认',
+                cancelButtonText: '取消',
+                type: 'warning',
+              },
+            ).then(() => {
+              ruleForm2.value.applyType = '2'
+              // const params = {
+              //   ...ruleForm2.value,
+              //   equipmentList: borrowList.value.map(item => ({
+              //     equipmentId: item.id,
+              //   })),
+              // }
+              failUpdate({ ...ruleForm2.value }).then(() => {
+                ElMessage.success('操作成功!')
+                $router.go(-1)
+              })
             })
-          })
-        }
-      })
+          }
+        })
+      }
+      else {
+        await formEl2.validate((valid, fields) => {
+          if (valid) {
+            ElMessageBox.confirm(
+              '确认提交吗?',
+              '提示',
+              {
+                confirmButtonText: '确认',
+                cancelButtonText: '取消',
+                type: 'warning',
+              },
+            ).then(() => {
+              const params = {
+                id: ruleForm2.value.id,
+                formId: SCHEDULE.DEVICE_BORROW_APPROVAL, // 表单id
+              }
+              submitApply(params).then(() => {
+                ElMessage.success('操作成功!')
+                $router.go(-1)
+              })
+            })
+          }
+        })
+      }
     }
     else {
       ElMessage.info('请先保存再提交！')
@@ -443,14 +464,15 @@
 }
 const columns = ref<TableColumn[]>([
   {
-    text: '设备名称',
-    value: 'equipmentName',
-    align: 'center',
-  },
-  {
     text: '设备编号',
     value: 'equipmentNo',
     align: 'center',
+    width: 240,
+  },
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
   },
   {
     text: '型号',
@@ -657,9 +679,6 @@
         <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'refuse' })">
           拒绝
         </el-button> -->
-        <el-button v-if="title === '详情' && isPrint" type="primary">
-          打印
-        </el-button>
         <!-- <el-button v-if="title === '详情' && isCancel" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
           提交
         </el-button> -->
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 0c22c33..9696d06 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -571,8 +571,7 @@
                   type="primary"
                   link
                   :disabled="
-                    (row.approvalStatus !== '待审批'
-                      && row.approvalStatus !== '审批中')
+                    (row.approvalStatus !== '审批中')
                       || row.decisionItem === 3"
                   @click="agree(row)"
                 >
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 531fe0d..1bce5f9 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -328,12 +328,5 @@
 </template>
 
 <style lang="scss" scoped>
-.isDetail {
-  ::v-deep {
-    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-      display: none;
-    }
-  }
-}
+// 样式
 </style>
diff --git a/src/views/measure/file/components/approve/addDialog.vue b/src/views/measure/file/components/approve/addDialog.vue
index c4d646a..6e8414b 100644
--- a/src/views/measure/file/components/approve/addDialog.vue
+++ b/src/views/measure/file/components/approve/addDialog.vue
@@ -211,9 +211,15 @@
   approvalDialog.value.initDialog(type, processId)
 }
 // 打印
-const print = () => {
-  printHtml('print')
-}
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: `文件审批${title.value}`, // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备领用详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -299,7 +305,7 @@
           </el-button>
         </div>
         <div v-if="approvalStatusName === '已通过' || approvalStatusName === '未通过'">
-          <el-button type="primary" @click="print">
+          <el-button v-print="printObj" type="primary">
             打印
           </el-button>
           <el-button type="info" @click="resetForm(ruleFormRef)">
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 64eff7b..088cb52 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -477,7 +477,6 @@
 // 提交
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
-  console.log(changeList)
   // 当前选中的证书基本信息列表
   const currentData = currentShow.value.data
   await formEl.validate((valid, fields) => {
@@ -491,7 +490,10 @@
           type: 'warning',
         },
       ).then(() => {
-        changeList.value[0].data = changeList.value[0].data.filter(item => item.certificateName !== '')
+        changeList.value[0].data = changeList.value[0].data.filter(item => item.certificateName !== '').map((item) => {
+          item.id = ''
+          return item
+        })
         if (changeList.value[0].data.length) {
           for (const key in ruleForm.value) {
             if (ruleForm.value[key] === '') {
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
index 13144d2..5e28d9f 100644
--- a/src/views/measure/price/list_interface.ts
+++ b/src/views/measure/price/list_interface.ts
@@ -29,6 +29,7 @@
 }
 // 价格表单对象类型
 export interface priceForm {
+  priceStandardName?: string // 依据标准
   checkType: string // 校验类型-字典value
   createTime?: null | string // 创建时间
   directorDiscountPermission: string // 负责人折扣权限-字典value
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 14cf2eb..828d6c2 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -28,6 +28,7 @@
 const priceStandardName = ref('')
 // 默认数据
 const defaultForm: priceForm = {
+  priceStandardName: '', // 依据标准
   checkType: '', // 检校类型
   createTime: null, // 创建时间
   directorDiscountPermission: '', // 负责人折扣权限-字典value
@@ -105,6 +106,8 @@
 
 // 点击提交/导出按钮
 const getAddList = async (formEl: FormInstance | undefined, type: string) => {
+  console.log(priceStandardName)
+  console.log(formEl)
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
@@ -162,8 +165,10 @@
 }
 // 选择价格依据
 const verificationList = (data: dataType) => {
+  console.log(data)
   formInline.value.priceStandard = data.id
   priceStandardName.value = data.fileName
+  formInline.value.priceStandardName = priceStandardName.value
 }
 </script>
 
@@ -245,7 +250,7 @@
             <el-col :span="6">
               <el-form-item label="依据标准:" prop="priceStandardName">
                 <el-input
-                  v-model.trim="priceStandardName"
+                  v-model.trim="formInline.priceStandardName"
                   clearable
                   :placeholder="pageType === 'detail' ? '' : '依据标准'"
                   :disabled="pageType === 'detail'"