diff --git a/.env.production b/.env.production
index 0fca4ad..ff5a80a 100644
--- a/.env.production
+++ b/.env.production
@@ -3,9 +3,9 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:21609
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-VITE_APP_API_BASEURL = http://192.168.2.96:8085
+# VITE_APP_API_BASEURL = http://192.168.2.96:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 

diff --git a/.env.production b/.env.production
index 0fca4ad..ff5a80a 100644
--- a/.env.production
+++ b/.env.production
@@ -3,9 +3,9 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:21609
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-VITE_APP_API_BASEURL = http://192.168.2.96:8085
+# VITE_APP_API_BASEURL = http://192.168.2.96:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index f342066..9c4581f 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -196,7 +196,7 @@
 
       <el-table-column v-if="!isMulti" label="" width="60" align="center" fixed>
         <template #default="scope">
-          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+          <el-radio v-model="singleChecked" :disabled="scope.row.isRadioDisabled" :label="scope.row.id" class="radio" @change="radioChange" />
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />

diff --git a/.env.production b/.env.production
index 0fca4ad..ff5a80a 100644
--- a/.env.production
+++ b/.env.production
@@ -3,9 +3,9 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:21609
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-VITE_APP_API_BASEURL = http://192.168.2.96:8085
+# VITE_APP_API_BASEURL = http://192.168.2.96:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index f342066..9c4581f 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -196,7 +196,7 @@
 
       <el-table-column v-if="!isMulti" label="" width="60" align="center" fixed>
         <template #default="scope">
-          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+          <el-radio v-model="singleChecked" :disabled="scope.row.isRadioDisabled" :label="scope.row.id" class="radio" @change="radioChange" />
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index b2bfdba..f685105 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -462,7 +462,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column v-if="activeTitle === '已归还'" label="归还时间" width="160" align="center">
+          <el-table-column v-if="activeTitle === '已归还'" label="归还时间" width="180" align="center">
             <template #default="scope">
               {{ scope.row.backTime }}
             </template>

diff --git a/.env.production b/.env.production
index 0fca4ad..ff5a80a 100644
--- a/.env.production
+++ b/.env.production
@@ -3,9 +3,9 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:21609
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-VITE_APP_API_BASEURL = http://192.168.2.96:8085
+# VITE_APP_API_BASEURL = http://192.168.2.96:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index f342066..9c4581f 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -196,7 +196,7 @@
 
       <el-table-column v-if="!isMulti" label="" width="60" align="center" fixed>
         <template #default="scope">
-          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+          <el-radio v-model="singleChecked" :disabled="scope.row.isRadioDisabled" :label="scope.row.id" class="radio" @change="radioChange" />
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index b2bfdba..f685105 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -462,7 +462,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column v-if="activeTitle === '已归还'" label="归还时间" width="160" align="center">
+          <el-table-column v-if="activeTitle === '已归还'" label="归还时间" width="180" align="center">
             <template #default="scope">
               {{ scope.row.backTime }}
             </template>
diff --git a/src/views/device/borrow/editHandle.vue b/src/views/device/borrow/editHandle.vue
index 0bd10c8..e3fe562 100644
--- a/src/views/device/borrow/editHandle.vue
+++ b/src/views/device/borrow/editHandle.vue
@@ -55,6 +55,7 @@
     form.value.applyPerson = res.data.applyPerson// 申请人
     form.value.time = res.data.time // 借用时间
     form.value.applyDesc = res.data.applyDesc // 申请说明
+    form.value.backTime = res.data.backTime // 归还时间
     list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
       return {
         ...item,

diff --git a/.env.production b/.env.production
index 0fca4ad..ff5a80a 100644
--- a/.env.production
+++ b/.env.production
@@ -3,9 +3,9 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:21609
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-VITE_APP_API_BASEURL = http://192.168.2.96:8085
+# VITE_APP_API_BASEURL = http://192.168.2.96:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index f342066..9c4581f 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -196,7 +196,7 @@
 
       <el-table-column v-if="!isMulti" label="" width="60" align="center" fixed>
         <template #default="scope">
-          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+          <el-radio v-model="singleChecked" :disabled="scope.row.isRadioDisabled" :label="scope.row.id" class="radio" @change="radioChange" />
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index b2bfdba..f685105 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -462,7 +462,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column v-if="activeTitle === '已归还'" label="归还时间" width="160" align="center">
+          <el-table-column v-if="activeTitle === '已归还'" label="归还时间" width="180" align="center">
             <template #default="scope">
               {{ scope.row.backTime }}
             </template>
diff --git a/src/views/device/borrow/editHandle.vue b/src/views/device/borrow/editHandle.vue
index 0bd10c8..e3fe562 100644
--- a/src/views/device/borrow/editHandle.vue
+++ b/src/views/device/borrow/editHandle.vue
@@ -55,6 +55,7 @@
     form.value.applyPerson = res.data.applyPerson// 申请人
     form.value.time = res.data.time // 借用时间
     form.value.applyDesc = res.data.applyDesc // 申请说明
+    form.value.backTime = res.data.backTime // 归还时间
     list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
       return {
         ...item,
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index 0ada9c2..a884fd8 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -19,6 +19,7 @@
   remark: string // 备注
   updateTime: null | string // 更新时间
   approvalStatusName?: string // 审批状态名称
+  decisionItem?: string | number
 }
 // 标准配套设备表头类型
 export interface columnsType {

diff --git a/.env.production b/.env.production
index 0fca4ad..ff5a80a 100644
--- a/.env.production
+++ b/.env.production
@@ -3,9 +3,9 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:21609
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-VITE_APP_API_BASEURL = http://192.168.2.96:8085
+# VITE_APP_API_BASEURL = http://192.168.2.96:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index f342066..9c4581f 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -196,7 +196,7 @@
 
       <el-table-column v-if="!isMulti" label="" width="60" align="center" fixed>
         <template #default="scope">
-          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+          <el-radio v-model="singleChecked" :disabled="scope.row.isRadioDisabled" :label="scope.row.id" class="radio" @change="radioChange" />
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index b2bfdba..f685105 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -462,7 +462,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column v-if="activeTitle === '已归还'" label="归还时间" width="160" align="center">
+          <el-table-column v-if="activeTitle === '已归还'" label="归还时间" width="180" align="center">
             <template #default="scope">
               {{ scope.row.backTime }}
             </template>
diff --git a/src/views/device/borrow/editHandle.vue b/src/views/device/borrow/editHandle.vue
index 0bd10c8..e3fe562 100644
--- a/src/views/device/borrow/editHandle.vue
+++ b/src/views/device/borrow/editHandle.vue
@@ -55,6 +55,7 @@
     form.value.applyPerson = res.data.applyPerson// 申请人
     form.value.time = res.data.time // 借用时间
     form.value.applyDesc = res.data.applyDesc // 申请说明
+    form.value.backTime = res.data.backTime // 归还时间
     list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
       return {
         ...item,
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index 0ada9c2..a884fd8 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -19,6 +19,7 @@
   remark: string // 备注
   updateTime: null | string // 更新时间
   approvalStatusName?: string // 审批状态名称
+  decisionItem?: string | number
 }
 // 标准配套设备表头类型
 export interface columnsType {
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 7f02a38..ba6cc7d 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -254,7 +254,13 @@
 }
 // 跳转到详情
 const goDetail = (row: IlistApproval, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`)
+  $router.push({
+    path: `/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`,
+    query: {
+      decisionItem: `${row.decisionItem}`, // 同意、驳回、拒绝
+      taskId: row.taskId,
+    },
+  })
 }
 // 获取到组织信息
 const getDept = () => {
@@ -275,7 +281,7 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    submitEquipmentApply({ id: row.id, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
+    submitEquipmentApply({ id: row.id, formId: SCHEDULE.DEVICE_FIX_APPROVAL, processId: row.processId }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -488,20 +494,8 @@
               >
                 取消
               </el-button>
-              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <!-- <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                @click="clickBtn(row, '删除')"
-              >
-                删除
-              </el-button> -->
-              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
               <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
                 size="small"
                 link
                 type="danger"

diff --git a/.env.production b/.env.production
index 0fca4ad..ff5a80a 100644
--- a/.env.production
+++ b/.env.production
@@ -3,9 +3,9 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:21609
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-VITE_APP_API_BASEURL = http://192.168.2.96:8085
+# VITE_APP_API_BASEURL = http://192.168.2.96:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index f342066..9c4581f 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -196,7 +196,7 @@
 
       <el-table-column v-if="!isMulti" label="" width="60" align="center" fixed>
         <template #default="scope">
-          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+          <el-radio v-model="singleChecked" :disabled="scope.row.isRadioDisabled" :label="scope.row.id" class="radio" @change="radioChange" />
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index b2bfdba..f685105 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -462,7 +462,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column v-if="activeTitle === '已归还'" label="归还时间" width="160" align="center">
+          <el-table-column v-if="activeTitle === '已归还'" label="归还时间" width="180" align="center">
             <template #default="scope">
               {{ scope.row.backTime }}
             </template>
diff --git a/src/views/device/borrow/editHandle.vue b/src/views/device/borrow/editHandle.vue
index 0bd10c8..e3fe562 100644
--- a/src/views/device/borrow/editHandle.vue
+++ b/src/views/device/borrow/editHandle.vue
@@ -55,6 +55,7 @@
     form.value.applyPerson = res.data.applyPerson// 申请人
     form.value.time = res.data.time // 借用时间
     form.value.applyDesc = res.data.applyDesc // 申请说明
+    form.value.backTime = res.data.backTime // 归还时间
     list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
       return {
         ...item,
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index 0ada9c2..a884fd8 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -19,6 +19,7 @@
   remark: string // 备注
   updateTime: null | string // 更新时间
   approvalStatusName?: string // 审批状态名称
+  decisionItem?: string | number
 }
 // 标准配套设备表头类型
 export interface columnsType {
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 7f02a38..ba6cc7d 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -254,7 +254,13 @@
 }
 // 跳转到详情
 const goDetail = (row: IlistApproval, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`)
+  $router.push({
+    path: `/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`,
+    query: {
+      decisionItem: `${row.decisionItem}`, // 同意、驳回、拒绝
+      taskId: row.taskId,
+    },
+  })
 }
 // 获取到组织信息
 const getDept = () => {
@@ -275,7 +281,7 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    submitEquipmentApply({ id: row.id, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
+    submitEquipmentApply({ id: row.id, formId: SCHEDULE.DEVICE_FIX_APPROVAL, processId: row.processId }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -488,20 +494,8 @@
               >
                 取消
               </el-button>
-              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <!-- <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                @click="clickBtn(row, '删除')"
-              >
-                删除
-              </el-button> -->
-              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
               <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
index 35cbba2..5584541 100644
--- a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -1,10 +1,12 @@
 <!-- 设备检修列表新增、编辑、详情 -->
 <script lang="ts" setup name="maintenanceDetail">
 import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox, rowContextKey } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
+import { Row } from 'element-plus/es/components/table-v2/src/components'
 import type { IlistPageAddTypes, columnsType, returnRowType } from '../checkList_interface'
+import selectDeviceDialog from './selectDevice.vue'
 import { addEquipmentApply, equipmentApplyInfo, failUpdateEquipmentApply, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
@@ -13,17 +15,19 @@
 import type { userType } from '@/views/system/user/user-interface'
 import { cancelApproval, fetchApproval } from '@/api/approval'
 import { SCHEDULE } from '@/utils/scheduleDict'
-import addRow from '@/views/device/stateManage/components/selectDevice.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
 import useUserStore from '@/store/modules/user'
-
+const approvalDialog = ref() // 审批对话ref
 const user = useUserStore() // 用户信息
 const approvalRecord = ref() // 审批流程组件ref
 const infoId = ref('') // id
 const from = ref('') // reject代表未通过-驳回
 const buttonArray = ref<string[]>([])
 const pageType = ref('add') // 页面类型: add,edit, detail
+const decisionItem = ref('') // 同意、驳回、拒绝按钮权限
+const approvalStatusName = ref('') // 审批状态名称
+const taskId = ref('') // 任务id，用于同意、驳回、拒绝审批
 const textMap: { [key: string]: string } = {
   add: '新建',
   edit: '编辑',
@@ -167,44 +171,7 @@
 
 // 表格选中的数组
 const SelectionList = ref<object[]>([])
-// 取消
-const handleCancel = () => {
-  const params = {
-    processInstanceId: formInline.value.processId!,
-    comments: '取消审批',
-  }
-  ElMessageBox.confirm(
-    '确认取消该审批吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  ).then(() => {
-    cancelApproval(params).then(() => {
-      ElMessage.success('取消成功')
-    })
-  })
-}
-const approvalDialog = ref()
-// 点击数据后的操作按钮
-const clickBtn = (buttonType: string) => {
-  switch (buttonType) {
-    case '同意':
-      approvalDialog.value.initDialog('agree', formInline.value.taskId)
-      break
-    case '驳回':
-      approvalDialog.value.initDialog('reject', formInline.value.taskId)
-      break
-    case '拒绝':
-      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
-      break
-    case '取消':
-      handleCancel()
-      break
-  }
-}
+
 // 获取详情信息
 const getInfo = () => {
   equipmentApplyInfo({ id: infoId.value }).then((res) => {
@@ -302,10 +269,15 @@
   }
 }
 
-const addRowRef = ref()
+// ----------------------------------------------表格---------------------------------------
+const dialogSelectDiviceVisible = ref(false)
 // 点击批量增加
 const batchIncrease = () => {
-  addRowRef.value.initDialog({ title: '' })
+  dialogSelectDiviceVisible.value = true
+}
+// 选择设备对话框关闭
+const closeDialog = () => {
+  dialogSelectDiviceVisible.value = false
 }
 
 // 删除行
@@ -341,6 +313,8 @@
   })
 }
 
+// ----------------------------------------------------------------------------------
+
 // 选好申请人 userId用户id
 const changeSelectReceiver = (userId: string) => {
   // 在用户列表里找到选择的接收人的名字
@@ -362,18 +336,6 @@
     usePersonOptions.value = usePersonList.value
   }
 }
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
 // 获取部门列表
 const fetchDeptTreeList = () => {
   getDeptTreeList().then((res) => {
@@ -388,6 +350,7 @@
     usePersonOptions.value = res.data.rows
   })
 }
+// -------------------------------------------审批----------------------------------------
 const approvalRecordData = ref([]) // 审批流程数据
 // 查询审批记录
 function getApprovalRecord(processId: string) {
@@ -404,8 +367,45 @@
 }
 // 审批结束回调
 const approvalSuccess = () => {
-  getInfo()
+  close()
 }
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: formInline.value.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', taskId.value)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', taskId.value)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', taskId.value)
+  }
+}
+// ---------------------------------------------------------------------------------------
 onMounted(async () => {
   formInline.value.applyName = '设备检修申请' // 申请名称固定
   formInline.value.applyUnit = user.deptId // 申请单位
@@ -416,6 +416,11 @@
   await fetchUserList()
   await fetchDeptTreeList()
   formInline.value.processId = $route.params.processId as string // 任务id
+  decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
+  taskId.value = $route.query.taskId as string // 流程实例id
+  approvalStatusName.value = $route.params.approvalStatusName as string // 审批状态名称
+  console.log(approvalStatusName.value)
+
   formInline.value.approvalStatusName = $route.params.approvalStatusName as string // 任务id
   if (formInline.value.approvalStatusName !== '草稿箱') {
     getApprovalRecord(formInline.value.processId) // 查询审批记录
@@ -427,6 +432,18 @@
   <app-container>
     <detail-page :title="`${$route.meta.title}-${textMap[pageType]}`">
       <template #btns>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批' && decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批' && decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
         <el-button v-if="pageType === 'add'" type="primary" @click="submit">
           提交
         </el-button>
@@ -555,7 +572,7 @@
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection" width="55" />
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="55" />
         <el-table-column align="center" label="序号" width="60" type="index" />
         <el-table-column
           v-for="(item, index) in columns"
@@ -576,9 +593,14 @@
       <!-- 审批流程 -->
       <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
     </detail-block>
+    <!-- 审批弹窗 -->
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-    <!-- 借用设备列表 -->
-    <add-row ref="addRowRef" @add="confirmSelectDevice" />
+    <select-device-dialog
+      :dialog-select-divice-visible="dialogSelectDiviceVisible"
+      :is-multi="true"
+      @close-dialog="closeDialog"
+      @updateDeviceConfirm="confirmSelectDevice"
+    />
   </app-container>
 </template>
 

diff --git a/.env.production b/.env.production
index 0fca4ad..ff5a80a 100644
--- a/.env.production
+++ b/.env.production
@@ -3,9 +3,9 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:21609
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-VITE_APP_API_BASEURL = http://192.168.2.96:8085
+# VITE_APP_API_BASEURL = http://192.168.2.96:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index f342066..9c4581f 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -196,7 +196,7 @@
 
       <el-table-column v-if="!isMulti" label="" width="60" align="center" fixed>
         <template #default="scope">
-          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+          <el-radio v-model="singleChecked" :disabled="scope.row.isRadioDisabled" :label="scope.row.id" class="radio" @change="radioChange" />
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index b2bfdba..f685105 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -462,7 +462,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column v-if="activeTitle === '已归还'" label="归还时间" width="160" align="center">
+          <el-table-column v-if="activeTitle === '已归还'" label="归还时间" width="180" align="center">
             <template #default="scope">
               {{ scope.row.backTime }}
             </template>
diff --git a/src/views/device/borrow/editHandle.vue b/src/views/device/borrow/editHandle.vue
index 0bd10c8..e3fe562 100644
--- a/src/views/device/borrow/editHandle.vue
+++ b/src/views/device/borrow/editHandle.vue
@@ -55,6 +55,7 @@
     form.value.applyPerson = res.data.applyPerson// 申请人
     form.value.time = res.data.time // 借用时间
     form.value.applyDesc = res.data.applyDesc // 申请说明
+    form.value.backTime = res.data.backTime // 归还时间
     list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
       return {
         ...item,
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index 0ada9c2..a884fd8 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -19,6 +19,7 @@
   remark: string // 备注
   updateTime: null | string // 更新时间
   approvalStatusName?: string // 审批状态名称
+  decisionItem?: string | number
 }
 // 标准配套设备表头类型
 export interface columnsType {
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 7f02a38..ba6cc7d 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -254,7 +254,13 @@
 }
 // 跳转到详情
 const goDetail = (row: IlistApproval, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`)
+  $router.push({
+    path: `/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`,
+    query: {
+      decisionItem: `${row.decisionItem}`, // 同意、驳回、拒绝
+      taskId: row.taskId,
+    },
+  })
 }
 // 获取到组织信息
 const getDept = () => {
@@ -275,7 +281,7 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    submitEquipmentApply({ id: row.id, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
+    submitEquipmentApply({ id: row.id, formId: SCHEDULE.DEVICE_FIX_APPROVAL, processId: row.processId }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -488,20 +494,8 @@
               >
                 取消
               </el-button>
-              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <!-- <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                @click="clickBtn(row, '删除')"
-              >
-                删除
-              </el-button> -->
-              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
               <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
index 35cbba2..5584541 100644
--- a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -1,10 +1,12 @@
 <!-- 设备检修列表新增、编辑、详情 -->
 <script lang="ts" setup name="maintenanceDetail">
 import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox, rowContextKey } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
+import { Row } from 'element-plus/es/components/table-v2/src/components'
 import type { IlistPageAddTypes, columnsType, returnRowType } from '../checkList_interface'
+import selectDeviceDialog from './selectDevice.vue'
 import { addEquipmentApply, equipmentApplyInfo, failUpdateEquipmentApply, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
@@ -13,17 +15,19 @@
 import type { userType } from '@/views/system/user/user-interface'
 import { cancelApproval, fetchApproval } from '@/api/approval'
 import { SCHEDULE } from '@/utils/scheduleDict'
-import addRow from '@/views/device/stateManage/components/selectDevice.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
 import useUserStore from '@/store/modules/user'
-
+const approvalDialog = ref() // 审批对话ref
 const user = useUserStore() // 用户信息
 const approvalRecord = ref() // 审批流程组件ref
 const infoId = ref('') // id
 const from = ref('') // reject代表未通过-驳回
 const buttonArray = ref<string[]>([])
 const pageType = ref('add') // 页面类型: add,edit, detail
+const decisionItem = ref('') // 同意、驳回、拒绝按钮权限
+const approvalStatusName = ref('') // 审批状态名称
+const taskId = ref('') // 任务id，用于同意、驳回、拒绝审批
 const textMap: { [key: string]: string } = {
   add: '新建',
   edit: '编辑',
@@ -167,44 +171,7 @@
 
 // 表格选中的数组
 const SelectionList = ref<object[]>([])
-// 取消
-const handleCancel = () => {
-  const params = {
-    processInstanceId: formInline.value.processId!,
-    comments: '取消审批',
-  }
-  ElMessageBox.confirm(
-    '确认取消该审批吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  ).then(() => {
-    cancelApproval(params).then(() => {
-      ElMessage.success('取消成功')
-    })
-  })
-}
-const approvalDialog = ref()
-// 点击数据后的操作按钮
-const clickBtn = (buttonType: string) => {
-  switch (buttonType) {
-    case '同意':
-      approvalDialog.value.initDialog('agree', formInline.value.taskId)
-      break
-    case '驳回':
-      approvalDialog.value.initDialog('reject', formInline.value.taskId)
-      break
-    case '拒绝':
-      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
-      break
-    case '取消':
-      handleCancel()
-      break
-  }
-}
+
 // 获取详情信息
 const getInfo = () => {
   equipmentApplyInfo({ id: infoId.value }).then((res) => {
@@ -302,10 +269,15 @@
   }
 }
 
-const addRowRef = ref()
+// ----------------------------------------------表格---------------------------------------
+const dialogSelectDiviceVisible = ref(false)
 // 点击批量增加
 const batchIncrease = () => {
-  addRowRef.value.initDialog({ title: '' })
+  dialogSelectDiviceVisible.value = true
+}
+// 选择设备对话框关闭
+const closeDialog = () => {
+  dialogSelectDiviceVisible.value = false
 }
 
 // 删除行
@@ -341,6 +313,8 @@
   })
 }
 
+// ----------------------------------------------------------------------------------
+
 // 选好申请人 userId用户id
 const changeSelectReceiver = (userId: string) => {
   // 在用户列表里找到选择的接收人的名字
@@ -362,18 +336,6 @@
     usePersonOptions.value = usePersonList.value
   }
 }
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
 // 获取部门列表
 const fetchDeptTreeList = () => {
   getDeptTreeList().then((res) => {
@@ -388,6 +350,7 @@
     usePersonOptions.value = res.data.rows
   })
 }
+// -------------------------------------------审批----------------------------------------
 const approvalRecordData = ref([]) // 审批流程数据
 // 查询审批记录
 function getApprovalRecord(processId: string) {
@@ -404,8 +367,45 @@
 }
 // 审批结束回调
 const approvalSuccess = () => {
-  getInfo()
+  close()
 }
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: formInline.value.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', taskId.value)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', taskId.value)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', taskId.value)
+  }
+}
+// ---------------------------------------------------------------------------------------
 onMounted(async () => {
   formInline.value.applyName = '设备检修申请' // 申请名称固定
   formInline.value.applyUnit = user.deptId // 申请单位
@@ -416,6 +416,11 @@
   await fetchUserList()
   await fetchDeptTreeList()
   formInline.value.processId = $route.params.processId as string // 任务id
+  decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
+  taskId.value = $route.query.taskId as string // 流程实例id
+  approvalStatusName.value = $route.params.approvalStatusName as string // 审批状态名称
+  console.log(approvalStatusName.value)
+
   formInline.value.approvalStatusName = $route.params.approvalStatusName as string // 任务id
   if (formInline.value.approvalStatusName !== '草稿箱') {
     getApprovalRecord(formInline.value.processId) // 查询审批记录
@@ -427,6 +432,18 @@
   <app-container>
     <detail-page :title="`${$route.meta.title}-${textMap[pageType]}`">
       <template #btns>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批' && decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批' && decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
         <el-button v-if="pageType === 'add'" type="primary" @click="submit">
           提交
         </el-button>
@@ -555,7 +572,7 @@
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection" width="55" />
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="55" />
         <el-table-column align="center" label="序号" width="60" type="index" />
         <el-table-column
           v-for="(item, index) in columns"
@@ -576,9 +593,14 @@
       <!-- 审批流程 -->
       <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
     </detail-block>
+    <!-- 审批弹窗 -->
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-    <!-- 借用设备列表 -->
-    <add-row ref="addRowRef" @add="confirmSelectDevice" />
+    <select-device-dialog
+      :dialog-select-divice-visible="dialogSelectDiviceVisible"
+      :is-multi="true"
+      @close-dialog="closeDialog"
+      @updateDeviceConfirm="confirmSelectDevice"
+    />
   </app-container>
 </template>
 
diff --git a/src/views/device/deviceMaintenance/components/selectDevice.vue b/src/views/device/deviceMaintenance/components/selectDevice.vue
new file mode 100644
index 0000000..3c04be6
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/selectDevice.vue
@@ -0,0 +1,216 @@
+<!-- 选择设备对话框 -->
+<script lang="ts" setup name="ReceiveDialog">
+import { ref } from 'vue'
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import type { IdeviceList } from '@/views/device/stateManage/components/status-interface'
+import useUserStore from '@/store/modules/user'
+import { listPageApi } from '@/api/device/standingBook'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { selectType } from '@/views/device/standingBook/standingBook-interface'
+import { getStatusList } from '@/api/device/stateManage'
+import { SCHEDULE } from '@/utils/scheduleDict'
+const props = defineProps({
+  dialogSelectDiviceVisible: {
+    type: Boolean,
+    default: false,
+  },
+  isMulti: Boolean, // 是否多选
+  statusTypeName: { // 状态管理类型
+    type: String,
+    default: '',
+  },
+})
+// 提醒文字
+const emits = defineEmits(['closeDialog', 'updateDeviceConfirm'])
+const defineMessageTest = ref('闲置、封存、在用(启封)') // 提醒文字
+const loadingTable = ref<boolean>(false)
+const userStore = useUserStore()
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  managerState: '1', // 管理状态 // 默认在用(启封)
+  offset: 1,
+  limit: 20,
+})
+const total = ref(20)
+// 多选选中的内容
+const checkoutList = ref([]) as any
+const list = ref([])// 表格数据
+const columns = ref<TableColumn[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center', fixed: true },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', fixed: true, width: '160' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '管理状态', value: 'managerStateName', align: 'center', width: '120' },
+  { text: '使用人', value: 'usePersonName', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center', width: '120' },
+])
+const table = ref()
+const dialogTableVisible = ref(false)// 控制对话框显隐
+// 获取数据
+const managerStateList = ref<selectType[]>([])
+const getDict = () => {
+  // 获取管理状态
+  getDictByCode('managerState').then((response) => {
+    managerStateList.value = response.data.map((item: { name: string; isSelectItemDisabled: boolean }) => {
+      if (item.name === '报废' || item.name === '处置') {
+        item.isSelectItemDisabled = true
+      }
+      return item
+    })
+  })
+}
+getDict()
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listQuery.value.limit = props.isMulti ? 20 : 5
+  listPageApi(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: IdeviceList) => {
+      return {
+        ...item,
+        validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+      }
+    })
+    total.value = res.data.total
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+watch(() => props.dialogSelectDiviceVisible, (newValue) => {
+  dialogTableVisible.value = newValue
+  fetchData()
+  if (!newValue) {
+    table.value.clearMulti() // 清除多选选中
+  }
+})
+
+// 关闭对话框
+const close = () => {
+  emits('closeDialog')
+}
+// 确认
+const confirm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return
+  }
+  emits('updateDeviceConfirm', checkoutList.value)
+  close()
+}
+// 重置
+const clearList = () => {
+  listQuery.value.equipmentName = ''
+  listQuery.value.equipmentNo = ''
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData()
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  console.log('多选', val)
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogTableVisible" width="65%" title="选择设备" class="select-device-dialog" @close="close">
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentName"
+          placeholder="设备名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentNo"
+          placeholder="设备编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.managerState" class="m-2" placeholder="管理状态" clearable>
+          <el-option
+            v-for="item in managerStateList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+            :disabled="item.isSelectItemDisabled"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+    <div style="padding: 12px;">
+      <normal-table
+        ref="table"
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :is-multi="isMulti"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :page-sizes="isMulti ? [20] : [5]"
+        :height="260"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <div style="font-size: 14px;">
+      <span style="color: #f56c6c;">*注意：只能查询管理状态为 <span style="color: #3d7eff;">{{ defineMessageTest }}</span> 的设备</span>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="close">取消</el-button>
+        <el-button type="primary" @click="confirm">
+          确定
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.receive-dialog {
+  .receive-dialog-item {
+    display: flex;
+    align-items: center;
+    margin-bottom: 28px;
+
+    .text {
+      margin-right: 30px;
+      white-space: nowrap;
+    }
+  }
+}
+</style>

diff --git a/.env.production b/.env.production
index 0fca4ad..ff5a80a 100644
--- a/.env.production
+++ b/.env.production
@@ -3,9 +3,9 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:21609
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-VITE_APP_API_BASEURL = http://192.168.2.96:8085
+# VITE_APP_API_BASEURL = http://192.168.2.96:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index f342066..9c4581f 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -196,7 +196,7 @@
 
       <el-table-column v-if="!isMulti" label="" width="60" align="center" fixed>
         <template #default="scope">
-          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+          <el-radio v-model="singleChecked" :disabled="scope.row.isRadioDisabled" :label="scope.row.id" class="radio" @change="radioChange" />
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index b2bfdba..f685105 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -462,7 +462,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column v-if="activeTitle === '已归还'" label="归还时间" width="160" align="center">
+          <el-table-column v-if="activeTitle === '已归还'" label="归还时间" width="180" align="center">
             <template #default="scope">
               {{ scope.row.backTime }}
             </template>
diff --git a/src/views/device/borrow/editHandle.vue b/src/views/device/borrow/editHandle.vue
index 0bd10c8..e3fe562 100644
--- a/src/views/device/borrow/editHandle.vue
+++ b/src/views/device/borrow/editHandle.vue
@@ -55,6 +55,7 @@
     form.value.applyPerson = res.data.applyPerson// 申请人
     form.value.time = res.data.time // 借用时间
     form.value.applyDesc = res.data.applyDesc // 申请说明
+    form.value.backTime = res.data.backTime // 归还时间
     list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
       return {
         ...item,
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index 0ada9c2..a884fd8 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -19,6 +19,7 @@
   remark: string // 备注
   updateTime: null | string // 更新时间
   approvalStatusName?: string // 审批状态名称
+  decisionItem?: string | number
 }
 // 标准配套设备表头类型
 export interface columnsType {
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 7f02a38..ba6cc7d 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -254,7 +254,13 @@
 }
 // 跳转到详情
 const goDetail = (row: IlistApproval, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`)
+  $router.push({
+    path: `/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`,
+    query: {
+      decisionItem: `${row.decisionItem}`, // 同意、驳回、拒绝
+      taskId: row.taskId,
+    },
+  })
 }
 // 获取到组织信息
 const getDept = () => {
@@ -275,7 +281,7 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    submitEquipmentApply({ id: row.id, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
+    submitEquipmentApply({ id: row.id, formId: SCHEDULE.DEVICE_FIX_APPROVAL, processId: row.processId }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -488,20 +494,8 @@
               >
                 取消
               </el-button>
-              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <!-- <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                @click="clickBtn(row, '删除')"
-              >
-                删除
-              </el-button> -->
-              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
               <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
index 35cbba2..5584541 100644
--- a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -1,10 +1,12 @@
 <!-- 设备检修列表新增、编辑、详情 -->
 <script lang="ts" setup name="maintenanceDetail">
 import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox, rowContextKey } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
+import { Row } from 'element-plus/es/components/table-v2/src/components'
 import type { IlistPageAddTypes, columnsType, returnRowType } from '../checkList_interface'
+import selectDeviceDialog from './selectDevice.vue'
 import { addEquipmentApply, equipmentApplyInfo, failUpdateEquipmentApply, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
@@ -13,17 +15,19 @@
 import type { userType } from '@/views/system/user/user-interface'
 import { cancelApproval, fetchApproval } from '@/api/approval'
 import { SCHEDULE } from '@/utils/scheduleDict'
-import addRow from '@/views/device/stateManage/components/selectDevice.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
 import useUserStore from '@/store/modules/user'
-
+const approvalDialog = ref() // 审批对话ref
 const user = useUserStore() // 用户信息
 const approvalRecord = ref() // 审批流程组件ref
 const infoId = ref('') // id
 const from = ref('') // reject代表未通过-驳回
 const buttonArray = ref<string[]>([])
 const pageType = ref('add') // 页面类型: add,edit, detail
+const decisionItem = ref('') // 同意、驳回、拒绝按钮权限
+const approvalStatusName = ref('') // 审批状态名称
+const taskId = ref('') // 任务id，用于同意、驳回、拒绝审批
 const textMap: { [key: string]: string } = {
   add: '新建',
   edit: '编辑',
@@ -167,44 +171,7 @@
 
 // 表格选中的数组
 const SelectionList = ref<object[]>([])
-// 取消
-const handleCancel = () => {
-  const params = {
-    processInstanceId: formInline.value.processId!,
-    comments: '取消审批',
-  }
-  ElMessageBox.confirm(
-    '确认取消该审批吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  ).then(() => {
-    cancelApproval(params).then(() => {
-      ElMessage.success('取消成功')
-    })
-  })
-}
-const approvalDialog = ref()
-// 点击数据后的操作按钮
-const clickBtn = (buttonType: string) => {
-  switch (buttonType) {
-    case '同意':
-      approvalDialog.value.initDialog('agree', formInline.value.taskId)
-      break
-    case '驳回':
-      approvalDialog.value.initDialog('reject', formInline.value.taskId)
-      break
-    case '拒绝':
-      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
-      break
-    case '取消':
-      handleCancel()
-      break
-  }
-}
+
 // 获取详情信息
 const getInfo = () => {
   equipmentApplyInfo({ id: infoId.value }).then((res) => {
@@ -302,10 +269,15 @@
   }
 }
 
-const addRowRef = ref()
+// ----------------------------------------------表格---------------------------------------
+const dialogSelectDiviceVisible = ref(false)
 // 点击批量增加
 const batchIncrease = () => {
-  addRowRef.value.initDialog({ title: '' })
+  dialogSelectDiviceVisible.value = true
+}
+// 选择设备对话框关闭
+const closeDialog = () => {
+  dialogSelectDiviceVisible.value = false
 }
 
 // 删除行
@@ -341,6 +313,8 @@
   })
 }
 
+// ----------------------------------------------------------------------------------
+
 // 选好申请人 userId用户id
 const changeSelectReceiver = (userId: string) => {
   // 在用户列表里找到选择的接收人的名字
@@ -362,18 +336,6 @@
     usePersonOptions.value = usePersonList.value
   }
 }
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
 // 获取部门列表
 const fetchDeptTreeList = () => {
   getDeptTreeList().then((res) => {
@@ -388,6 +350,7 @@
     usePersonOptions.value = res.data.rows
   })
 }
+// -------------------------------------------审批----------------------------------------
 const approvalRecordData = ref([]) // 审批流程数据
 // 查询审批记录
 function getApprovalRecord(processId: string) {
@@ -404,8 +367,45 @@
 }
 // 审批结束回调
 const approvalSuccess = () => {
-  getInfo()
+  close()
 }
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: formInline.value.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', taskId.value)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', taskId.value)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', taskId.value)
+  }
+}
+// ---------------------------------------------------------------------------------------
 onMounted(async () => {
   formInline.value.applyName = '设备检修申请' // 申请名称固定
   formInline.value.applyUnit = user.deptId // 申请单位
@@ -416,6 +416,11 @@
   await fetchUserList()
   await fetchDeptTreeList()
   formInline.value.processId = $route.params.processId as string // 任务id
+  decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
+  taskId.value = $route.query.taskId as string // 流程实例id
+  approvalStatusName.value = $route.params.approvalStatusName as string // 审批状态名称
+  console.log(approvalStatusName.value)
+
   formInline.value.approvalStatusName = $route.params.approvalStatusName as string // 任务id
   if (formInline.value.approvalStatusName !== '草稿箱') {
     getApprovalRecord(formInline.value.processId) // 查询审批记录
@@ -427,6 +432,18 @@
   <app-container>
     <detail-page :title="`${$route.meta.title}-${textMap[pageType]}`">
       <template #btns>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批' && decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批' && decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
         <el-button v-if="pageType === 'add'" type="primary" @click="submit">
           提交
         </el-button>
@@ -555,7 +572,7 @@
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection" width="55" />
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="55" />
         <el-table-column align="center" label="序号" width="60" type="index" />
         <el-table-column
           v-for="(item, index) in columns"
@@ -576,9 +593,14 @@
       <!-- 审批流程 -->
       <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
     </detail-block>
+    <!-- 审批弹窗 -->
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-    <!-- 借用设备列表 -->
-    <add-row ref="addRowRef" @add="confirmSelectDevice" />
+    <select-device-dialog
+      :dialog-select-divice-visible="dialogSelectDiviceVisible"
+      :is-multi="true"
+      @close-dialog="closeDialog"
+      @updateDeviceConfirm="confirmSelectDevice"
+    />
   </app-container>
 </template>
 
diff --git a/src/views/device/deviceMaintenance/components/selectDevice.vue b/src/views/device/deviceMaintenance/components/selectDevice.vue
new file mode 100644
index 0000000..3c04be6
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/selectDevice.vue
@@ -0,0 +1,216 @@
+<!-- 选择设备对话框 -->
+<script lang="ts" setup name="ReceiveDialog">
+import { ref } from 'vue'
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import type { IdeviceList } from '@/views/device/stateManage/components/status-interface'
+import useUserStore from '@/store/modules/user'
+import { listPageApi } from '@/api/device/standingBook'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { selectType } from '@/views/device/standingBook/standingBook-interface'
+import { getStatusList } from '@/api/device/stateManage'
+import { SCHEDULE } from '@/utils/scheduleDict'
+const props = defineProps({
+  dialogSelectDiviceVisible: {
+    type: Boolean,
+    default: false,
+  },
+  isMulti: Boolean, // 是否多选
+  statusTypeName: { // 状态管理类型
+    type: String,
+    default: '',
+  },
+})
+// 提醒文字
+const emits = defineEmits(['closeDialog', 'updateDeviceConfirm'])
+const defineMessageTest = ref('闲置、封存、在用(启封)') // 提醒文字
+const loadingTable = ref<boolean>(false)
+const userStore = useUserStore()
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  managerState: '1', // 管理状态 // 默认在用(启封)
+  offset: 1,
+  limit: 20,
+})
+const total = ref(20)
+// 多选选中的内容
+const checkoutList = ref([]) as any
+const list = ref([])// 表格数据
+const columns = ref<TableColumn[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center', fixed: true },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', fixed: true, width: '160' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '管理状态', value: 'managerStateName', align: 'center', width: '120' },
+  { text: '使用人', value: 'usePersonName', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center', width: '120' },
+])
+const table = ref()
+const dialogTableVisible = ref(false)// 控制对话框显隐
+// 获取数据
+const managerStateList = ref<selectType[]>([])
+const getDict = () => {
+  // 获取管理状态
+  getDictByCode('managerState').then((response) => {
+    managerStateList.value = response.data.map((item: { name: string; isSelectItemDisabled: boolean }) => {
+      if (item.name === '报废' || item.name === '处置') {
+        item.isSelectItemDisabled = true
+      }
+      return item
+    })
+  })
+}
+getDict()
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listQuery.value.limit = props.isMulti ? 20 : 5
+  listPageApi(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: IdeviceList) => {
+      return {
+        ...item,
+        validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+      }
+    })
+    total.value = res.data.total
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+watch(() => props.dialogSelectDiviceVisible, (newValue) => {
+  dialogTableVisible.value = newValue
+  fetchData()
+  if (!newValue) {
+    table.value.clearMulti() // 清除多选选中
+  }
+})
+
+// 关闭对话框
+const close = () => {
+  emits('closeDialog')
+}
+// 确认
+const confirm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return
+  }
+  emits('updateDeviceConfirm', checkoutList.value)
+  close()
+}
+// 重置
+const clearList = () => {
+  listQuery.value.equipmentName = ''
+  listQuery.value.equipmentNo = ''
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData()
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  console.log('多选', val)
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogTableVisible" width="65%" title="选择设备" class="select-device-dialog" @close="close">
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentName"
+          placeholder="设备名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentNo"
+          placeholder="设备编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.managerState" class="m-2" placeholder="管理状态" clearable>
+          <el-option
+            v-for="item in managerStateList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+            :disabled="item.isSelectItemDisabled"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+    <div style="padding: 12px;">
+      <normal-table
+        ref="table"
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :is-multi="isMulti"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :page-sizes="isMulti ? [20] : [5]"
+        :height="260"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <div style="font-size: 14px;">
+      <span style="color: #f56c6c;">*注意：只能查询管理状态为 <span style="color: #3d7eff;">{{ defineMessageTest }}</span> 的设备</span>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="close">取消</el-button>
+        <el-button type="primary" @click="confirm">
+          确定
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.receive-dialog {
+  .receive-dialog-item {
+    display: flex;
+    align-items: center;
+    margin-bottom: 28px;
+
+    .text {
+      margin-right: 30px;
+      white-space: nowrap;
+    }
+  }
+}
+</style>
diff --git a/src/views/device/receive/apply/applyEdit.vue b/src/views/device/receive/apply/applyEdit.vue
index 13e9528..8b50fc0 100644
--- a/src/views/device/receive/apply/applyEdit.vue
+++ b/src/views/device/receive/apply/applyEdit.vue
@@ -10,6 +10,7 @@
 import SelectDeviceDialog from '../selectDeviceDialog.vue'
 import { toTreeList } from '@/utils/structure'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import {
   failUpdateEquipmentApply,
@@ -22,9 +23,9 @@
 import type { deptType } from '@/views/device/standingBook/standingBook-interface'
 import { getDeptTreeList } from '@/api/system/dept'
 import { getUserList } from '@/api/system/user'
-import { fetchApproval, submitApproval } from '@/api/approval'
 import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
 import useUserStore from '@/store/modules/user'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 
 const user = useUserStore() // 用户信息
 const $route = useRoute()
@@ -39,6 +40,8 @@
 const isMulti = ref(false) // 是否批量添加(允许多选)
 const selectIndex = ref() // 点击选择的index--点击第几行
 const dialogSelectDiviceVisible = ref(false) // 控制选择设备对话框显隐
+const decisionItem = ref('') // 同意、驳回、拒绝按钮权限
+const taskId = ref('') // 任务id，用于同意、驳回、拒绝审批
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
@@ -88,42 +91,6 @@
   $router.back()
 }
 
-const handleClick = (val: string) => {
-  if (val === 'agree') { // 同意
-    approvalDialog.value.initDialog('agree', form.value.taskId)
-  }
-  else if (val === 'reject') { // 驳回
-    approvalDialog.value.initDialog('reject', form.value.taskId)
-  }
-  else if (val === 'refuse') { // 拒绝
-    approvalDialog.value.initDialog('refuse', form.value.taskId)
-  }
-  else if (val === 'revoke') {
-    const params = {
-      taskId: form.value.taskId!,
-      comments: '',
-    }
-    ElMessageBox.confirm(
-      '确认撤回该审批吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        submitApproval('revoke', params).then((res) => {
-          ElMessage({
-            type: 'success',
-            message: '已撤回',
-          })
-        })
-        close()
-      })
-  }
-}
-
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
@@ -314,11 +281,6 @@
   })
 }
 
-// 审批结束回调
-const approvalSuccess = () => {
-  close()
-}
-
 // 编辑、详情--获取详细信息
 const fetchReceiveApplyListDetail = () => {
   getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
@@ -355,6 +317,7 @@
   }
 }
 
+// ---------------------------------------------审批--------------------------------------
 const approvalRecordData = ref([]) // 审批流程数据
 // 查询审批记录
 function getApprovalRecord(processId: string) {
@@ -369,6 +332,47 @@
     }
   }
 }
+// 审批结束回调
+const approvalSuccess = () => {
+  close()
+}
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: form.value.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', taskId.value)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', taskId.value)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', taskId.value)
+  }
+}
+// --------------------------------------------------------------------------------------
 
 onMounted(() => {
   typeValue.value = $route.query.typeValue // 类型add、edit、detail
@@ -376,6 +380,8 @@
   form.value.taskId = $route.query.taskId as string // 任务id
   form.value.processId = $route.query.processId as string // 任务id
   approvalStatus.value = $route.query.approvalStatus // 审批类型
+  decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
+  taskId.value = $route.query.taskId as string // 流程实例id
   approvalStatusName.value = $route.query.approvalStatusName // 审批类型名称
   form.value.applyName = '设备领用申请' // 申请名称固定
   form.value.applyUnit = user.deptId // 申请单位
@@ -401,24 +407,24 @@
   <app-container>
     <detail-page :title="`设备领用申请-${textMap[typeValue]}`">
       <template #btns>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('agree')">
+        <el-button v-if="typeValue === 'detail' && approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
           同意
         </el-button>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('reject')">
+        <el-button v-if="typeValue === 'detail' && approvalStatusName === '待审批' && decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
           驳回
         </el-button>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('refuse')">
+        <el-button v-if="typeValue === 'detail' && approvalStatusName === '待审批' && decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
           拒绝
         </el-button>
+        <el-button v-if="typeValue === 'detail' && approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
         <el-button v-if="typeValue === 'add'" type="primary" @click="submit">
           提交
         </el-button>
         <el-button v-if="typeValue === 'add' || typeValue === 'edit'" type="primary" @click="save">
           保存
         </el-button>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '3'" type="primary" @click="handleClick('revoke')">
-          撤回
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
@@ -544,7 +550,7 @@
             align="center"
           >
             <template v-if="item.value === 'equipmentNo' && (typeValue === 'add' || typeValue === 'edit')" #default="scope">
-              <el-input v-model="scope.row.equipmentNo" placeholder="请选择设备" class="input">
+              <el-input v-model="scope.row.equipmentNo" disabled placeholder="请选择设备" class="input">
                 <template #append>
                   <el-button size="small" @click="handleSelect(scope.$index, scope.row)">
                     选择

diff --git a/.env.production b/.env.production
index 0fca4ad..ff5a80a 100644
--- a/.env.production
+++ b/.env.production
@@ -3,9 +3,9 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:21609
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-VITE_APP_API_BASEURL = http://192.168.2.96:8085
+# VITE_APP_API_BASEURL = http://192.168.2.96:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index f342066..9c4581f 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -196,7 +196,7 @@
 
       <el-table-column v-if="!isMulti" label="" width="60" align="center" fixed>
         <template #default="scope">
-          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+          <el-radio v-model="singleChecked" :disabled="scope.row.isRadioDisabled" :label="scope.row.id" class="radio" @change="radioChange" />
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index b2bfdba..f685105 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -462,7 +462,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column v-if="activeTitle === '已归还'" label="归还时间" width="160" align="center">
+          <el-table-column v-if="activeTitle === '已归还'" label="归还时间" width="180" align="center">
             <template #default="scope">
               {{ scope.row.backTime }}
             </template>
diff --git a/src/views/device/borrow/editHandle.vue b/src/views/device/borrow/editHandle.vue
index 0bd10c8..e3fe562 100644
--- a/src/views/device/borrow/editHandle.vue
+++ b/src/views/device/borrow/editHandle.vue
@@ -55,6 +55,7 @@
     form.value.applyPerson = res.data.applyPerson// 申请人
     form.value.time = res.data.time // 借用时间
     form.value.applyDesc = res.data.applyDesc // 申请说明
+    form.value.backTime = res.data.backTime // 归还时间
     list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
       return {
         ...item,
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index 0ada9c2..a884fd8 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -19,6 +19,7 @@
   remark: string // 备注
   updateTime: null | string // 更新时间
   approvalStatusName?: string // 审批状态名称
+  decisionItem?: string | number
 }
 // 标准配套设备表头类型
 export interface columnsType {
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 7f02a38..ba6cc7d 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -254,7 +254,13 @@
 }
 // 跳转到详情
 const goDetail = (row: IlistApproval, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`)
+  $router.push({
+    path: `/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`,
+    query: {
+      decisionItem: `${row.decisionItem}`, // 同意、驳回、拒绝
+      taskId: row.taskId,
+    },
+  })
 }
 // 获取到组织信息
 const getDept = () => {
@@ -275,7 +281,7 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    submitEquipmentApply({ id: row.id, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
+    submitEquipmentApply({ id: row.id, formId: SCHEDULE.DEVICE_FIX_APPROVAL, processId: row.processId }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -488,20 +494,8 @@
               >
                 取消
               </el-button>
-              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <!-- <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                @click="clickBtn(row, '删除')"
-              >
-                删除
-              </el-button> -->
-              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
               <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
index 35cbba2..5584541 100644
--- a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -1,10 +1,12 @@
 <!-- 设备检修列表新增、编辑、详情 -->
 <script lang="ts" setup name="maintenanceDetail">
 import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox, rowContextKey } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
+import { Row } from 'element-plus/es/components/table-v2/src/components'
 import type { IlistPageAddTypes, columnsType, returnRowType } from '../checkList_interface'
+import selectDeviceDialog from './selectDevice.vue'
 import { addEquipmentApply, equipmentApplyInfo, failUpdateEquipmentApply, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
@@ -13,17 +15,19 @@
 import type { userType } from '@/views/system/user/user-interface'
 import { cancelApproval, fetchApproval } from '@/api/approval'
 import { SCHEDULE } from '@/utils/scheduleDict'
-import addRow from '@/views/device/stateManage/components/selectDevice.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
 import useUserStore from '@/store/modules/user'
-
+const approvalDialog = ref() // 审批对话ref
 const user = useUserStore() // 用户信息
 const approvalRecord = ref() // 审批流程组件ref
 const infoId = ref('') // id
 const from = ref('') // reject代表未通过-驳回
 const buttonArray = ref<string[]>([])
 const pageType = ref('add') // 页面类型: add,edit, detail
+const decisionItem = ref('') // 同意、驳回、拒绝按钮权限
+const approvalStatusName = ref('') // 审批状态名称
+const taskId = ref('') // 任务id，用于同意、驳回、拒绝审批
 const textMap: { [key: string]: string } = {
   add: '新建',
   edit: '编辑',
@@ -167,44 +171,7 @@
 
 // 表格选中的数组
 const SelectionList = ref<object[]>([])
-// 取消
-const handleCancel = () => {
-  const params = {
-    processInstanceId: formInline.value.processId!,
-    comments: '取消审批',
-  }
-  ElMessageBox.confirm(
-    '确认取消该审批吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  ).then(() => {
-    cancelApproval(params).then(() => {
-      ElMessage.success('取消成功')
-    })
-  })
-}
-const approvalDialog = ref()
-// 点击数据后的操作按钮
-const clickBtn = (buttonType: string) => {
-  switch (buttonType) {
-    case '同意':
-      approvalDialog.value.initDialog('agree', formInline.value.taskId)
-      break
-    case '驳回':
-      approvalDialog.value.initDialog('reject', formInline.value.taskId)
-      break
-    case '拒绝':
-      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
-      break
-    case '取消':
-      handleCancel()
-      break
-  }
-}
+
 // 获取详情信息
 const getInfo = () => {
   equipmentApplyInfo({ id: infoId.value }).then((res) => {
@@ -302,10 +269,15 @@
   }
 }
 
-const addRowRef = ref()
+// ----------------------------------------------表格---------------------------------------
+const dialogSelectDiviceVisible = ref(false)
 // 点击批量增加
 const batchIncrease = () => {
-  addRowRef.value.initDialog({ title: '' })
+  dialogSelectDiviceVisible.value = true
+}
+// 选择设备对话框关闭
+const closeDialog = () => {
+  dialogSelectDiviceVisible.value = false
 }
 
 // 删除行
@@ -341,6 +313,8 @@
   })
 }
 
+// ----------------------------------------------------------------------------------
+
 // 选好申请人 userId用户id
 const changeSelectReceiver = (userId: string) => {
   // 在用户列表里找到选择的接收人的名字
@@ -362,18 +336,6 @@
     usePersonOptions.value = usePersonList.value
   }
 }
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
 // 获取部门列表
 const fetchDeptTreeList = () => {
   getDeptTreeList().then((res) => {
@@ -388,6 +350,7 @@
     usePersonOptions.value = res.data.rows
   })
 }
+// -------------------------------------------审批----------------------------------------
 const approvalRecordData = ref([]) // 审批流程数据
 // 查询审批记录
 function getApprovalRecord(processId: string) {
@@ -404,8 +367,45 @@
 }
 // 审批结束回调
 const approvalSuccess = () => {
-  getInfo()
+  close()
 }
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: formInline.value.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', taskId.value)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', taskId.value)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', taskId.value)
+  }
+}
+// ---------------------------------------------------------------------------------------
 onMounted(async () => {
   formInline.value.applyName = '设备检修申请' // 申请名称固定
   formInline.value.applyUnit = user.deptId // 申请单位
@@ -416,6 +416,11 @@
   await fetchUserList()
   await fetchDeptTreeList()
   formInline.value.processId = $route.params.processId as string // 任务id
+  decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
+  taskId.value = $route.query.taskId as string // 流程实例id
+  approvalStatusName.value = $route.params.approvalStatusName as string // 审批状态名称
+  console.log(approvalStatusName.value)
+
   formInline.value.approvalStatusName = $route.params.approvalStatusName as string // 任务id
   if (formInline.value.approvalStatusName !== '草稿箱') {
     getApprovalRecord(formInline.value.processId) // 查询审批记录
@@ -427,6 +432,18 @@
   <app-container>
     <detail-page :title="`${$route.meta.title}-${textMap[pageType]}`">
       <template #btns>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批' && decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批' && decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
         <el-button v-if="pageType === 'add'" type="primary" @click="submit">
           提交
         </el-button>
@@ -555,7 +572,7 @@
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection" width="55" />
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="55" />
         <el-table-column align="center" label="序号" width="60" type="index" />
         <el-table-column
           v-for="(item, index) in columns"
@@ -576,9 +593,14 @@
       <!-- 审批流程 -->
       <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
     </detail-block>
+    <!-- 审批弹窗 -->
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-    <!-- 借用设备列表 -->
-    <add-row ref="addRowRef" @add="confirmSelectDevice" />
+    <select-device-dialog
+      :dialog-select-divice-visible="dialogSelectDiviceVisible"
+      :is-multi="true"
+      @close-dialog="closeDialog"
+      @updateDeviceConfirm="confirmSelectDevice"
+    />
   </app-container>
 </template>
 
diff --git a/src/views/device/deviceMaintenance/components/selectDevice.vue b/src/views/device/deviceMaintenance/components/selectDevice.vue
new file mode 100644
index 0000000..3c04be6
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/selectDevice.vue
@@ -0,0 +1,216 @@
+<!-- 选择设备对话框 -->
+<script lang="ts" setup name="ReceiveDialog">
+import { ref } from 'vue'
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import type { IdeviceList } from '@/views/device/stateManage/components/status-interface'
+import useUserStore from '@/store/modules/user'
+import { listPageApi } from '@/api/device/standingBook'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { selectType } from '@/views/device/standingBook/standingBook-interface'
+import { getStatusList } from '@/api/device/stateManage'
+import { SCHEDULE } from '@/utils/scheduleDict'
+const props = defineProps({
+  dialogSelectDiviceVisible: {
+    type: Boolean,
+    default: false,
+  },
+  isMulti: Boolean, // 是否多选
+  statusTypeName: { // 状态管理类型
+    type: String,
+    default: '',
+  },
+})
+// 提醒文字
+const emits = defineEmits(['closeDialog', 'updateDeviceConfirm'])
+const defineMessageTest = ref('闲置、封存、在用(启封)') // 提醒文字
+const loadingTable = ref<boolean>(false)
+const userStore = useUserStore()
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  managerState: '1', // 管理状态 // 默认在用(启封)
+  offset: 1,
+  limit: 20,
+})
+const total = ref(20)
+// 多选选中的内容
+const checkoutList = ref([]) as any
+const list = ref([])// 表格数据
+const columns = ref<TableColumn[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center', fixed: true },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', fixed: true, width: '160' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '管理状态', value: 'managerStateName', align: 'center', width: '120' },
+  { text: '使用人', value: 'usePersonName', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center', width: '120' },
+])
+const table = ref()
+const dialogTableVisible = ref(false)// 控制对话框显隐
+// 获取数据
+const managerStateList = ref<selectType[]>([])
+const getDict = () => {
+  // 获取管理状态
+  getDictByCode('managerState').then((response) => {
+    managerStateList.value = response.data.map((item: { name: string; isSelectItemDisabled: boolean }) => {
+      if (item.name === '报废' || item.name === '处置') {
+        item.isSelectItemDisabled = true
+      }
+      return item
+    })
+  })
+}
+getDict()
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listQuery.value.limit = props.isMulti ? 20 : 5
+  listPageApi(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: IdeviceList) => {
+      return {
+        ...item,
+        validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+      }
+    })
+    total.value = res.data.total
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+watch(() => props.dialogSelectDiviceVisible, (newValue) => {
+  dialogTableVisible.value = newValue
+  fetchData()
+  if (!newValue) {
+    table.value.clearMulti() // 清除多选选中
+  }
+})
+
+// 关闭对话框
+const close = () => {
+  emits('closeDialog')
+}
+// 确认
+const confirm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return
+  }
+  emits('updateDeviceConfirm', checkoutList.value)
+  close()
+}
+// 重置
+const clearList = () => {
+  listQuery.value.equipmentName = ''
+  listQuery.value.equipmentNo = ''
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData()
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  console.log('多选', val)
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogTableVisible" width="65%" title="选择设备" class="select-device-dialog" @close="close">
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentName"
+          placeholder="设备名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentNo"
+          placeholder="设备编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.managerState" class="m-2" placeholder="管理状态" clearable>
+          <el-option
+            v-for="item in managerStateList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+            :disabled="item.isSelectItemDisabled"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+    <div style="padding: 12px;">
+      <normal-table
+        ref="table"
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :is-multi="isMulti"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :page-sizes="isMulti ? [20] : [5]"
+        :height="260"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <div style="font-size: 14px;">
+      <span style="color: #f56c6c;">*注意：只能查询管理状态为 <span style="color: #3d7eff;">{{ defineMessageTest }}</span> 的设备</span>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="close">取消</el-button>
+        <el-button type="primary" @click="confirm">
+          确定
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.receive-dialog {
+  .receive-dialog-item {
+    display: flex;
+    align-items: center;
+    margin-bottom: 28px;
+
+    .text {
+      margin-right: 30px;
+      white-space: nowrap;
+    }
+  }
+}
+</style>
diff --git a/src/views/device/receive/apply/applyEdit.vue b/src/views/device/receive/apply/applyEdit.vue
index 13e9528..8b50fc0 100644
--- a/src/views/device/receive/apply/applyEdit.vue
+++ b/src/views/device/receive/apply/applyEdit.vue
@@ -10,6 +10,7 @@
 import SelectDeviceDialog from '../selectDeviceDialog.vue'
 import { toTreeList } from '@/utils/structure'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import {
   failUpdateEquipmentApply,
@@ -22,9 +23,9 @@
 import type { deptType } from '@/views/device/standingBook/standingBook-interface'
 import { getDeptTreeList } from '@/api/system/dept'
 import { getUserList } from '@/api/system/user'
-import { fetchApproval, submitApproval } from '@/api/approval'
 import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
 import useUserStore from '@/store/modules/user'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 
 const user = useUserStore() // 用户信息
 const $route = useRoute()
@@ -39,6 +40,8 @@
 const isMulti = ref(false) // 是否批量添加(允许多选)
 const selectIndex = ref() // 点击选择的index--点击第几行
 const dialogSelectDiviceVisible = ref(false) // 控制选择设备对话框显隐
+const decisionItem = ref('') // 同意、驳回、拒绝按钮权限
+const taskId = ref('') // 任务id，用于同意、驳回、拒绝审批
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
@@ -88,42 +91,6 @@
   $router.back()
 }
 
-const handleClick = (val: string) => {
-  if (val === 'agree') { // 同意
-    approvalDialog.value.initDialog('agree', form.value.taskId)
-  }
-  else if (val === 'reject') { // 驳回
-    approvalDialog.value.initDialog('reject', form.value.taskId)
-  }
-  else if (val === 'refuse') { // 拒绝
-    approvalDialog.value.initDialog('refuse', form.value.taskId)
-  }
-  else if (val === 'revoke') {
-    const params = {
-      taskId: form.value.taskId!,
-      comments: '',
-    }
-    ElMessageBox.confirm(
-      '确认撤回该审批吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        submitApproval('revoke', params).then((res) => {
-          ElMessage({
-            type: 'success',
-            message: '已撤回',
-          })
-        })
-        close()
-      })
-  }
-}
-
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
@@ -314,11 +281,6 @@
   })
 }
 
-// 审批结束回调
-const approvalSuccess = () => {
-  close()
-}
-
 // 编辑、详情--获取详细信息
 const fetchReceiveApplyListDetail = () => {
   getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
@@ -355,6 +317,7 @@
   }
 }
 
+// ---------------------------------------------审批--------------------------------------
 const approvalRecordData = ref([]) // 审批流程数据
 // 查询审批记录
 function getApprovalRecord(processId: string) {
@@ -369,6 +332,47 @@
     }
   }
 }
+// 审批结束回调
+const approvalSuccess = () => {
+  close()
+}
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: form.value.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', taskId.value)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', taskId.value)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', taskId.value)
+  }
+}
+// --------------------------------------------------------------------------------------
 
 onMounted(() => {
   typeValue.value = $route.query.typeValue // 类型add、edit、detail
@@ -376,6 +380,8 @@
   form.value.taskId = $route.query.taskId as string // 任务id
   form.value.processId = $route.query.processId as string // 任务id
   approvalStatus.value = $route.query.approvalStatus // 审批类型
+  decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
+  taskId.value = $route.query.taskId as string // 流程实例id
   approvalStatusName.value = $route.query.approvalStatusName // 审批类型名称
   form.value.applyName = '设备领用申请' // 申请名称固定
   form.value.applyUnit = user.deptId // 申请单位
@@ -401,24 +407,24 @@
   <app-container>
     <detail-page :title="`设备领用申请-${textMap[typeValue]}`">
       <template #btns>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('agree')">
+        <el-button v-if="typeValue === 'detail' && approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
           同意
         </el-button>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('reject')">
+        <el-button v-if="typeValue === 'detail' && approvalStatusName === '待审批' && decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
           驳回
         </el-button>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('refuse')">
+        <el-button v-if="typeValue === 'detail' && approvalStatusName === '待审批' && decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
           拒绝
         </el-button>
+        <el-button v-if="typeValue === 'detail' && approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
         <el-button v-if="typeValue === 'add'" type="primary" @click="submit">
           提交
         </el-button>
         <el-button v-if="typeValue === 'add' || typeValue === 'edit'" type="primary" @click="save">
           保存
         </el-button>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '3'" type="primary" @click="handleClick('revoke')">
-          撤回
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
@@ -544,7 +550,7 @@
             align="center"
           >
             <template v-if="item.value === 'equipmentNo' && (typeValue === 'add' || typeValue === 'edit')" #default="scope">
-              <el-input v-model="scope.row.equipmentNo" placeholder="请选择设备" class="input">
+              <el-input v-model="scope.row.equipmentNo" disabled placeholder="请选择设备" class="input">
                 <template #append>
                   <el-button size="small" @click="handleSelect(scope.$index, scope.row)">
                     选择
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 50b014c..13e05df 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -169,42 +169,6 @@
   $router.push({ path: '/receive/add', query: { typeValue: 'add' } })
 }
 
-// 导出
-const exportAll = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: '下载中请稍后',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (list.value.length > 0) {
-    const params = {
-      applyNo: listQuery.value.applyNo, // 申请编号
-      applyName: listQuery.value.applyName, // 申请名称
-      applyUnit: listQuery.value.applyUnit, // 申请部门
-      applyPerson: listQuery.value.applyPerson, // 申请人
-      startTime: listQuery.value.startTime, // 申请开始日期
-      endTime: listQuery.value.endTime, // 申请结束日期
-      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
-      processResult: listQuery.value.processResult, // 	处置结果
-      applyType: listQuery.value.applyType, // 申请类型 领用0
-      createUser: listQuery.value.createUser, // 创建人
-      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
-      offset: 1,
-      limit: 20,
-      ids: checkoutList.value,
-    }
-    // 调导出接口
-    exportReceiveApplyList(params).then((res) => {
-      const blob = new Blob([res.data])
-      exportFile(blob, '设备领用申请列表.xlsx')
-    })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
-}
-
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -450,7 +414,6 @@
     <table-container>
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/device/receive/applyList/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/device/receive/applyList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table

diff --git a/.env.production b/.env.production
index 0fca4ad..ff5a80a 100644
--- a/.env.production
+++ b/.env.production
@@ -3,9 +3,9 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:21609
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-VITE_APP_API_BASEURL = http://192.168.2.96:8085
+# VITE_APP_API_BASEURL = http://192.168.2.96:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index f342066..9c4581f 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -196,7 +196,7 @@
 
       <el-table-column v-if="!isMulti" label="" width="60" align="center" fixed>
         <template #default="scope">
-          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+          <el-radio v-model="singleChecked" :disabled="scope.row.isRadioDisabled" :label="scope.row.id" class="radio" @change="radioChange" />
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index b2bfdba..f685105 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -462,7 +462,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column v-if="activeTitle === '已归还'" label="归还时间" width="160" align="center">
+          <el-table-column v-if="activeTitle === '已归还'" label="归还时间" width="180" align="center">
             <template #default="scope">
               {{ scope.row.backTime }}
             </template>
diff --git a/src/views/device/borrow/editHandle.vue b/src/views/device/borrow/editHandle.vue
index 0bd10c8..e3fe562 100644
--- a/src/views/device/borrow/editHandle.vue
+++ b/src/views/device/borrow/editHandle.vue
@@ -55,6 +55,7 @@
     form.value.applyPerson = res.data.applyPerson// 申请人
     form.value.time = res.data.time // 借用时间
     form.value.applyDesc = res.data.applyDesc // 申请说明
+    form.value.backTime = res.data.backTime // 归还时间
     list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
       return {
         ...item,
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index 0ada9c2..a884fd8 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -19,6 +19,7 @@
   remark: string // 备注
   updateTime: null | string // 更新时间
   approvalStatusName?: string // 审批状态名称
+  decisionItem?: string | number
 }
 // 标准配套设备表头类型
 export interface columnsType {
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 7f02a38..ba6cc7d 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -254,7 +254,13 @@
 }
 // 跳转到详情
 const goDetail = (row: IlistApproval, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`)
+  $router.push({
+    path: `/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`,
+    query: {
+      decisionItem: `${row.decisionItem}`, // 同意、驳回、拒绝
+      taskId: row.taskId,
+    },
+  })
 }
 // 获取到组织信息
 const getDept = () => {
@@ -275,7 +281,7 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    submitEquipmentApply({ id: row.id, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
+    submitEquipmentApply({ id: row.id, formId: SCHEDULE.DEVICE_FIX_APPROVAL, processId: row.processId }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -488,20 +494,8 @@
               >
                 取消
               </el-button>
-              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <!-- <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                @click="clickBtn(row, '删除')"
-              >
-                删除
-              </el-button> -->
-              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
               <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
index 35cbba2..5584541 100644
--- a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -1,10 +1,12 @@
 <!-- 设备检修列表新增、编辑、详情 -->
 <script lang="ts" setup name="maintenanceDetail">
 import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox, rowContextKey } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
+import { Row } from 'element-plus/es/components/table-v2/src/components'
 import type { IlistPageAddTypes, columnsType, returnRowType } from '../checkList_interface'
+import selectDeviceDialog from './selectDevice.vue'
 import { addEquipmentApply, equipmentApplyInfo, failUpdateEquipmentApply, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
@@ -13,17 +15,19 @@
 import type { userType } from '@/views/system/user/user-interface'
 import { cancelApproval, fetchApproval } from '@/api/approval'
 import { SCHEDULE } from '@/utils/scheduleDict'
-import addRow from '@/views/device/stateManage/components/selectDevice.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
 import useUserStore from '@/store/modules/user'
-
+const approvalDialog = ref() // 审批对话ref
 const user = useUserStore() // 用户信息
 const approvalRecord = ref() // 审批流程组件ref
 const infoId = ref('') // id
 const from = ref('') // reject代表未通过-驳回
 const buttonArray = ref<string[]>([])
 const pageType = ref('add') // 页面类型: add,edit, detail
+const decisionItem = ref('') // 同意、驳回、拒绝按钮权限
+const approvalStatusName = ref('') // 审批状态名称
+const taskId = ref('') // 任务id，用于同意、驳回、拒绝审批
 const textMap: { [key: string]: string } = {
   add: '新建',
   edit: '编辑',
@@ -167,44 +171,7 @@
 
 // 表格选中的数组
 const SelectionList = ref<object[]>([])
-// 取消
-const handleCancel = () => {
-  const params = {
-    processInstanceId: formInline.value.processId!,
-    comments: '取消审批',
-  }
-  ElMessageBox.confirm(
-    '确认取消该审批吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  ).then(() => {
-    cancelApproval(params).then(() => {
-      ElMessage.success('取消成功')
-    })
-  })
-}
-const approvalDialog = ref()
-// 点击数据后的操作按钮
-const clickBtn = (buttonType: string) => {
-  switch (buttonType) {
-    case '同意':
-      approvalDialog.value.initDialog('agree', formInline.value.taskId)
-      break
-    case '驳回':
-      approvalDialog.value.initDialog('reject', formInline.value.taskId)
-      break
-    case '拒绝':
-      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
-      break
-    case '取消':
-      handleCancel()
-      break
-  }
-}
+
 // 获取详情信息
 const getInfo = () => {
   equipmentApplyInfo({ id: infoId.value }).then((res) => {
@@ -302,10 +269,15 @@
   }
 }
 
-const addRowRef = ref()
+// ----------------------------------------------表格---------------------------------------
+const dialogSelectDiviceVisible = ref(false)
 // 点击批量增加
 const batchIncrease = () => {
-  addRowRef.value.initDialog({ title: '' })
+  dialogSelectDiviceVisible.value = true
+}
+// 选择设备对话框关闭
+const closeDialog = () => {
+  dialogSelectDiviceVisible.value = false
 }
 
 // 删除行
@@ -341,6 +313,8 @@
   })
 }
 
+// ----------------------------------------------------------------------------------
+
 // 选好申请人 userId用户id
 const changeSelectReceiver = (userId: string) => {
   // 在用户列表里找到选择的接收人的名字
@@ -362,18 +336,6 @@
     usePersonOptions.value = usePersonList.value
   }
 }
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
 // 获取部门列表
 const fetchDeptTreeList = () => {
   getDeptTreeList().then((res) => {
@@ -388,6 +350,7 @@
     usePersonOptions.value = res.data.rows
   })
 }
+// -------------------------------------------审批----------------------------------------
 const approvalRecordData = ref([]) // 审批流程数据
 // 查询审批记录
 function getApprovalRecord(processId: string) {
@@ -404,8 +367,45 @@
 }
 // 审批结束回调
 const approvalSuccess = () => {
-  getInfo()
+  close()
 }
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: formInline.value.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', taskId.value)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', taskId.value)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', taskId.value)
+  }
+}
+// ---------------------------------------------------------------------------------------
 onMounted(async () => {
   formInline.value.applyName = '设备检修申请' // 申请名称固定
   formInline.value.applyUnit = user.deptId // 申请单位
@@ -416,6 +416,11 @@
   await fetchUserList()
   await fetchDeptTreeList()
   formInline.value.processId = $route.params.processId as string // 任务id
+  decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
+  taskId.value = $route.query.taskId as string // 流程实例id
+  approvalStatusName.value = $route.params.approvalStatusName as string // 审批状态名称
+  console.log(approvalStatusName.value)
+
   formInline.value.approvalStatusName = $route.params.approvalStatusName as string // 任务id
   if (formInline.value.approvalStatusName !== '草稿箱') {
     getApprovalRecord(formInline.value.processId) // 查询审批记录
@@ -427,6 +432,18 @@
   <app-container>
     <detail-page :title="`${$route.meta.title}-${textMap[pageType]}`">
       <template #btns>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批' && decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批' && decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
         <el-button v-if="pageType === 'add'" type="primary" @click="submit">
           提交
         </el-button>
@@ -555,7 +572,7 @@
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection" width="55" />
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="55" />
         <el-table-column align="center" label="序号" width="60" type="index" />
         <el-table-column
           v-for="(item, index) in columns"
@@ -576,9 +593,14 @@
       <!-- 审批流程 -->
       <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
     </detail-block>
+    <!-- 审批弹窗 -->
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-    <!-- 借用设备列表 -->
-    <add-row ref="addRowRef" @add="confirmSelectDevice" />
+    <select-device-dialog
+      :dialog-select-divice-visible="dialogSelectDiviceVisible"
+      :is-multi="true"
+      @close-dialog="closeDialog"
+      @updateDeviceConfirm="confirmSelectDevice"
+    />
   </app-container>
 </template>
 
diff --git a/src/views/device/deviceMaintenance/components/selectDevice.vue b/src/views/device/deviceMaintenance/components/selectDevice.vue
new file mode 100644
index 0000000..3c04be6
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/selectDevice.vue
@@ -0,0 +1,216 @@
+<!-- 选择设备对话框 -->
+<script lang="ts" setup name="ReceiveDialog">
+import { ref } from 'vue'
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import type { IdeviceList } from '@/views/device/stateManage/components/status-interface'
+import useUserStore from '@/store/modules/user'
+import { listPageApi } from '@/api/device/standingBook'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { selectType } from '@/views/device/standingBook/standingBook-interface'
+import { getStatusList } from '@/api/device/stateManage'
+import { SCHEDULE } from '@/utils/scheduleDict'
+const props = defineProps({
+  dialogSelectDiviceVisible: {
+    type: Boolean,
+    default: false,
+  },
+  isMulti: Boolean, // 是否多选
+  statusTypeName: { // 状态管理类型
+    type: String,
+    default: '',
+  },
+})
+// 提醒文字
+const emits = defineEmits(['closeDialog', 'updateDeviceConfirm'])
+const defineMessageTest = ref('闲置、封存、在用(启封)') // 提醒文字
+const loadingTable = ref<boolean>(false)
+const userStore = useUserStore()
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  managerState: '1', // 管理状态 // 默认在用(启封)
+  offset: 1,
+  limit: 20,
+})
+const total = ref(20)
+// 多选选中的内容
+const checkoutList = ref([]) as any
+const list = ref([])// 表格数据
+const columns = ref<TableColumn[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center', fixed: true },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', fixed: true, width: '160' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '管理状态', value: 'managerStateName', align: 'center', width: '120' },
+  { text: '使用人', value: 'usePersonName', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center', width: '120' },
+])
+const table = ref()
+const dialogTableVisible = ref(false)// 控制对话框显隐
+// 获取数据
+const managerStateList = ref<selectType[]>([])
+const getDict = () => {
+  // 获取管理状态
+  getDictByCode('managerState').then((response) => {
+    managerStateList.value = response.data.map((item: { name: string; isSelectItemDisabled: boolean }) => {
+      if (item.name === '报废' || item.name === '处置') {
+        item.isSelectItemDisabled = true
+      }
+      return item
+    })
+  })
+}
+getDict()
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listQuery.value.limit = props.isMulti ? 20 : 5
+  listPageApi(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: IdeviceList) => {
+      return {
+        ...item,
+        validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+      }
+    })
+    total.value = res.data.total
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+watch(() => props.dialogSelectDiviceVisible, (newValue) => {
+  dialogTableVisible.value = newValue
+  fetchData()
+  if (!newValue) {
+    table.value.clearMulti() // 清除多选选中
+  }
+})
+
+// 关闭对话框
+const close = () => {
+  emits('closeDialog')
+}
+// 确认
+const confirm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return
+  }
+  emits('updateDeviceConfirm', checkoutList.value)
+  close()
+}
+// 重置
+const clearList = () => {
+  listQuery.value.equipmentName = ''
+  listQuery.value.equipmentNo = ''
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData()
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  console.log('多选', val)
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogTableVisible" width="65%" title="选择设备" class="select-device-dialog" @close="close">
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentName"
+          placeholder="设备名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentNo"
+          placeholder="设备编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.managerState" class="m-2" placeholder="管理状态" clearable>
+          <el-option
+            v-for="item in managerStateList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+            :disabled="item.isSelectItemDisabled"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+    <div style="padding: 12px;">
+      <normal-table
+        ref="table"
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :is-multi="isMulti"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :page-sizes="isMulti ? [20] : [5]"
+        :height="260"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <div style="font-size: 14px;">
+      <span style="color: #f56c6c;">*注意：只能查询管理状态为 <span style="color: #3d7eff;">{{ defineMessageTest }}</span> 的设备</span>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="close">取消</el-button>
+        <el-button type="primary" @click="confirm">
+          确定
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.receive-dialog {
+  .receive-dialog-item {
+    display: flex;
+    align-items: center;
+    margin-bottom: 28px;
+
+    .text {
+      margin-right: 30px;
+      white-space: nowrap;
+    }
+  }
+}
+</style>
diff --git a/src/views/device/receive/apply/applyEdit.vue b/src/views/device/receive/apply/applyEdit.vue
index 13e9528..8b50fc0 100644
--- a/src/views/device/receive/apply/applyEdit.vue
+++ b/src/views/device/receive/apply/applyEdit.vue
@@ -10,6 +10,7 @@
 import SelectDeviceDialog from '../selectDeviceDialog.vue'
 import { toTreeList } from '@/utils/structure'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import {
   failUpdateEquipmentApply,
@@ -22,9 +23,9 @@
 import type { deptType } from '@/views/device/standingBook/standingBook-interface'
 import { getDeptTreeList } from '@/api/system/dept'
 import { getUserList } from '@/api/system/user'
-import { fetchApproval, submitApproval } from '@/api/approval'
 import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
 import useUserStore from '@/store/modules/user'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 
 const user = useUserStore() // 用户信息
 const $route = useRoute()
@@ -39,6 +40,8 @@
 const isMulti = ref(false) // 是否批量添加(允许多选)
 const selectIndex = ref() // 点击选择的index--点击第几行
 const dialogSelectDiviceVisible = ref(false) // 控制选择设备对话框显隐
+const decisionItem = ref('') // 同意、驳回、拒绝按钮权限
+const taskId = ref('') // 任务id，用于同意、驳回、拒绝审批
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
@@ -88,42 +91,6 @@
   $router.back()
 }
 
-const handleClick = (val: string) => {
-  if (val === 'agree') { // 同意
-    approvalDialog.value.initDialog('agree', form.value.taskId)
-  }
-  else if (val === 'reject') { // 驳回
-    approvalDialog.value.initDialog('reject', form.value.taskId)
-  }
-  else if (val === 'refuse') { // 拒绝
-    approvalDialog.value.initDialog('refuse', form.value.taskId)
-  }
-  else if (val === 'revoke') {
-    const params = {
-      taskId: form.value.taskId!,
-      comments: '',
-    }
-    ElMessageBox.confirm(
-      '确认撤回该审批吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        submitApproval('revoke', params).then((res) => {
-          ElMessage({
-            type: 'success',
-            message: '已撤回',
-          })
-        })
-        close()
-      })
-  }
-}
-
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
@@ -314,11 +281,6 @@
   })
 }
 
-// 审批结束回调
-const approvalSuccess = () => {
-  close()
-}
-
 // 编辑、详情--获取详细信息
 const fetchReceiveApplyListDetail = () => {
   getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
@@ -355,6 +317,7 @@
   }
 }
 
+// ---------------------------------------------审批--------------------------------------
 const approvalRecordData = ref([]) // 审批流程数据
 // 查询审批记录
 function getApprovalRecord(processId: string) {
@@ -369,6 +332,47 @@
     }
   }
 }
+// 审批结束回调
+const approvalSuccess = () => {
+  close()
+}
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: form.value.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', taskId.value)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', taskId.value)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', taskId.value)
+  }
+}
+// --------------------------------------------------------------------------------------
 
 onMounted(() => {
   typeValue.value = $route.query.typeValue // 类型add、edit、detail
@@ -376,6 +380,8 @@
   form.value.taskId = $route.query.taskId as string // 任务id
   form.value.processId = $route.query.processId as string // 任务id
   approvalStatus.value = $route.query.approvalStatus // 审批类型
+  decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
+  taskId.value = $route.query.taskId as string // 流程实例id
   approvalStatusName.value = $route.query.approvalStatusName // 审批类型名称
   form.value.applyName = '设备领用申请' // 申请名称固定
   form.value.applyUnit = user.deptId // 申请单位
@@ -401,24 +407,24 @@
   <app-container>
     <detail-page :title="`设备领用申请-${textMap[typeValue]}`">
       <template #btns>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('agree')">
+        <el-button v-if="typeValue === 'detail' && approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
           同意
         </el-button>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('reject')">
+        <el-button v-if="typeValue === 'detail' && approvalStatusName === '待审批' && decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
           驳回
         </el-button>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('refuse')">
+        <el-button v-if="typeValue === 'detail' && approvalStatusName === '待审批' && decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
           拒绝
         </el-button>
+        <el-button v-if="typeValue === 'detail' && approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
         <el-button v-if="typeValue === 'add'" type="primary" @click="submit">
           提交
         </el-button>
         <el-button v-if="typeValue === 'add' || typeValue === 'edit'" type="primary" @click="save">
           保存
         </el-button>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '3'" type="primary" @click="handleClick('revoke')">
-          撤回
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
@@ -544,7 +550,7 @@
             align="center"
           >
             <template v-if="item.value === 'equipmentNo' && (typeValue === 'add' || typeValue === 'edit')" #default="scope">
-              <el-input v-model="scope.row.equipmentNo" placeholder="请选择设备" class="input">
+              <el-input v-model="scope.row.equipmentNo" disabled placeholder="请选择设备" class="input">
                 <template #append>
                   <el-button size="small" @click="handleSelect(scope.$index, scope.row)">
                     选择
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 50b014c..13e05df 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -169,42 +169,6 @@
   $router.push({ path: '/receive/add', query: { typeValue: 'add' } })
 }
 
-// 导出
-const exportAll = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: '下载中请稍后',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (list.value.length > 0) {
-    const params = {
-      applyNo: listQuery.value.applyNo, // 申请编号
-      applyName: listQuery.value.applyName, // 申请名称
-      applyUnit: listQuery.value.applyUnit, // 申请部门
-      applyPerson: listQuery.value.applyPerson, // 申请人
-      startTime: listQuery.value.startTime, // 申请开始日期
-      endTime: listQuery.value.endTime, // 申请结束日期
-      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
-      processResult: listQuery.value.processResult, // 	处置结果
-      applyType: listQuery.value.applyType, // 申请类型 领用0
-      createUser: listQuery.value.createUser, // 创建人
-      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
-      offset: 1,
-      limit: 20,
-      ids: checkoutList.value,
-    }
-    // 调导出接口
-    exportReceiveApplyList(params).then((res) => {
-      const blob = new Blob([res.data])
-      exportFile(blob, '设备领用申请列表.xlsx')
-    })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
-}
-
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -450,7 +414,6 @@
     <table-container>
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/device/receive/applyList/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/device/receive/applyList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
diff --git a/src/views/device/receive/solve/solveDetail.vue b/src/views/device/receive/solve/solveDetail.vue
index e0fc823..927ac8b 100644
--- a/src/views/device/receive/solve/solveDetail.vue
+++ b/src/views/device/receive/solve/solveDetail.vue
@@ -134,55 +134,55 @@
     </detail-page>
     <div id="lysq" class="lysq-create-check">
       <div class="top-info">
-        <detail-block title="领用申请">
-          <div class="form-area">
-            <el-form
-              ref="ruleFormRef"
-              :model="form"
-              label-width="120px"
-            >
-              <el-row :gutter="24">
-                <el-col :span="6">
-                  <el-form-item label="申请名称" prop="applyName">
-                    <el-input v-model="form.applyName" disabled />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="申请单位" prop="applyUnit">
-                    <dept-select
-                      v-model="form.applyUnit"
-                      :data="useDeptList"
-                      disabled
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="申请人" prop="applyPerson">
-                    <el-select v-model="form.applyPerson" disabled style="width: 100%;">
-                      <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="领用时间" prop="time">
-                    <el-date-picker
-                      v-model="form.time"
-                      type="datetime"
-                      format="YYYY-MM-DD hh:mm"
-                      value-format="YYYY-MM-DD hh:mm"
-                      disabled
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="申请说明" prop="applyDesc">
-                    <el-input v-model="form.applyDesc" type="textarea" disabled autosize />
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </el-form>
-          </div>
-        </detail-block>
+        <!-- <detail-block title="领用申请"> -->
+        <div class="form-area">
+          <el-form
+            ref="ruleFormRef"
+            :model="form"
+            label-width="120px"
+          >
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="申请名称" prop="applyName">
+                  <el-input v-model="form.applyName" disabled />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="申请单位" prop="applyUnit">
+                  <dept-select
+                    v-model="form.applyUnit"
+                    :data="useDeptList"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="申请人" prop="applyPerson">
+                  <el-select v-model="form.applyPerson" disabled style="width: 100%;">
+                    <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="领用时间" prop="time">
+                  <el-date-picker
+                    v-model="form.time"
+                    type="datetime"
+                    format="YYYY-MM-DD hh:mm"
+                    value-format="YYYY-MM-DD hh:mm"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="申请说明" prop="applyDesc">
+                  <el-input v-model="form.applyDesc" type="textarea" disabled autosize />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </div>
+        <!-- </detail-block> -->
       </div>
       <detail-block title="设备领用列表">
         <el-table

diff --git a/.env.production b/.env.production
index 0fca4ad..ff5a80a 100644
--- a/.env.production
+++ b/.env.production
@@ -3,9 +3,9 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:21609
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-VITE_APP_API_BASEURL = http://192.168.2.96:8085
+# VITE_APP_API_BASEURL = http://192.168.2.96:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index f342066..9c4581f 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -196,7 +196,7 @@
 
       <el-table-column v-if="!isMulti" label="" width="60" align="center" fixed>
         <template #default="scope">
-          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+          <el-radio v-model="singleChecked" :disabled="scope.row.isRadioDisabled" :label="scope.row.id" class="radio" @change="radioChange" />
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index b2bfdba..f685105 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -462,7 +462,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column v-if="activeTitle === '已归还'" label="归还时间" width="160" align="center">
+          <el-table-column v-if="activeTitle === '已归还'" label="归还时间" width="180" align="center">
             <template #default="scope">
               {{ scope.row.backTime }}
             </template>
diff --git a/src/views/device/borrow/editHandle.vue b/src/views/device/borrow/editHandle.vue
index 0bd10c8..e3fe562 100644
--- a/src/views/device/borrow/editHandle.vue
+++ b/src/views/device/borrow/editHandle.vue
@@ -55,6 +55,7 @@
     form.value.applyPerson = res.data.applyPerson// 申请人
     form.value.time = res.data.time // 借用时间
     form.value.applyDesc = res.data.applyDesc // 申请说明
+    form.value.backTime = res.data.backTime // 归还时间
     list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
       return {
         ...item,
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index 0ada9c2..a884fd8 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -19,6 +19,7 @@
   remark: string // 备注
   updateTime: null | string // 更新时间
   approvalStatusName?: string // 审批状态名称
+  decisionItem?: string | number
 }
 // 标准配套设备表头类型
 export interface columnsType {
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 7f02a38..ba6cc7d 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -254,7 +254,13 @@
 }
 // 跳转到详情
 const goDetail = (row: IlistApproval, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`)
+  $router.push({
+    path: `/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`,
+    query: {
+      decisionItem: `${row.decisionItem}`, // 同意、驳回、拒绝
+      taskId: row.taskId,
+    },
+  })
 }
 // 获取到组织信息
 const getDept = () => {
@@ -275,7 +281,7 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    submitEquipmentApply({ id: row.id, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
+    submitEquipmentApply({ id: row.id, formId: SCHEDULE.DEVICE_FIX_APPROVAL, processId: row.processId }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -488,20 +494,8 @@
               >
                 取消
               </el-button>
-              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <!-- <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                @click="clickBtn(row, '删除')"
-              >
-                删除
-              </el-button> -->
-              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
               <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
index 35cbba2..5584541 100644
--- a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -1,10 +1,12 @@
 <!-- 设备检修列表新增、编辑、详情 -->
 <script lang="ts" setup name="maintenanceDetail">
 import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox, rowContextKey } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
+import { Row } from 'element-plus/es/components/table-v2/src/components'
 import type { IlistPageAddTypes, columnsType, returnRowType } from '../checkList_interface'
+import selectDeviceDialog from './selectDevice.vue'
 import { addEquipmentApply, equipmentApplyInfo, failUpdateEquipmentApply, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
@@ -13,17 +15,19 @@
 import type { userType } from '@/views/system/user/user-interface'
 import { cancelApproval, fetchApproval } from '@/api/approval'
 import { SCHEDULE } from '@/utils/scheduleDict'
-import addRow from '@/views/device/stateManage/components/selectDevice.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
 import useUserStore from '@/store/modules/user'
-
+const approvalDialog = ref() // 审批对话ref
 const user = useUserStore() // 用户信息
 const approvalRecord = ref() // 审批流程组件ref
 const infoId = ref('') // id
 const from = ref('') // reject代表未通过-驳回
 const buttonArray = ref<string[]>([])
 const pageType = ref('add') // 页面类型: add,edit, detail
+const decisionItem = ref('') // 同意、驳回、拒绝按钮权限
+const approvalStatusName = ref('') // 审批状态名称
+const taskId = ref('') // 任务id，用于同意、驳回、拒绝审批
 const textMap: { [key: string]: string } = {
   add: '新建',
   edit: '编辑',
@@ -167,44 +171,7 @@
 
 // 表格选中的数组
 const SelectionList = ref<object[]>([])
-// 取消
-const handleCancel = () => {
-  const params = {
-    processInstanceId: formInline.value.processId!,
-    comments: '取消审批',
-  }
-  ElMessageBox.confirm(
-    '确认取消该审批吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  ).then(() => {
-    cancelApproval(params).then(() => {
-      ElMessage.success('取消成功')
-    })
-  })
-}
-const approvalDialog = ref()
-// 点击数据后的操作按钮
-const clickBtn = (buttonType: string) => {
-  switch (buttonType) {
-    case '同意':
-      approvalDialog.value.initDialog('agree', formInline.value.taskId)
-      break
-    case '驳回':
-      approvalDialog.value.initDialog('reject', formInline.value.taskId)
-      break
-    case '拒绝':
-      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
-      break
-    case '取消':
-      handleCancel()
-      break
-  }
-}
+
 // 获取详情信息
 const getInfo = () => {
   equipmentApplyInfo({ id: infoId.value }).then((res) => {
@@ -302,10 +269,15 @@
   }
 }
 
-const addRowRef = ref()
+// ----------------------------------------------表格---------------------------------------
+const dialogSelectDiviceVisible = ref(false)
 // 点击批量增加
 const batchIncrease = () => {
-  addRowRef.value.initDialog({ title: '' })
+  dialogSelectDiviceVisible.value = true
+}
+// 选择设备对话框关闭
+const closeDialog = () => {
+  dialogSelectDiviceVisible.value = false
 }
 
 // 删除行
@@ -341,6 +313,8 @@
   })
 }
 
+// ----------------------------------------------------------------------------------
+
 // 选好申请人 userId用户id
 const changeSelectReceiver = (userId: string) => {
   // 在用户列表里找到选择的接收人的名字
@@ -362,18 +336,6 @@
     usePersonOptions.value = usePersonList.value
   }
 }
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
 // 获取部门列表
 const fetchDeptTreeList = () => {
   getDeptTreeList().then((res) => {
@@ -388,6 +350,7 @@
     usePersonOptions.value = res.data.rows
   })
 }
+// -------------------------------------------审批----------------------------------------
 const approvalRecordData = ref([]) // 审批流程数据
 // 查询审批记录
 function getApprovalRecord(processId: string) {
@@ -404,8 +367,45 @@
 }
 // 审批结束回调
 const approvalSuccess = () => {
-  getInfo()
+  close()
 }
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: formInline.value.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', taskId.value)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', taskId.value)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', taskId.value)
+  }
+}
+// ---------------------------------------------------------------------------------------
 onMounted(async () => {
   formInline.value.applyName = '设备检修申请' // 申请名称固定
   formInline.value.applyUnit = user.deptId // 申请单位
@@ -416,6 +416,11 @@
   await fetchUserList()
   await fetchDeptTreeList()
   formInline.value.processId = $route.params.processId as string // 任务id
+  decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
+  taskId.value = $route.query.taskId as string // 流程实例id
+  approvalStatusName.value = $route.params.approvalStatusName as string // 审批状态名称
+  console.log(approvalStatusName.value)
+
   formInline.value.approvalStatusName = $route.params.approvalStatusName as string // 任务id
   if (formInline.value.approvalStatusName !== '草稿箱') {
     getApprovalRecord(formInline.value.processId) // 查询审批记录
@@ -427,6 +432,18 @@
   <app-container>
     <detail-page :title="`${$route.meta.title}-${textMap[pageType]}`">
       <template #btns>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批' && decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批' && decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
         <el-button v-if="pageType === 'add'" type="primary" @click="submit">
           提交
         </el-button>
@@ -555,7 +572,7 @@
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection" width="55" />
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="55" />
         <el-table-column align="center" label="序号" width="60" type="index" />
         <el-table-column
           v-for="(item, index) in columns"
@@ -576,9 +593,14 @@
       <!-- 审批流程 -->
       <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
     </detail-block>
+    <!-- 审批弹窗 -->
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-    <!-- 借用设备列表 -->
-    <add-row ref="addRowRef" @add="confirmSelectDevice" />
+    <select-device-dialog
+      :dialog-select-divice-visible="dialogSelectDiviceVisible"
+      :is-multi="true"
+      @close-dialog="closeDialog"
+      @updateDeviceConfirm="confirmSelectDevice"
+    />
   </app-container>
 </template>
 
diff --git a/src/views/device/deviceMaintenance/components/selectDevice.vue b/src/views/device/deviceMaintenance/components/selectDevice.vue
new file mode 100644
index 0000000..3c04be6
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/selectDevice.vue
@@ -0,0 +1,216 @@
+<!-- 选择设备对话框 -->
+<script lang="ts" setup name="ReceiveDialog">
+import { ref } from 'vue'
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import type { IdeviceList } from '@/views/device/stateManage/components/status-interface'
+import useUserStore from '@/store/modules/user'
+import { listPageApi } from '@/api/device/standingBook'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { selectType } from '@/views/device/standingBook/standingBook-interface'
+import { getStatusList } from '@/api/device/stateManage'
+import { SCHEDULE } from '@/utils/scheduleDict'
+const props = defineProps({
+  dialogSelectDiviceVisible: {
+    type: Boolean,
+    default: false,
+  },
+  isMulti: Boolean, // 是否多选
+  statusTypeName: { // 状态管理类型
+    type: String,
+    default: '',
+  },
+})
+// 提醒文字
+const emits = defineEmits(['closeDialog', 'updateDeviceConfirm'])
+const defineMessageTest = ref('闲置、封存、在用(启封)') // 提醒文字
+const loadingTable = ref<boolean>(false)
+const userStore = useUserStore()
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  managerState: '1', // 管理状态 // 默认在用(启封)
+  offset: 1,
+  limit: 20,
+})
+const total = ref(20)
+// 多选选中的内容
+const checkoutList = ref([]) as any
+const list = ref([])// 表格数据
+const columns = ref<TableColumn[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center', fixed: true },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', fixed: true, width: '160' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '管理状态', value: 'managerStateName', align: 'center', width: '120' },
+  { text: '使用人', value: 'usePersonName', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center', width: '120' },
+])
+const table = ref()
+const dialogTableVisible = ref(false)// 控制对话框显隐
+// 获取数据
+const managerStateList = ref<selectType[]>([])
+const getDict = () => {
+  // 获取管理状态
+  getDictByCode('managerState').then((response) => {
+    managerStateList.value = response.data.map((item: { name: string; isSelectItemDisabled: boolean }) => {
+      if (item.name === '报废' || item.name === '处置') {
+        item.isSelectItemDisabled = true
+      }
+      return item
+    })
+  })
+}
+getDict()
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listQuery.value.limit = props.isMulti ? 20 : 5
+  listPageApi(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: IdeviceList) => {
+      return {
+        ...item,
+        validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+      }
+    })
+    total.value = res.data.total
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+watch(() => props.dialogSelectDiviceVisible, (newValue) => {
+  dialogTableVisible.value = newValue
+  fetchData()
+  if (!newValue) {
+    table.value.clearMulti() // 清除多选选中
+  }
+})
+
+// 关闭对话框
+const close = () => {
+  emits('closeDialog')
+}
+// 确认
+const confirm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return
+  }
+  emits('updateDeviceConfirm', checkoutList.value)
+  close()
+}
+// 重置
+const clearList = () => {
+  listQuery.value.equipmentName = ''
+  listQuery.value.equipmentNo = ''
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData()
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  console.log('多选', val)
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogTableVisible" width="65%" title="选择设备" class="select-device-dialog" @close="close">
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentName"
+          placeholder="设备名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentNo"
+          placeholder="设备编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.managerState" class="m-2" placeholder="管理状态" clearable>
+          <el-option
+            v-for="item in managerStateList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+            :disabled="item.isSelectItemDisabled"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+    <div style="padding: 12px;">
+      <normal-table
+        ref="table"
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :is-multi="isMulti"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :page-sizes="isMulti ? [20] : [5]"
+        :height="260"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <div style="font-size: 14px;">
+      <span style="color: #f56c6c;">*注意：只能查询管理状态为 <span style="color: #3d7eff;">{{ defineMessageTest }}</span> 的设备</span>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="close">取消</el-button>
+        <el-button type="primary" @click="confirm">
+          确定
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.receive-dialog {
+  .receive-dialog-item {
+    display: flex;
+    align-items: center;
+    margin-bottom: 28px;
+
+    .text {
+      margin-right: 30px;
+      white-space: nowrap;
+    }
+  }
+}
+</style>
diff --git a/src/views/device/receive/apply/applyEdit.vue b/src/views/device/receive/apply/applyEdit.vue
index 13e9528..8b50fc0 100644
--- a/src/views/device/receive/apply/applyEdit.vue
+++ b/src/views/device/receive/apply/applyEdit.vue
@@ -10,6 +10,7 @@
 import SelectDeviceDialog from '../selectDeviceDialog.vue'
 import { toTreeList } from '@/utils/structure'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import {
   failUpdateEquipmentApply,
@@ -22,9 +23,9 @@
 import type { deptType } from '@/views/device/standingBook/standingBook-interface'
 import { getDeptTreeList } from '@/api/system/dept'
 import { getUserList } from '@/api/system/user'
-import { fetchApproval, submitApproval } from '@/api/approval'
 import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
 import useUserStore from '@/store/modules/user'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 
 const user = useUserStore() // 用户信息
 const $route = useRoute()
@@ -39,6 +40,8 @@
 const isMulti = ref(false) // 是否批量添加(允许多选)
 const selectIndex = ref() // 点击选择的index--点击第几行
 const dialogSelectDiviceVisible = ref(false) // 控制选择设备对话框显隐
+const decisionItem = ref('') // 同意、驳回、拒绝按钮权限
+const taskId = ref('') // 任务id，用于同意、驳回、拒绝审批
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
@@ -88,42 +91,6 @@
   $router.back()
 }
 
-const handleClick = (val: string) => {
-  if (val === 'agree') { // 同意
-    approvalDialog.value.initDialog('agree', form.value.taskId)
-  }
-  else if (val === 'reject') { // 驳回
-    approvalDialog.value.initDialog('reject', form.value.taskId)
-  }
-  else if (val === 'refuse') { // 拒绝
-    approvalDialog.value.initDialog('refuse', form.value.taskId)
-  }
-  else if (val === 'revoke') {
-    const params = {
-      taskId: form.value.taskId!,
-      comments: '',
-    }
-    ElMessageBox.confirm(
-      '确认撤回该审批吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        submitApproval('revoke', params).then((res) => {
-          ElMessage({
-            type: 'success',
-            message: '已撤回',
-          })
-        })
-        close()
-      })
-  }
-}
-
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
@@ -314,11 +281,6 @@
   })
 }
 
-// 审批结束回调
-const approvalSuccess = () => {
-  close()
-}
-
 // 编辑、详情--获取详细信息
 const fetchReceiveApplyListDetail = () => {
   getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
@@ -355,6 +317,7 @@
   }
 }
 
+// ---------------------------------------------审批--------------------------------------
 const approvalRecordData = ref([]) // 审批流程数据
 // 查询审批记录
 function getApprovalRecord(processId: string) {
@@ -369,6 +332,47 @@
     }
   }
 }
+// 审批结束回调
+const approvalSuccess = () => {
+  close()
+}
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: form.value.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', taskId.value)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', taskId.value)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', taskId.value)
+  }
+}
+// --------------------------------------------------------------------------------------
 
 onMounted(() => {
   typeValue.value = $route.query.typeValue // 类型add、edit、detail
@@ -376,6 +380,8 @@
   form.value.taskId = $route.query.taskId as string // 任务id
   form.value.processId = $route.query.processId as string // 任务id
   approvalStatus.value = $route.query.approvalStatus // 审批类型
+  decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
+  taskId.value = $route.query.taskId as string // 流程实例id
   approvalStatusName.value = $route.query.approvalStatusName // 审批类型名称
   form.value.applyName = '设备领用申请' // 申请名称固定
   form.value.applyUnit = user.deptId // 申请单位
@@ -401,24 +407,24 @@
   <app-container>
     <detail-page :title="`设备领用申请-${textMap[typeValue]}`">
       <template #btns>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('agree')">
+        <el-button v-if="typeValue === 'detail' && approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
           同意
         </el-button>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('reject')">
+        <el-button v-if="typeValue === 'detail' && approvalStatusName === '待审批' && decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
           驳回
         </el-button>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('refuse')">
+        <el-button v-if="typeValue === 'detail' && approvalStatusName === '待审批' && decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
           拒绝
         </el-button>
+        <el-button v-if="typeValue === 'detail' && approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
         <el-button v-if="typeValue === 'add'" type="primary" @click="submit">
           提交
         </el-button>
         <el-button v-if="typeValue === 'add' || typeValue === 'edit'" type="primary" @click="save">
           保存
         </el-button>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '3'" type="primary" @click="handleClick('revoke')">
-          撤回
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
@@ -544,7 +550,7 @@
             align="center"
           >
             <template v-if="item.value === 'equipmentNo' && (typeValue === 'add' || typeValue === 'edit')" #default="scope">
-              <el-input v-model="scope.row.equipmentNo" placeholder="请选择设备" class="input">
+              <el-input v-model="scope.row.equipmentNo" disabled placeholder="请选择设备" class="input">
                 <template #append>
                   <el-button size="small" @click="handleSelect(scope.$index, scope.row)">
                     选择
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 50b014c..13e05df 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -169,42 +169,6 @@
   $router.push({ path: '/receive/add', query: { typeValue: 'add' } })
 }
 
-// 导出
-const exportAll = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: '下载中请稍后',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (list.value.length > 0) {
-    const params = {
-      applyNo: listQuery.value.applyNo, // 申请编号
-      applyName: listQuery.value.applyName, // 申请名称
-      applyUnit: listQuery.value.applyUnit, // 申请部门
-      applyPerson: listQuery.value.applyPerson, // 申请人
-      startTime: listQuery.value.startTime, // 申请开始日期
-      endTime: listQuery.value.endTime, // 申请结束日期
-      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
-      processResult: listQuery.value.processResult, // 	处置结果
-      applyType: listQuery.value.applyType, // 申请类型 领用0
-      createUser: listQuery.value.createUser, // 创建人
-      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
-      offset: 1,
-      limit: 20,
-      ids: checkoutList.value,
-    }
-    // 调导出接口
-    exportReceiveApplyList(params).then((res) => {
-      const blob = new Blob([res.data])
-      exportFile(blob, '设备领用申请列表.xlsx')
-    })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
-}
-
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -450,7 +414,6 @@
     <table-container>
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/device/receive/applyList/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/device/receive/applyList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
diff --git a/src/views/device/receive/solve/solveDetail.vue b/src/views/device/receive/solve/solveDetail.vue
index e0fc823..927ac8b 100644
--- a/src/views/device/receive/solve/solveDetail.vue
+++ b/src/views/device/receive/solve/solveDetail.vue
@@ -134,55 +134,55 @@
     </detail-page>
     <div id="lysq" class="lysq-create-check">
       <div class="top-info">
-        <detail-block title="领用申请">
-          <div class="form-area">
-            <el-form
-              ref="ruleFormRef"
-              :model="form"
-              label-width="120px"
-            >
-              <el-row :gutter="24">
-                <el-col :span="6">
-                  <el-form-item label="申请名称" prop="applyName">
-                    <el-input v-model="form.applyName" disabled />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="申请单位" prop="applyUnit">
-                    <dept-select
-                      v-model="form.applyUnit"
-                      :data="useDeptList"
-                      disabled
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="申请人" prop="applyPerson">
-                    <el-select v-model="form.applyPerson" disabled style="width: 100%;">
-                      <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="领用时间" prop="time">
-                    <el-date-picker
-                      v-model="form.time"
-                      type="datetime"
-                      format="YYYY-MM-DD hh:mm"
-                      value-format="YYYY-MM-DD hh:mm"
-                      disabled
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="申请说明" prop="applyDesc">
-                    <el-input v-model="form.applyDesc" type="textarea" disabled autosize />
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </el-form>
-          </div>
-        </detail-block>
+        <!-- <detail-block title="领用申请"> -->
+        <div class="form-area">
+          <el-form
+            ref="ruleFormRef"
+            :model="form"
+            label-width="120px"
+          >
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="申请名称" prop="applyName">
+                  <el-input v-model="form.applyName" disabled />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="申请单位" prop="applyUnit">
+                  <dept-select
+                    v-model="form.applyUnit"
+                    :data="useDeptList"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="申请人" prop="applyPerson">
+                  <el-select v-model="form.applyPerson" disabled style="width: 100%;">
+                    <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="领用时间" prop="time">
+                  <el-date-picker
+                    v-model="form.time"
+                    type="datetime"
+                    format="YYYY-MM-DD hh:mm"
+                    value-format="YYYY-MM-DD hh:mm"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="申请说明" prop="applyDesc">
+                  <el-input v-model="form.applyDesc" type="textarea" disabled autosize />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </div>
+        <!-- </detail-block> -->
       </div>
       <detail-block title="设备领用列表">
         <el-table
diff --git a/src/views/device/receive/solve/solveList.vue b/src/views/device/receive/solve/solveList.vue
index ec1e8bb..93bee2c 100644
--- a/src/views/device/receive/solve/solveList.vue
+++ b/src/views/device/receive/solve/solveList.vue
@@ -138,8 +138,6 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // listQuery.value.startTime = timeRange.value[0] as string || ''
-  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiveApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IsolveListType) => {
       return {

diff --git a/.env.production b/.env.production
index 0fca4ad..ff5a80a 100644
--- a/.env.production
+++ b/.env.production
@@ -3,9 +3,9 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:21609
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-VITE_APP_API_BASEURL = http://192.168.2.96:8085
+# VITE_APP_API_BASEURL = http://192.168.2.96:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index f342066..9c4581f 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -196,7 +196,7 @@
 
       <el-table-column v-if="!isMulti" label="" width="60" align="center" fixed>
         <template #default="scope">
-          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+          <el-radio v-model="singleChecked" :disabled="scope.row.isRadioDisabled" :label="scope.row.id" class="radio" @change="radioChange" />
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index b2bfdba..f685105 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -462,7 +462,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column v-if="activeTitle === '已归还'" label="归还时间" width="160" align="center">
+          <el-table-column v-if="activeTitle === '已归还'" label="归还时间" width="180" align="center">
             <template #default="scope">
               {{ scope.row.backTime }}
             </template>
diff --git a/src/views/device/borrow/editHandle.vue b/src/views/device/borrow/editHandle.vue
index 0bd10c8..e3fe562 100644
--- a/src/views/device/borrow/editHandle.vue
+++ b/src/views/device/borrow/editHandle.vue
@@ -55,6 +55,7 @@
     form.value.applyPerson = res.data.applyPerson// 申请人
     form.value.time = res.data.time // 借用时间
     form.value.applyDesc = res.data.applyDesc // 申请说明
+    form.value.backTime = res.data.backTime // 归还时间
     list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
       return {
         ...item,
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index 0ada9c2..a884fd8 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -19,6 +19,7 @@
   remark: string // 备注
   updateTime: null | string // 更新时间
   approvalStatusName?: string // 审批状态名称
+  decisionItem?: string | number
 }
 // 标准配套设备表头类型
 export interface columnsType {
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 7f02a38..ba6cc7d 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -254,7 +254,13 @@
 }
 // 跳转到详情
 const goDetail = (row: IlistApproval, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`)
+  $router.push({
+    path: `/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`,
+    query: {
+      decisionItem: `${row.decisionItem}`, // 同意、驳回、拒绝
+      taskId: row.taskId,
+    },
+  })
 }
 // 获取到组织信息
 const getDept = () => {
@@ -275,7 +281,7 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    submitEquipmentApply({ id: row.id, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
+    submitEquipmentApply({ id: row.id, formId: SCHEDULE.DEVICE_FIX_APPROVAL, processId: row.processId }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -488,20 +494,8 @@
               >
                 取消
               </el-button>
-              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <!-- <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                @click="clickBtn(row, '删除')"
-              >
-                删除
-              </el-button> -->
-              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
               <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
index 35cbba2..5584541 100644
--- a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -1,10 +1,12 @@
 <!-- 设备检修列表新增、编辑、详情 -->
 <script lang="ts" setup name="maintenanceDetail">
 import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox, rowContextKey } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
+import { Row } from 'element-plus/es/components/table-v2/src/components'
 import type { IlistPageAddTypes, columnsType, returnRowType } from '../checkList_interface'
+import selectDeviceDialog from './selectDevice.vue'
 import { addEquipmentApply, equipmentApplyInfo, failUpdateEquipmentApply, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
@@ -13,17 +15,19 @@
 import type { userType } from '@/views/system/user/user-interface'
 import { cancelApproval, fetchApproval } from '@/api/approval'
 import { SCHEDULE } from '@/utils/scheduleDict'
-import addRow from '@/views/device/stateManage/components/selectDevice.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
 import useUserStore from '@/store/modules/user'
-
+const approvalDialog = ref() // 审批对话ref
 const user = useUserStore() // 用户信息
 const approvalRecord = ref() // 审批流程组件ref
 const infoId = ref('') // id
 const from = ref('') // reject代表未通过-驳回
 const buttonArray = ref<string[]>([])
 const pageType = ref('add') // 页面类型: add,edit, detail
+const decisionItem = ref('') // 同意、驳回、拒绝按钮权限
+const approvalStatusName = ref('') // 审批状态名称
+const taskId = ref('') // 任务id，用于同意、驳回、拒绝审批
 const textMap: { [key: string]: string } = {
   add: '新建',
   edit: '编辑',
@@ -167,44 +171,7 @@
 
 // 表格选中的数组
 const SelectionList = ref<object[]>([])
-// 取消
-const handleCancel = () => {
-  const params = {
-    processInstanceId: formInline.value.processId!,
-    comments: '取消审批',
-  }
-  ElMessageBox.confirm(
-    '确认取消该审批吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  ).then(() => {
-    cancelApproval(params).then(() => {
-      ElMessage.success('取消成功')
-    })
-  })
-}
-const approvalDialog = ref()
-// 点击数据后的操作按钮
-const clickBtn = (buttonType: string) => {
-  switch (buttonType) {
-    case '同意':
-      approvalDialog.value.initDialog('agree', formInline.value.taskId)
-      break
-    case '驳回':
-      approvalDialog.value.initDialog('reject', formInline.value.taskId)
-      break
-    case '拒绝':
-      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
-      break
-    case '取消':
-      handleCancel()
-      break
-  }
-}
+
 // 获取详情信息
 const getInfo = () => {
   equipmentApplyInfo({ id: infoId.value }).then((res) => {
@@ -302,10 +269,15 @@
   }
 }
 
-const addRowRef = ref()
+// ----------------------------------------------表格---------------------------------------
+const dialogSelectDiviceVisible = ref(false)
 // 点击批量增加
 const batchIncrease = () => {
-  addRowRef.value.initDialog({ title: '' })
+  dialogSelectDiviceVisible.value = true
+}
+// 选择设备对话框关闭
+const closeDialog = () => {
+  dialogSelectDiviceVisible.value = false
 }
 
 // 删除行
@@ -341,6 +313,8 @@
   })
 }
 
+// ----------------------------------------------------------------------------------
+
 // 选好申请人 userId用户id
 const changeSelectReceiver = (userId: string) => {
   // 在用户列表里找到选择的接收人的名字
@@ -362,18 +336,6 @@
     usePersonOptions.value = usePersonList.value
   }
 }
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
 // 获取部门列表
 const fetchDeptTreeList = () => {
   getDeptTreeList().then((res) => {
@@ -388,6 +350,7 @@
     usePersonOptions.value = res.data.rows
   })
 }
+// -------------------------------------------审批----------------------------------------
 const approvalRecordData = ref([]) // 审批流程数据
 // 查询审批记录
 function getApprovalRecord(processId: string) {
@@ -404,8 +367,45 @@
 }
 // 审批结束回调
 const approvalSuccess = () => {
-  getInfo()
+  close()
 }
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: formInline.value.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', taskId.value)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', taskId.value)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', taskId.value)
+  }
+}
+// ---------------------------------------------------------------------------------------
 onMounted(async () => {
   formInline.value.applyName = '设备检修申请' // 申请名称固定
   formInline.value.applyUnit = user.deptId // 申请单位
@@ -416,6 +416,11 @@
   await fetchUserList()
   await fetchDeptTreeList()
   formInline.value.processId = $route.params.processId as string // 任务id
+  decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
+  taskId.value = $route.query.taskId as string // 流程实例id
+  approvalStatusName.value = $route.params.approvalStatusName as string // 审批状态名称
+  console.log(approvalStatusName.value)
+
   formInline.value.approvalStatusName = $route.params.approvalStatusName as string // 任务id
   if (formInline.value.approvalStatusName !== '草稿箱') {
     getApprovalRecord(formInline.value.processId) // 查询审批记录
@@ -427,6 +432,18 @@
   <app-container>
     <detail-page :title="`${$route.meta.title}-${textMap[pageType]}`">
       <template #btns>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批' && decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批' && decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
         <el-button v-if="pageType === 'add'" type="primary" @click="submit">
           提交
         </el-button>
@@ -555,7 +572,7 @@
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection" width="55" />
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="55" />
         <el-table-column align="center" label="序号" width="60" type="index" />
         <el-table-column
           v-for="(item, index) in columns"
@@ -576,9 +593,14 @@
       <!-- 审批流程 -->
       <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
     </detail-block>
+    <!-- 审批弹窗 -->
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-    <!-- 借用设备列表 -->
-    <add-row ref="addRowRef" @add="confirmSelectDevice" />
+    <select-device-dialog
+      :dialog-select-divice-visible="dialogSelectDiviceVisible"
+      :is-multi="true"
+      @close-dialog="closeDialog"
+      @updateDeviceConfirm="confirmSelectDevice"
+    />
   </app-container>
 </template>
 
diff --git a/src/views/device/deviceMaintenance/components/selectDevice.vue b/src/views/device/deviceMaintenance/components/selectDevice.vue
new file mode 100644
index 0000000..3c04be6
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/selectDevice.vue
@@ -0,0 +1,216 @@
+<!-- 选择设备对话框 -->
+<script lang="ts" setup name="ReceiveDialog">
+import { ref } from 'vue'
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import type { IdeviceList } from '@/views/device/stateManage/components/status-interface'
+import useUserStore from '@/store/modules/user'
+import { listPageApi } from '@/api/device/standingBook'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { selectType } from '@/views/device/standingBook/standingBook-interface'
+import { getStatusList } from '@/api/device/stateManage'
+import { SCHEDULE } from '@/utils/scheduleDict'
+const props = defineProps({
+  dialogSelectDiviceVisible: {
+    type: Boolean,
+    default: false,
+  },
+  isMulti: Boolean, // 是否多选
+  statusTypeName: { // 状态管理类型
+    type: String,
+    default: '',
+  },
+})
+// 提醒文字
+const emits = defineEmits(['closeDialog', 'updateDeviceConfirm'])
+const defineMessageTest = ref('闲置、封存、在用(启封)') // 提醒文字
+const loadingTable = ref<boolean>(false)
+const userStore = useUserStore()
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  managerState: '1', // 管理状态 // 默认在用(启封)
+  offset: 1,
+  limit: 20,
+})
+const total = ref(20)
+// 多选选中的内容
+const checkoutList = ref([]) as any
+const list = ref([])// 表格数据
+const columns = ref<TableColumn[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center', fixed: true },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', fixed: true, width: '160' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '管理状态', value: 'managerStateName', align: 'center', width: '120' },
+  { text: '使用人', value: 'usePersonName', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center', width: '120' },
+])
+const table = ref()
+const dialogTableVisible = ref(false)// 控制对话框显隐
+// 获取数据
+const managerStateList = ref<selectType[]>([])
+const getDict = () => {
+  // 获取管理状态
+  getDictByCode('managerState').then((response) => {
+    managerStateList.value = response.data.map((item: { name: string; isSelectItemDisabled: boolean }) => {
+      if (item.name === '报废' || item.name === '处置') {
+        item.isSelectItemDisabled = true
+      }
+      return item
+    })
+  })
+}
+getDict()
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listQuery.value.limit = props.isMulti ? 20 : 5
+  listPageApi(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: IdeviceList) => {
+      return {
+        ...item,
+        validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+      }
+    })
+    total.value = res.data.total
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+watch(() => props.dialogSelectDiviceVisible, (newValue) => {
+  dialogTableVisible.value = newValue
+  fetchData()
+  if (!newValue) {
+    table.value.clearMulti() // 清除多选选中
+  }
+})
+
+// 关闭对话框
+const close = () => {
+  emits('closeDialog')
+}
+// 确认
+const confirm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return
+  }
+  emits('updateDeviceConfirm', checkoutList.value)
+  close()
+}
+// 重置
+const clearList = () => {
+  listQuery.value.equipmentName = ''
+  listQuery.value.equipmentNo = ''
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData()
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  console.log('多选', val)
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogTableVisible" width="65%" title="选择设备" class="select-device-dialog" @close="close">
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentName"
+          placeholder="设备名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentNo"
+          placeholder="设备编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.managerState" class="m-2" placeholder="管理状态" clearable>
+          <el-option
+            v-for="item in managerStateList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+            :disabled="item.isSelectItemDisabled"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+    <div style="padding: 12px;">
+      <normal-table
+        ref="table"
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :is-multi="isMulti"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :page-sizes="isMulti ? [20] : [5]"
+        :height="260"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <div style="font-size: 14px;">
+      <span style="color: #f56c6c;">*注意：只能查询管理状态为 <span style="color: #3d7eff;">{{ defineMessageTest }}</span> 的设备</span>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="close">取消</el-button>
+        <el-button type="primary" @click="confirm">
+          确定
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.receive-dialog {
+  .receive-dialog-item {
+    display: flex;
+    align-items: center;
+    margin-bottom: 28px;
+
+    .text {
+      margin-right: 30px;
+      white-space: nowrap;
+    }
+  }
+}
+</style>
diff --git a/src/views/device/receive/apply/applyEdit.vue b/src/views/device/receive/apply/applyEdit.vue
index 13e9528..8b50fc0 100644
--- a/src/views/device/receive/apply/applyEdit.vue
+++ b/src/views/device/receive/apply/applyEdit.vue
@@ -10,6 +10,7 @@
 import SelectDeviceDialog from '../selectDeviceDialog.vue'
 import { toTreeList } from '@/utils/structure'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import {
   failUpdateEquipmentApply,
@@ -22,9 +23,9 @@
 import type { deptType } from '@/views/device/standingBook/standingBook-interface'
 import { getDeptTreeList } from '@/api/system/dept'
 import { getUserList } from '@/api/system/user'
-import { fetchApproval, submitApproval } from '@/api/approval'
 import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
 import useUserStore from '@/store/modules/user'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 
 const user = useUserStore() // 用户信息
 const $route = useRoute()
@@ -39,6 +40,8 @@
 const isMulti = ref(false) // 是否批量添加(允许多选)
 const selectIndex = ref() // 点击选择的index--点击第几行
 const dialogSelectDiviceVisible = ref(false) // 控制选择设备对话框显隐
+const decisionItem = ref('') // 同意、驳回、拒绝按钮权限
+const taskId = ref('') // 任务id，用于同意、驳回、拒绝审批
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
@@ -88,42 +91,6 @@
   $router.back()
 }
 
-const handleClick = (val: string) => {
-  if (val === 'agree') { // 同意
-    approvalDialog.value.initDialog('agree', form.value.taskId)
-  }
-  else if (val === 'reject') { // 驳回
-    approvalDialog.value.initDialog('reject', form.value.taskId)
-  }
-  else if (val === 'refuse') { // 拒绝
-    approvalDialog.value.initDialog('refuse', form.value.taskId)
-  }
-  else if (val === 'revoke') {
-    const params = {
-      taskId: form.value.taskId!,
-      comments: '',
-    }
-    ElMessageBox.confirm(
-      '确认撤回该审批吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        submitApproval('revoke', params).then((res) => {
-          ElMessage({
-            type: 'success',
-            message: '已撤回',
-          })
-        })
-        close()
-      })
-  }
-}
-
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
@@ -314,11 +281,6 @@
   })
 }
 
-// 审批结束回调
-const approvalSuccess = () => {
-  close()
-}
-
 // 编辑、详情--获取详细信息
 const fetchReceiveApplyListDetail = () => {
   getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
@@ -355,6 +317,7 @@
   }
 }
 
+// ---------------------------------------------审批--------------------------------------
 const approvalRecordData = ref([]) // 审批流程数据
 // 查询审批记录
 function getApprovalRecord(processId: string) {
@@ -369,6 +332,47 @@
     }
   }
 }
+// 审批结束回调
+const approvalSuccess = () => {
+  close()
+}
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: form.value.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', taskId.value)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', taskId.value)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', taskId.value)
+  }
+}
+// --------------------------------------------------------------------------------------
 
 onMounted(() => {
   typeValue.value = $route.query.typeValue // 类型add、edit、detail
@@ -376,6 +380,8 @@
   form.value.taskId = $route.query.taskId as string // 任务id
   form.value.processId = $route.query.processId as string // 任务id
   approvalStatus.value = $route.query.approvalStatus // 审批类型
+  decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
+  taskId.value = $route.query.taskId as string // 流程实例id
   approvalStatusName.value = $route.query.approvalStatusName // 审批类型名称
   form.value.applyName = '设备领用申请' // 申请名称固定
   form.value.applyUnit = user.deptId // 申请单位
@@ -401,24 +407,24 @@
   <app-container>
     <detail-page :title="`设备领用申请-${textMap[typeValue]}`">
       <template #btns>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('agree')">
+        <el-button v-if="typeValue === 'detail' && approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
           同意
         </el-button>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('reject')">
+        <el-button v-if="typeValue === 'detail' && approvalStatusName === '待审批' && decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
           驳回
         </el-button>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('refuse')">
+        <el-button v-if="typeValue === 'detail' && approvalStatusName === '待审批' && decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
           拒绝
         </el-button>
+        <el-button v-if="typeValue === 'detail' && approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
         <el-button v-if="typeValue === 'add'" type="primary" @click="submit">
           提交
         </el-button>
         <el-button v-if="typeValue === 'add' || typeValue === 'edit'" type="primary" @click="save">
           保存
         </el-button>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '3'" type="primary" @click="handleClick('revoke')">
-          撤回
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
@@ -544,7 +550,7 @@
             align="center"
           >
             <template v-if="item.value === 'equipmentNo' && (typeValue === 'add' || typeValue === 'edit')" #default="scope">
-              <el-input v-model="scope.row.equipmentNo" placeholder="请选择设备" class="input">
+              <el-input v-model="scope.row.equipmentNo" disabled placeholder="请选择设备" class="input">
                 <template #append>
                   <el-button size="small" @click="handleSelect(scope.$index, scope.row)">
                     选择
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 50b014c..13e05df 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -169,42 +169,6 @@
   $router.push({ path: '/receive/add', query: { typeValue: 'add' } })
 }
 
-// 导出
-const exportAll = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: '下载中请稍后',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (list.value.length > 0) {
-    const params = {
-      applyNo: listQuery.value.applyNo, // 申请编号
-      applyName: listQuery.value.applyName, // 申请名称
-      applyUnit: listQuery.value.applyUnit, // 申请部门
-      applyPerson: listQuery.value.applyPerson, // 申请人
-      startTime: listQuery.value.startTime, // 申请开始日期
-      endTime: listQuery.value.endTime, // 申请结束日期
-      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
-      processResult: listQuery.value.processResult, // 	处置结果
-      applyType: listQuery.value.applyType, // 申请类型 领用0
-      createUser: listQuery.value.createUser, // 创建人
-      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
-      offset: 1,
-      limit: 20,
-      ids: checkoutList.value,
-    }
-    // 调导出接口
-    exportReceiveApplyList(params).then((res) => {
-      const blob = new Blob([res.data])
-      exportFile(blob, '设备领用申请列表.xlsx')
-    })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
-}
-
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -450,7 +414,6 @@
     <table-container>
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/device/receive/applyList/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/device/receive/applyList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
diff --git a/src/views/device/receive/solve/solveDetail.vue b/src/views/device/receive/solve/solveDetail.vue
index e0fc823..927ac8b 100644
--- a/src/views/device/receive/solve/solveDetail.vue
+++ b/src/views/device/receive/solve/solveDetail.vue
@@ -134,55 +134,55 @@
     </detail-page>
     <div id="lysq" class="lysq-create-check">
       <div class="top-info">
-        <detail-block title="领用申请">
-          <div class="form-area">
-            <el-form
-              ref="ruleFormRef"
-              :model="form"
-              label-width="120px"
-            >
-              <el-row :gutter="24">
-                <el-col :span="6">
-                  <el-form-item label="申请名称" prop="applyName">
-                    <el-input v-model="form.applyName" disabled />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="申请单位" prop="applyUnit">
-                    <dept-select
-                      v-model="form.applyUnit"
-                      :data="useDeptList"
-                      disabled
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="申请人" prop="applyPerson">
-                    <el-select v-model="form.applyPerson" disabled style="width: 100%;">
-                      <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="领用时间" prop="time">
-                    <el-date-picker
-                      v-model="form.time"
-                      type="datetime"
-                      format="YYYY-MM-DD hh:mm"
-                      value-format="YYYY-MM-DD hh:mm"
-                      disabled
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="申请说明" prop="applyDesc">
-                    <el-input v-model="form.applyDesc" type="textarea" disabled autosize />
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </el-form>
-          </div>
-        </detail-block>
+        <!-- <detail-block title="领用申请"> -->
+        <div class="form-area">
+          <el-form
+            ref="ruleFormRef"
+            :model="form"
+            label-width="120px"
+          >
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="申请名称" prop="applyName">
+                  <el-input v-model="form.applyName" disabled />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="申请单位" prop="applyUnit">
+                  <dept-select
+                    v-model="form.applyUnit"
+                    :data="useDeptList"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="申请人" prop="applyPerson">
+                  <el-select v-model="form.applyPerson" disabled style="width: 100%;">
+                    <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="领用时间" prop="time">
+                  <el-date-picker
+                    v-model="form.time"
+                    type="datetime"
+                    format="YYYY-MM-DD hh:mm"
+                    value-format="YYYY-MM-DD hh:mm"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="申请说明" prop="applyDesc">
+                  <el-input v-model="form.applyDesc" type="textarea" disabled autosize />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </div>
+        <!-- </detail-block> -->
       </div>
       <detail-block title="设备领用列表">
         <el-table
diff --git a/src/views/device/receive/solve/solveList.vue b/src/views/device/receive/solve/solveList.vue
index ec1e8bb..93bee2c 100644
--- a/src/views/device/receive/solve/solveList.vue
+++ b/src/views/device/receive/solve/solveList.vue
@@ -138,8 +138,6 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // listQuery.value.startTime = timeRange.value[0] as string || ''
-  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiveApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IsolveListType) => {
       return {
diff --git a/src/views/device/standingBook/standingBook-interface.ts b/src/views/device/standingBook/standingBook-interface.ts
index e3cf134..4d239dd 100644
--- a/src/views/device/standingBook/standingBook-interface.ts
+++ b/src/views/device/standingBook/standingBook-interface.ts
@@ -28,6 +28,7 @@
   name: string
   id: string
   value: string
+  isSelectItemDisabled?: boolean // 选择项目禁用
 }
 // 部门类型
 export interface deptType {

diff --git a/.env.production b/.env.production
index 0fca4ad..ff5a80a 100644
--- a/.env.production
+++ b/.env.production
@@ -3,9 +3,9 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:21609
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-VITE_APP_API_BASEURL = http://192.168.2.96:8085
+# VITE_APP_API_BASEURL = http://192.168.2.96:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index f342066..9c4581f 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -196,7 +196,7 @@
 
       <el-table-column v-if="!isMulti" label="" width="60" align="center" fixed>
         <template #default="scope">
-          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+          <el-radio v-model="singleChecked" :disabled="scope.row.isRadioDisabled" :label="scope.row.id" class="radio" @change="radioChange" />
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index b2bfdba..f685105 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -462,7 +462,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column v-if="activeTitle === '已归还'" label="归还时间" width="160" align="center">
+          <el-table-column v-if="activeTitle === '已归还'" label="归还时间" width="180" align="center">
             <template #default="scope">
               {{ scope.row.backTime }}
             </template>
diff --git a/src/views/device/borrow/editHandle.vue b/src/views/device/borrow/editHandle.vue
index 0bd10c8..e3fe562 100644
--- a/src/views/device/borrow/editHandle.vue
+++ b/src/views/device/borrow/editHandle.vue
@@ -55,6 +55,7 @@
     form.value.applyPerson = res.data.applyPerson// 申请人
     form.value.time = res.data.time // 借用时间
     form.value.applyDesc = res.data.applyDesc // 申请说明
+    form.value.backTime = res.data.backTime // 归还时间
     list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
       return {
         ...item,
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index 0ada9c2..a884fd8 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -19,6 +19,7 @@
   remark: string // 备注
   updateTime: null | string // 更新时间
   approvalStatusName?: string // 审批状态名称
+  decisionItem?: string | number
 }
 // 标准配套设备表头类型
 export interface columnsType {
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 7f02a38..ba6cc7d 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -254,7 +254,13 @@
 }
 // 跳转到详情
 const goDetail = (row: IlistApproval, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`)
+  $router.push({
+    path: `/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`,
+    query: {
+      decisionItem: `${row.decisionItem}`, // 同意、驳回、拒绝
+      taskId: row.taskId,
+    },
+  })
 }
 // 获取到组织信息
 const getDept = () => {
@@ -275,7 +281,7 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    submitEquipmentApply({ id: row.id, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
+    submitEquipmentApply({ id: row.id, formId: SCHEDULE.DEVICE_FIX_APPROVAL, processId: row.processId }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -488,20 +494,8 @@
               >
                 取消
               </el-button>
-              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <!-- <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                @click="clickBtn(row, '删除')"
-              >
-                删除
-              </el-button> -->
-              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
               <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
index 35cbba2..5584541 100644
--- a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -1,10 +1,12 @@
 <!-- 设备检修列表新增、编辑、详情 -->
 <script lang="ts" setup name="maintenanceDetail">
 import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox, rowContextKey } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
+import { Row } from 'element-plus/es/components/table-v2/src/components'
 import type { IlistPageAddTypes, columnsType, returnRowType } from '../checkList_interface'
+import selectDeviceDialog from './selectDevice.vue'
 import { addEquipmentApply, equipmentApplyInfo, failUpdateEquipmentApply, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
@@ -13,17 +15,19 @@
 import type { userType } from '@/views/system/user/user-interface'
 import { cancelApproval, fetchApproval } from '@/api/approval'
 import { SCHEDULE } from '@/utils/scheduleDict'
-import addRow from '@/views/device/stateManage/components/selectDevice.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
 import useUserStore from '@/store/modules/user'
-
+const approvalDialog = ref() // 审批对话ref
 const user = useUserStore() // 用户信息
 const approvalRecord = ref() // 审批流程组件ref
 const infoId = ref('') // id
 const from = ref('') // reject代表未通过-驳回
 const buttonArray = ref<string[]>([])
 const pageType = ref('add') // 页面类型: add,edit, detail
+const decisionItem = ref('') // 同意、驳回、拒绝按钮权限
+const approvalStatusName = ref('') // 审批状态名称
+const taskId = ref('') // 任务id，用于同意、驳回、拒绝审批
 const textMap: { [key: string]: string } = {
   add: '新建',
   edit: '编辑',
@@ -167,44 +171,7 @@
 
 // 表格选中的数组
 const SelectionList = ref<object[]>([])
-// 取消
-const handleCancel = () => {
-  const params = {
-    processInstanceId: formInline.value.processId!,
-    comments: '取消审批',
-  }
-  ElMessageBox.confirm(
-    '确认取消该审批吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  ).then(() => {
-    cancelApproval(params).then(() => {
-      ElMessage.success('取消成功')
-    })
-  })
-}
-const approvalDialog = ref()
-// 点击数据后的操作按钮
-const clickBtn = (buttonType: string) => {
-  switch (buttonType) {
-    case '同意':
-      approvalDialog.value.initDialog('agree', formInline.value.taskId)
-      break
-    case '驳回':
-      approvalDialog.value.initDialog('reject', formInline.value.taskId)
-      break
-    case '拒绝':
-      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
-      break
-    case '取消':
-      handleCancel()
-      break
-  }
-}
+
 // 获取详情信息
 const getInfo = () => {
   equipmentApplyInfo({ id: infoId.value }).then((res) => {
@@ -302,10 +269,15 @@
   }
 }
 
-const addRowRef = ref()
+// ----------------------------------------------表格---------------------------------------
+const dialogSelectDiviceVisible = ref(false)
 // 点击批量增加
 const batchIncrease = () => {
-  addRowRef.value.initDialog({ title: '' })
+  dialogSelectDiviceVisible.value = true
+}
+// 选择设备对话框关闭
+const closeDialog = () => {
+  dialogSelectDiviceVisible.value = false
 }
 
 // 删除行
@@ -341,6 +313,8 @@
   })
 }
 
+// ----------------------------------------------------------------------------------
+
 // 选好申请人 userId用户id
 const changeSelectReceiver = (userId: string) => {
   // 在用户列表里找到选择的接收人的名字
@@ -362,18 +336,6 @@
     usePersonOptions.value = usePersonList.value
   }
 }
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
 // 获取部门列表
 const fetchDeptTreeList = () => {
   getDeptTreeList().then((res) => {
@@ -388,6 +350,7 @@
     usePersonOptions.value = res.data.rows
   })
 }
+// -------------------------------------------审批----------------------------------------
 const approvalRecordData = ref([]) // 审批流程数据
 // 查询审批记录
 function getApprovalRecord(processId: string) {
@@ -404,8 +367,45 @@
 }
 // 审批结束回调
 const approvalSuccess = () => {
-  getInfo()
+  close()
 }
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: formInline.value.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', taskId.value)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', taskId.value)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', taskId.value)
+  }
+}
+// ---------------------------------------------------------------------------------------
 onMounted(async () => {
   formInline.value.applyName = '设备检修申请' // 申请名称固定
   formInline.value.applyUnit = user.deptId // 申请单位
@@ -416,6 +416,11 @@
   await fetchUserList()
   await fetchDeptTreeList()
   formInline.value.processId = $route.params.processId as string // 任务id
+  decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
+  taskId.value = $route.query.taskId as string // 流程实例id
+  approvalStatusName.value = $route.params.approvalStatusName as string // 审批状态名称
+  console.log(approvalStatusName.value)
+
   formInline.value.approvalStatusName = $route.params.approvalStatusName as string // 任务id
   if (formInline.value.approvalStatusName !== '草稿箱') {
     getApprovalRecord(formInline.value.processId) // 查询审批记录
@@ -427,6 +432,18 @@
   <app-container>
     <detail-page :title="`${$route.meta.title}-${textMap[pageType]}`">
       <template #btns>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批' && decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批' && decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
         <el-button v-if="pageType === 'add'" type="primary" @click="submit">
           提交
         </el-button>
@@ -555,7 +572,7 @@
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection" width="55" />
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="55" />
         <el-table-column align="center" label="序号" width="60" type="index" />
         <el-table-column
           v-for="(item, index) in columns"
@@ -576,9 +593,14 @@
       <!-- 审批流程 -->
       <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
     </detail-block>
+    <!-- 审批弹窗 -->
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-    <!-- 借用设备列表 -->
-    <add-row ref="addRowRef" @add="confirmSelectDevice" />
+    <select-device-dialog
+      :dialog-select-divice-visible="dialogSelectDiviceVisible"
+      :is-multi="true"
+      @close-dialog="closeDialog"
+      @updateDeviceConfirm="confirmSelectDevice"
+    />
   </app-container>
 </template>
 
diff --git a/src/views/device/deviceMaintenance/components/selectDevice.vue b/src/views/device/deviceMaintenance/components/selectDevice.vue
new file mode 100644
index 0000000..3c04be6
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/selectDevice.vue
@@ -0,0 +1,216 @@
+<!-- 选择设备对话框 -->
+<script lang="ts" setup name="ReceiveDialog">
+import { ref } from 'vue'
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import type { IdeviceList } from '@/views/device/stateManage/components/status-interface'
+import useUserStore from '@/store/modules/user'
+import { listPageApi } from '@/api/device/standingBook'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { selectType } from '@/views/device/standingBook/standingBook-interface'
+import { getStatusList } from '@/api/device/stateManage'
+import { SCHEDULE } from '@/utils/scheduleDict'
+const props = defineProps({
+  dialogSelectDiviceVisible: {
+    type: Boolean,
+    default: false,
+  },
+  isMulti: Boolean, // 是否多选
+  statusTypeName: { // 状态管理类型
+    type: String,
+    default: '',
+  },
+})
+// 提醒文字
+const emits = defineEmits(['closeDialog', 'updateDeviceConfirm'])
+const defineMessageTest = ref('闲置、封存、在用(启封)') // 提醒文字
+const loadingTable = ref<boolean>(false)
+const userStore = useUserStore()
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  managerState: '1', // 管理状态 // 默认在用(启封)
+  offset: 1,
+  limit: 20,
+})
+const total = ref(20)
+// 多选选中的内容
+const checkoutList = ref([]) as any
+const list = ref([])// 表格数据
+const columns = ref<TableColumn[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center', fixed: true },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', fixed: true, width: '160' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '管理状态', value: 'managerStateName', align: 'center', width: '120' },
+  { text: '使用人', value: 'usePersonName', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center', width: '120' },
+])
+const table = ref()
+const dialogTableVisible = ref(false)// 控制对话框显隐
+// 获取数据
+const managerStateList = ref<selectType[]>([])
+const getDict = () => {
+  // 获取管理状态
+  getDictByCode('managerState').then((response) => {
+    managerStateList.value = response.data.map((item: { name: string; isSelectItemDisabled: boolean }) => {
+      if (item.name === '报废' || item.name === '处置') {
+        item.isSelectItemDisabled = true
+      }
+      return item
+    })
+  })
+}
+getDict()
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listQuery.value.limit = props.isMulti ? 20 : 5
+  listPageApi(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: IdeviceList) => {
+      return {
+        ...item,
+        validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+      }
+    })
+    total.value = res.data.total
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+watch(() => props.dialogSelectDiviceVisible, (newValue) => {
+  dialogTableVisible.value = newValue
+  fetchData()
+  if (!newValue) {
+    table.value.clearMulti() // 清除多选选中
+  }
+})
+
+// 关闭对话框
+const close = () => {
+  emits('closeDialog')
+}
+// 确认
+const confirm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return
+  }
+  emits('updateDeviceConfirm', checkoutList.value)
+  close()
+}
+// 重置
+const clearList = () => {
+  listQuery.value.equipmentName = ''
+  listQuery.value.equipmentNo = ''
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData()
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  console.log('多选', val)
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogTableVisible" width="65%" title="选择设备" class="select-device-dialog" @close="close">
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentName"
+          placeholder="设备名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentNo"
+          placeholder="设备编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.managerState" class="m-2" placeholder="管理状态" clearable>
+          <el-option
+            v-for="item in managerStateList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+            :disabled="item.isSelectItemDisabled"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+    <div style="padding: 12px;">
+      <normal-table
+        ref="table"
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :is-multi="isMulti"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :page-sizes="isMulti ? [20] : [5]"
+        :height="260"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <div style="font-size: 14px;">
+      <span style="color: #f56c6c;">*注意：只能查询管理状态为 <span style="color: #3d7eff;">{{ defineMessageTest }}</span> 的设备</span>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="close">取消</el-button>
+        <el-button type="primary" @click="confirm">
+          确定
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.receive-dialog {
+  .receive-dialog-item {
+    display: flex;
+    align-items: center;
+    margin-bottom: 28px;
+
+    .text {
+      margin-right: 30px;
+      white-space: nowrap;
+    }
+  }
+}
+</style>
diff --git a/src/views/device/receive/apply/applyEdit.vue b/src/views/device/receive/apply/applyEdit.vue
index 13e9528..8b50fc0 100644
--- a/src/views/device/receive/apply/applyEdit.vue
+++ b/src/views/device/receive/apply/applyEdit.vue
@@ -10,6 +10,7 @@
 import SelectDeviceDialog from '../selectDeviceDialog.vue'
 import { toTreeList } from '@/utils/structure'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import {
   failUpdateEquipmentApply,
@@ -22,9 +23,9 @@
 import type { deptType } from '@/views/device/standingBook/standingBook-interface'
 import { getDeptTreeList } from '@/api/system/dept'
 import { getUserList } from '@/api/system/user'
-import { fetchApproval, submitApproval } from '@/api/approval'
 import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
 import useUserStore from '@/store/modules/user'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 
 const user = useUserStore() // 用户信息
 const $route = useRoute()
@@ -39,6 +40,8 @@
 const isMulti = ref(false) // 是否批量添加(允许多选)
 const selectIndex = ref() // 点击选择的index--点击第几行
 const dialogSelectDiviceVisible = ref(false) // 控制选择设备对话框显隐
+const decisionItem = ref('') // 同意、驳回、拒绝按钮权限
+const taskId = ref('') // 任务id，用于同意、驳回、拒绝审批
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
@@ -88,42 +91,6 @@
   $router.back()
 }
 
-const handleClick = (val: string) => {
-  if (val === 'agree') { // 同意
-    approvalDialog.value.initDialog('agree', form.value.taskId)
-  }
-  else if (val === 'reject') { // 驳回
-    approvalDialog.value.initDialog('reject', form.value.taskId)
-  }
-  else if (val === 'refuse') { // 拒绝
-    approvalDialog.value.initDialog('refuse', form.value.taskId)
-  }
-  else if (val === 'revoke') {
-    const params = {
-      taskId: form.value.taskId!,
-      comments: '',
-    }
-    ElMessageBox.confirm(
-      '确认撤回该审批吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        submitApproval('revoke', params).then((res) => {
-          ElMessage({
-            type: 'success',
-            message: '已撤回',
-          })
-        })
-        close()
-      })
-  }
-}
-
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
@@ -314,11 +281,6 @@
   })
 }
 
-// 审批结束回调
-const approvalSuccess = () => {
-  close()
-}
-
 // 编辑、详情--获取详细信息
 const fetchReceiveApplyListDetail = () => {
   getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
@@ -355,6 +317,7 @@
   }
 }
 
+// ---------------------------------------------审批--------------------------------------
 const approvalRecordData = ref([]) // 审批流程数据
 // 查询审批记录
 function getApprovalRecord(processId: string) {
@@ -369,6 +332,47 @@
     }
   }
 }
+// 审批结束回调
+const approvalSuccess = () => {
+  close()
+}
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: form.value.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', taskId.value)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', taskId.value)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', taskId.value)
+  }
+}
+// --------------------------------------------------------------------------------------
 
 onMounted(() => {
   typeValue.value = $route.query.typeValue // 类型add、edit、detail
@@ -376,6 +380,8 @@
   form.value.taskId = $route.query.taskId as string // 任务id
   form.value.processId = $route.query.processId as string // 任务id
   approvalStatus.value = $route.query.approvalStatus // 审批类型
+  decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
+  taskId.value = $route.query.taskId as string // 流程实例id
   approvalStatusName.value = $route.query.approvalStatusName // 审批类型名称
   form.value.applyName = '设备领用申请' // 申请名称固定
   form.value.applyUnit = user.deptId // 申请单位
@@ -401,24 +407,24 @@
   <app-container>
     <detail-page :title="`设备领用申请-${textMap[typeValue]}`">
       <template #btns>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('agree')">
+        <el-button v-if="typeValue === 'detail' && approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
           同意
         </el-button>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('reject')">
+        <el-button v-if="typeValue === 'detail' && approvalStatusName === '待审批' && decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
           驳回
         </el-button>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('refuse')">
+        <el-button v-if="typeValue === 'detail' && approvalStatusName === '待审批' && decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
           拒绝
         </el-button>
+        <el-button v-if="typeValue === 'detail' && approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
         <el-button v-if="typeValue === 'add'" type="primary" @click="submit">
           提交
         </el-button>
         <el-button v-if="typeValue === 'add' || typeValue === 'edit'" type="primary" @click="save">
           保存
         </el-button>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '3'" type="primary" @click="handleClick('revoke')">
-          撤回
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
@@ -544,7 +550,7 @@
             align="center"
           >
             <template v-if="item.value === 'equipmentNo' && (typeValue === 'add' || typeValue === 'edit')" #default="scope">
-              <el-input v-model="scope.row.equipmentNo" placeholder="请选择设备" class="input">
+              <el-input v-model="scope.row.equipmentNo" disabled placeholder="请选择设备" class="input">
                 <template #append>
                   <el-button size="small" @click="handleSelect(scope.$index, scope.row)">
                     选择
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 50b014c..13e05df 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -169,42 +169,6 @@
   $router.push({ path: '/receive/add', query: { typeValue: 'add' } })
 }
 
-// 导出
-const exportAll = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: '下载中请稍后',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (list.value.length > 0) {
-    const params = {
-      applyNo: listQuery.value.applyNo, // 申请编号
-      applyName: listQuery.value.applyName, // 申请名称
-      applyUnit: listQuery.value.applyUnit, // 申请部门
-      applyPerson: listQuery.value.applyPerson, // 申请人
-      startTime: listQuery.value.startTime, // 申请开始日期
-      endTime: listQuery.value.endTime, // 申请结束日期
-      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
-      processResult: listQuery.value.processResult, // 	处置结果
-      applyType: listQuery.value.applyType, // 申请类型 领用0
-      createUser: listQuery.value.createUser, // 创建人
-      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
-      offset: 1,
-      limit: 20,
-      ids: checkoutList.value,
-    }
-    // 调导出接口
-    exportReceiveApplyList(params).then((res) => {
-      const blob = new Blob([res.data])
-      exportFile(blob, '设备领用申请列表.xlsx')
-    })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
-}
-
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -450,7 +414,6 @@
     <table-container>
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/device/receive/applyList/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/device/receive/applyList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
diff --git a/src/views/device/receive/solve/solveDetail.vue b/src/views/device/receive/solve/solveDetail.vue
index e0fc823..927ac8b 100644
--- a/src/views/device/receive/solve/solveDetail.vue
+++ b/src/views/device/receive/solve/solveDetail.vue
@@ -134,55 +134,55 @@
     </detail-page>
     <div id="lysq" class="lysq-create-check">
       <div class="top-info">
-        <detail-block title="领用申请">
-          <div class="form-area">
-            <el-form
-              ref="ruleFormRef"
-              :model="form"
-              label-width="120px"
-            >
-              <el-row :gutter="24">
-                <el-col :span="6">
-                  <el-form-item label="申请名称" prop="applyName">
-                    <el-input v-model="form.applyName" disabled />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="申请单位" prop="applyUnit">
-                    <dept-select
-                      v-model="form.applyUnit"
-                      :data="useDeptList"
-                      disabled
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="申请人" prop="applyPerson">
-                    <el-select v-model="form.applyPerson" disabled style="width: 100%;">
-                      <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="领用时间" prop="time">
-                    <el-date-picker
-                      v-model="form.time"
-                      type="datetime"
-                      format="YYYY-MM-DD hh:mm"
-                      value-format="YYYY-MM-DD hh:mm"
-                      disabled
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="申请说明" prop="applyDesc">
-                    <el-input v-model="form.applyDesc" type="textarea" disabled autosize />
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </el-form>
-          </div>
-        </detail-block>
+        <!-- <detail-block title="领用申请"> -->
+        <div class="form-area">
+          <el-form
+            ref="ruleFormRef"
+            :model="form"
+            label-width="120px"
+          >
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="申请名称" prop="applyName">
+                  <el-input v-model="form.applyName" disabled />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="申请单位" prop="applyUnit">
+                  <dept-select
+                    v-model="form.applyUnit"
+                    :data="useDeptList"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="申请人" prop="applyPerson">
+                  <el-select v-model="form.applyPerson" disabled style="width: 100%;">
+                    <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="领用时间" prop="time">
+                  <el-date-picker
+                    v-model="form.time"
+                    type="datetime"
+                    format="YYYY-MM-DD hh:mm"
+                    value-format="YYYY-MM-DD hh:mm"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="申请说明" prop="applyDesc">
+                  <el-input v-model="form.applyDesc" type="textarea" disabled autosize />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </div>
+        <!-- </detail-block> -->
       </div>
       <detail-block title="设备领用列表">
         <el-table
diff --git a/src/views/device/receive/solve/solveList.vue b/src/views/device/receive/solve/solveList.vue
index ec1e8bb..93bee2c 100644
--- a/src/views/device/receive/solve/solveList.vue
+++ b/src/views/device/receive/solve/solveList.vue
@@ -138,8 +138,6 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // listQuery.value.startTime = timeRange.value[0] as string || ''
-  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiveApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IsolveListType) => {
       return {
diff --git a/src/views/device/standingBook/standingBook-interface.ts b/src/views/device/standingBook/standingBook-interface.ts
index e3cf134..4d239dd 100644
--- a/src/views/device/standingBook/standingBook-interface.ts
+++ b/src/views/device/standingBook/standingBook-interface.ts
@@ -28,6 +28,7 @@
   name: string
   id: string
   value: string
+  isSelectItemDisabled?: boolean // 选择项目禁用
 }
 // 部门类型
 export interface deptType {
diff --git a/src/views/device/stateManage/components/selectDevice.vue b/src/views/device/stateManage/components/selectDevice.vue
index eddd910..237e92a 100644
--- a/src/views/device/stateManage/components/selectDevice.vue
+++ b/src/views/device/stateManage/components/selectDevice.vue
@@ -43,6 +43,7 @@
     text: '管理状态',
     value: 'managerStateName',
     align: 'center',
+    width: '120',
   },
   {
     text: '使用人',
@@ -54,7 +55,6 @@
     value: 'validDate',
     align: 'center',
     width: '120',
-
   },
 ])
 // 选中的内容
@@ -148,8 +148,13 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[20]"
-        :list-loading="loadingTable" is-showmulti-select
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :page-sizes="[20]"
+        :list-loading="loadingTable"
+        is-showmulti-select
         :height="260"
         @change="changePage"
         @multi-select="handleSelectionChange"

diff --git a/.env.production b/.env.production
index 0fca4ad..ff5a80a 100644
--- a/.env.production
+++ b/.env.production
@@ -3,9 +3,9 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:21609
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-VITE_APP_API_BASEURL = http://192.168.2.96:8085
+# VITE_APP_API_BASEURL = http://192.168.2.96:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index f342066..9c4581f 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -196,7 +196,7 @@
 
       <el-table-column v-if="!isMulti" label="" width="60" align="center" fixed>
         <template #default="scope">
-          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+          <el-radio v-model="singleChecked" :disabled="scope.row.isRadioDisabled" :label="scope.row.id" class="radio" @change="radioChange" />
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index b2bfdba..f685105 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -462,7 +462,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column v-if="activeTitle === '已归还'" label="归还时间" width="160" align="center">
+          <el-table-column v-if="activeTitle === '已归还'" label="归还时间" width="180" align="center">
             <template #default="scope">
               {{ scope.row.backTime }}
             </template>
diff --git a/src/views/device/borrow/editHandle.vue b/src/views/device/borrow/editHandle.vue
index 0bd10c8..e3fe562 100644
--- a/src/views/device/borrow/editHandle.vue
+++ b/src/views/device/borrow/editHandle.vue
@@ -55,6 +55,7 @@
     form.value.applyPerson = res.data.applyPerson// 申请人
     form.value.time = res.data.time // 借用时间
     form.value.applyDesc = res.data.applyDesc // 申请说明
+    form.value.backTime = res.data.backTime // 归还时间
     list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
       return {
         ...item,
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index 0ada9c2..a884fd8 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -19,6 +19,7 @@
   remark: string // 备注
   updateTime: null | string // 更新时间
   approvalStatusName?: string // 审批状态名称
+  decisionItem?: string | number
 }
 // 标准配套设备表头类型
 export interface columnsType {
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 7f02a38..ba6cc7d 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -254,7 +254,13 @@
 }
 // 跳转到详情
 const goDetail = (row: IlistApproval, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`)
+  $router.push({
+    path: `/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`,
+    query: {
+      decisionItem: `${row.decisionItem}`, // 同意、驳回、拒绝
+      taskId: row.taskId,
+    },
+  })
 }
 // 获取到组织信息
 const getDept = () => {
@@ -275,7 +281,7 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    submitEquipmentApply({ id: row.id, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
+    submitEquipmentApply({ id: row.id, formId: SCHEDULE.DEVICE_FIX_APPROVAL, processId: row.processId }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -488,20 +494,8 @@
               >
                 取消
               </el-button>
-              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <!-- <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                @click="clickBtn(row, '删除')"
-              >
-                删除
-              </el-button> -->
-              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
               <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
index 35cbba2..5584541 100644
--- a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -1,10 +1,12 @@
 <!-- 设备检修列表新增、编辑、详情 -->
 <script lang="ts" setup name="maintenanceDetail">
 import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox, rowContextKey } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
+import { Row } from 'element-plus/es/components/table-v2/src/components'
 import type { IlistPageAddTypes, columnsType, returnRowType } from '../checkList_interface'
+import selectDeviceDialog from './selectDevice.vue'
 import { addEquipmentApply, equipmentApplyInfo, failUpdateEquipmentApply, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
@@ -13,17 +15,19 @@
 import type { userType } from '@/views/system/user/user-interface'
 import { cancelApproval, fetchApproval } from '@/api/approval'
 import { SCHEDULE } from '@/utils/scheduleDict'
-import addRow from '@/views/device/stateManage/components/selectDevice.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
 import useUserStore from '@/store/modules/user'
-
+const approvalDialog = ref() // 审批对话ref
 const user = useUserStore() // 用户信息
 const approvalRecord = ref() // 审批流程组件ref
 const infoId = ref('') // id
 const from = ref('') // reject代表未通过-驳回
 const buttonArray = ref<string[]>([])
 const pageType = ref('add') // 页面类型: add,edit, detail
+const decisionItem = ref('') // 同意、驳回、拒绝按钮权限
+const approvalStatusName = ref('') // 审批状态名称
+const taskId = ref('') // 任务id，用于同意、驳回、拒绝审批
 const textMap: { [key: string]: string } = {
   add: '新建',
   edit: '编辑',
@@ -167,44 +171,7 @@
 
 // 表格选中的数组
 const SelectionList = ref<object[]>([])
-// 取消
-const handleCancel = () => {
-  const params = {
-    processInstanceId: formInline.value.processId!,
-    comments: '取消审批',
-  }
-  ElMessageBox.confirm(
-    '确认取消该审批吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  ).then(() => {
-    cancelApproval(params).then(() => {
-      ElMessage.success('取消成功')
-    })
-  })
-}
-const approvalDialog = ref()
-// 点击数据后的操作按钮
-const clickBtn = (buttonType: string) => {
-  switch (buttonType) {
-    case '同意':
-      approvalDialog.value.initDialog('agree', formInline.value.taskId)
-      break
-    case '驳回':
-      approvalDialog.value.initDialog('reject', formInline.value.taskId)
-      break
-    case '拒绝':
-      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
-      break
-    case '取消':
-      handleCancel()
-      break
-  }
-}
+
 // 获取详情信息
 const getInfo = () => {
   equipmentApplyInfo({ id: infoId.value }).then((res) => {
@@ -302,10 +269,15 @@
   }
 }
 
-const addRowRef = ref()
+// ----------------------------------------------表格---------------------------------------
+const dialogSelectDiviceVisible = ref(false)
 // 点击批量增加
 const batchIncrease = () => {
-  addRowRef.value.initDialog({ title: '' })
+  dialogSelectDiviceVisible.value = true
+}
+// 选择设备对话框关闭
+const closeDialog = () => {
+  dialogSelectDiviceVisible.value = false
 }
 
 // 删除行
@@ -341,6 +313,8 @@
   })
 }
 
+// ----------------------------------------------------------------------------------
+
 // 选好申请人 userId用户id
 const changeSelectReceiver = (userId: string) => {
   // 在用户列表里找到选择的接收人的名字
@@ -362,18 +336,6 @@
     usePersonOptions.value = usePersonList.value
   }
 }
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
 // 获取部门列表
 const fetchDeptTreeList = () => {
   getDeptTreeList().then((res) => {
@@ -388,6 +350,7 @@
     usePersonOptions.value = res.data.rows
   })
 }
+// -------------------------------------------审批----------------------------------------
 const approvalRecordData = ref([]) // 审批流程数据
 // 查询审批记录
 function getApprovalRecord(processId: string) {
@@ -404,8 +367,45 @@
 }
 // 审批结束回调
 const approvalSuccess = () => {
-  getInfo()
+  close()
 }
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: formInline.value.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', taskId.value)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', taskId.value)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', taskId.value)
+  }
+}
+// ---------------------------------------------------------------------------------------
 onMounted(async () => {
   formInline.value.applyName = '设备检修申请' // 申请名称固定
   formInline.value.applyUnit = user.deptId // 申请单位
@@ -416,6 +416,11 @@
   await fetchUserList()
   await fetchDeptTreeList()
   formInline.value.processId = $route.params.processId as string // 任务id
+  decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
+  taskId.value = $route.query.taskId as string // 流程实例id
+  approvalStatusName.value = $route.params.approvalStatusName as string // 审批状态名称
+  console.log(approvalStatusName.value)
+
   formInline.value.approvalStatusName = $route.params.approvalStatusName as string // 任务id
   if (formInline.value.approvalStatusName !== '草稿箱') {
     getApprovalRecord(formInline.value.processId) // 查询审批记录
@@ -427,6 +432,18 @@
   <app-container>
     <detail-page :title="`${$route.meta.title}-${textMap[pageType]}`">
       <template #btns>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批' && decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批' && decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
         <el-button v-if="pageType === 'add'" type="primary" @click="submit">
           提交
         </el-button>
@@ -555,7 +572,7 @@
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection" width="55" />
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="55" />
         <el-table-column align="center" label="序号" width="60" type="index" />
         <el-table-column
           v-for="(item, index) in columns"
@@ -576,9 +593,14 @@
       <!-- 审批流程 -->
       <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
     </detail-block>
+    <!-- 审批弹窗 -->
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-    <!-- 借用设备列表 -->
-    <add-row ref="addRowRef" @add="confirmSelectDevice" />
+    <select-device-dialog
+      :dialog-select-divice-visible="dialogSelectDiviceVisible"
+      :is-multi="true"
+      @close-dialog="closeDialog"
+      @updateDeviceConfirm="confirmSelectDevice"
+    />
   </app-container>
 </template>
 
diff --git a/src/views/device/deviceMaintenance/components/selectDevice.vue b/src/views/device/deviceMaintenance/components/selectDevice.vue
new file mode 100644
index 0000000..3c04be6
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/selectDevice.vue
@@ -0,0 +1,216 @@
+<!-- 选择设备对话框 -->
+<script lang="ts" setup name="ReceiveDialog">
+import { ref } from 'vue'
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import type { IdeviceList } from '@/views/device/stateManage/components/status-interface'
+import useUserStore from '@/store/modules/user'
+import { listPageApi } from '@/api/device/standingBook'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { selectType } from '@/views/device/standingBook/standingBook-interface'
+import { getStatusList } from '@/api/device/stateManage'
+import { SCHEDULE } from '@/utils/scheduleDict'
+const props = defineProps({
+  dialogSelectDiviceVisible: {
+    type: Boolean,
+    default: false,
+  },
+  isMulti: Boolean, // 是否多选
+  statusTypeName: { // 状态管理类型
+    type: String,
+    default: '',
+  },
+})
+// 提醒文字
+const emits = defineEmits(['closeDialog', 'updateDeviceConfirm'])
+const defineMessageTest = ref('闲置、封存、在用(启封)') // 提醒文字
+const loadingTable = ref<boolean>(false)
+const userStore = useUserStore()
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  managerState: '1', // 管理状态 // 默认在用(启封)
+  offset: 1,
+  limit: 20,
+})
+const total = ref(20)
+// 多选选中的内容
+const checkoutList = ref([]) as any
+const list = ref([])// 表格数据
+const columns = ref<TableColumn[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center', fixed: true },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', fixed: true, width: '160' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '管理状态', value: 'managerStateName', align: 'center', width: '120' },
+  { text: '使用人', value: 'usePersonName', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center', width: '120' },
+])
+const table = ref()
+const dialogTableVisible = ref(false)// 控制对话框显隐
+// 获取数据
+const managerStateList = ref<selectType[]>([])
+const getDict = () => {
+  // 获取管理状态
+  getDictByCode('managerState').then((response) => {
+    managerStateList.value = response.data.map((item: { name: string; isSelectItemDisabled: boolean }) => {
+      if (item.name === '报废' || item.name === '处置') {
+        item.isSelectItemDisabled = true
+      }
+      return item
+    })
+  })
+}
+getDict()
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listQuery.value.limit = props.isMulti ? 20 : 5
+  listPageApi(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: IdeviceList) => {
+      return {
+        ...item,
+        validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+      }
+    })
+    total.value = res.data.total
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+watch(() => props.dialogSelectDiviceVisible, (newValue) => {
+  dialogTableVisible.value = newValue
+  fetchData()
+  if (!newValue) {
+    table.value.clearMulti() // 清除多选选中
+  }
+})
+
+// 关闭对话框
+const close = () => {
+  emits('closeDialog')
+}
+// 确认
+const confirm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return
+  }
+  emits('updateDeviceConfirm', checkoutList.value)
+  close()
+}
+// 重置
+const clearList = () => {
+  listQuery.value.equipmentName = ''
+  listQuery.value.equipmentNo = ''
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData()
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  console.log('多选', val)
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogTableVisible" width="65%" title="选择设备" class="select-device-dialog" @close="close">
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentName"
+          placeholder="设备名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentNo"
+          placeholder="设备编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.managerState" class="m-2" placeholder="管理状态" clearable>
+          <el-option
+            v-for="item in managerStateList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+            :disabled="item.isSelectItemDisabled"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+    <div style="padding: 12px;">
+      <normal-table
+        ref="table"
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :is-multi="isMulti"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :page-sizes="isMulti ? [20] : [5]"
+        :height="260"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <div style="font-size: 14px;">
+      <span style="color: #f56c6c;">*注意：只能查询管理状态为 <span style="color: #3d7eff;">{{ defineMessageTest }}</span> 的设备</span>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="close">取消</el-button>
+        <el-button type="primary" @click="confirm">
+          确定
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.receive-dialog {
+  .receive-dialog-item {
+    display: flex;
+    align-items: center;
+    margin-bottom: 28px;
+
+    .text {
+      margin-right: 30px;
+      white-space: nowrap;
+    }
+  }
+}
+</style>
diff --git a/src/views/device/receive/apply/applyEdit.vue b/src/views/device/receive/apply/applyEdit.vue
index 13e9528..8b50fc0 100644
--- a/src/views/device/receive/apply/applyEdit.vue
+++ b/src/views/device/receive/apply/applyEdit.vue
@@ -10,6 +10,7 @@
 import SelectDeviceDialog from '../selectDeviceDialog.vue'
 import { toTreeList } from '@/utils/structure'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import {
   failUpdateEquipmentApply,
@@ -22,9 +23,9 @@
 import type { deptType } from '@/views/device/standingBook/standingBook-interface'
 import { getDeptTreeList } from '@/api/system/dept'
 import { getUserList } from '@/api/system/user'
-import { fetchApproval, submitApproval } from '@/api/approval'
 import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
 import useUserStore from '@/store/modules/user'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 
 const user = useUserStore() // 用户信息
 const $route = useRoute()
@@ -39,6 +40,8 @@
 const isMulti = ref(false) // 是否批量添加(允许多选)
 const selectIndex = ref() // 点击选择的index--点击第几行
 const dialogSelectDiviceVisible = ref(false) // 控制选择设备对话框显隐
+const decisionItem = ref('') // 同意、驳回、拒绝按钮权限
+const taskId = ref('') // 任务id，用于同意、驳回、拒绝审批
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
@@ -88,42 +91,6 @@
   $router.back()
 }
 
-const handleClick = (val: string) => {
-  if (val === 'agree') { // 同意
-    approvalDialog.value.initDialog('agree', form.value.taskId)
-  }
-  else if (val === 'reject') { // 驳回
-    approvalDialog.value.initDialog('reject', form.value.taskId)
-  }
-  else if (val === 'refuse') { // 拒绝
-    approvalDialog.value.initDialog('refuse', form.value.taskId)
-  }
-  else if (val === 'revoke') {
-    const params = {
-      taskId: form.value.taskId!,
-      comments: '',
-    }
-    ElMessageBox.confirm(
-      '确认撤回该审批吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        submitApproval('revoke', params).then((res) => {
-          ElMessage({
-            type: 'success',
-            message: '已撤回',
-          })
-        })
-        close()
-      })
-  }
-}
-
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
@@ -314,11 +281,6 @@
   })
 }
 
-// 审批结束回调
-const approvalSuccess = () => {
-  close()
-}
-
 // 编辑、详情--获取详细信息
 const fetchReceiveApplyListDetail = () => {
   getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
@@ -355,6 +317,7 @@
   }
 }
 
+// ---------------------------------------------审批--------------------------------------
 const approvalRecordData = ref([]) // 审批流程数据
 // 查询审批记录
 function getApprovalRecord(processId: string) {
@@ -369,6 +332,47 @@
     }
   }
 }
+// 审批结束回调
+const approvalSuccess = () => {
+  close()
+}
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: form.value.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', taskId.value)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', taskId.value)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', taskId.value)
+  }
+}
+// --------------------------------------------------------------------------------------
 
 onMounted(() => {
   typeValue.value = $route.query.typeValue // 类型add、edit、detail
@@ -376,6 +380,8 @@
   form.value.taskId = $route.query.taskId as string // 任务id
   form.value.processId = $route.query.processId as string // 任务id
   approvalStatus.value = $route.query.approvalStatus // 审批类型
+  decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
+  taskId.value = $route.query.taskId as string // 流程实例id
   approvalStatusName.value = $route.query.approvalStatusName // 审批类型名称
   form.value.applyName = '设备领用申请' // 申请名称固定
   form.value.applyUnit = user.deptId // 申请单位
@@ -401,24 +407,24 @@
   <app-container>
     <detail-page :title="`设备领用申请-${textMap[typeValue]}`">
       <template #btns>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('agree')">
+        <el-button v-if="typeValue === 'detail' && approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
           同意
         </el-button>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('reject')">
+        <el-button v-if="typeValue === 'detail' && approvalStatusName === '待审批' && decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
           驳回
         </el-button>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('refuse')">
+        <el-button v-if="typeValue === 'detail' && approvalStatusName === '待审批' && decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
           拒绝
         </el-button>
+        <el-button v-if="typeValue === 'detail' && approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
         <el-button v-if="typeValue === 'add'" type="primary" @click="submit">
           提交
         </el-button>
         <el-button v-if="typeValue === 'add' || typeValue === 'edit'" type="primary" @click="save">
           保存
         </el-button>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '3'" type="primary" @click="handleClick('revoke')">
-          撤回
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
@@ -544,7 +550,7 @@
             align="center"
           >
             <template v-if="item.value === 'equipmentNo' && (typeValue === 'add' || typeValue === 'edit')" #default="scope">
-              <el-input v-model="scope.row.equipmentNo" placeholder="请选择设备" class="input">
+              <el-input v-model="scope.row.equipmentNo" disabled placeholder="请选择设备" class="input">
                 <template #append>
                   <el-button size="small" @click="handleSelect(scope.$index, scope.row)">
                     选择
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 50b014c..13e05df 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -169,42 +169,6 @@
   $router.push({ path: '/receive/add', query: { typeValue: 'add' } })
 }
 
-// 导出
-const exportAll = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: '下载中请稍后',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (list.value.length > 0) {
-    const params = {
-      applyNo: listQuery.value.applyNo, // 申请编号
-      applyName: listQuery.value.applyName, // 申请名称
-      applyUnit: listQuery.value.applyUnit, // 申请部门
-      applyPerson: listQuery.value.applyPerson, // 申请人
-      startTime: listQuery.value.startTime, // 申请开始日期
-      endTime: listQuery.value.endTime, // 申请结束日期
-      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
-      processResult: listQuery.value.processResult, // 	处置结果
-      applyType: listQuery.value.applyType, // 申请类型 领用0
-      createUser: listQuery.value.createUser, // 创建人
-      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
-      offset: 1,
-      limit: 20,
-      ids: checkoutList.value,
-    }
-    // 调导出接口
-    exportReceiveApplyList(params).then((res) => {
-      const blob = new Blob([res.data])
-      exportFile(blob, '设备领用申请列表.xlsx')
-    })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
-}
-
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -450,7 +414,6 @@
     <table-container>
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/device/receive/applyList/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/device/receive/applyList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
diff --git a/src/views/device/receive/solve/solveDetail.vue b/src/views/device/receive/solve/solveDetail.vue
index e0fc823..927ac8b 100644
--- a/src/views/device/receive/solve/solveDetail.vue
+++ b/src/views/device/receive/solve/solveDetail.vue
@@ -134,55 +134,55 @@
     </detail-page>
     <div id="lysq" class="lysq-create-check">
       <div class="top-info">
-        <detail-block title="领用申请">
-          <div class="form-area">
-            <el-form
-              ref="ruleFormRef"
-              :model="form"
-              label-width="120px"
-            >
-              <el-row :gutter="24">
-                <el-col :span="6">
-                  <el-form-item label="申请名称" prop="applyName">
-                    <el-input v-model="form.applyName" disabled />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="申请单位" prop="applyUnit">
-                    <dept-select
-                      v-model="form.applyUnit"
-                      :data="useDeptList"
-                      disabled
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="申请人" prop="applyPerson">
-                    <el-select v-model="form.applyPerson" disabled style="width: 100%;">
-                      <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="领用时间" prop="time">
-                    <el-date-picker
-                      v-model="form.time"
-                      type="datetime"
-                      format="YYYY-MM-DD hh:mm"
-                      value-format="YYYY-MM-DD hh:mm"
-                      disabled
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="申请说明" prop="applyDesc">
-                    <el-input v-model="form.applyDesc" type="textarea" disabled autosize />
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </el-form>
-          </div>
-        </detail-block>
+        <!-- <detail-block title="领用申请"> -->
+        <div class="form-area">
+          <el-form
+            ref="ruleFormRef"
+            :model="form"
+            label-width="120px"
+          >
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="申请名称" prop="applyName">
+                  <el-input v-model="form.applyName" disabled />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="申请单位" prop="applyUnit">
+                  <dept-select
+                    v-model="form.applyUnit"
+                    :data="useDeptList"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="申请人" prop="applyPerson">
+                  <el-select v-model="form.applyPerson" disabled style="width: 100%;">
+                    <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="领用时间" prop="time">
+                  <el-date-picker
+                    v-model="form.time"
+                    type="datetime"
+                    format="YYYY-MM-DD hh:mm"
+                    value-format="YYYY-MM-DD hh:mm"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="申请说明" prop="applyDesc">
+                  <el-input v-model="form.applyDesc" type="textarea" disabled autosize />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </div>
+        <!-- </detail-block> -->
       </div>
       <detail-block title="设备领用列表">
         <el-table
diff --git a/src/views/device/receive/solve/solveList.vue b/src/views/device/receive/solve/solveList.vue
index ec1e8bb..93bee2c 100644
--- a/src/views/device/receive/solve/solveList.vue
+++ b/src/views/device/receive/solve/solveList.vue
@@ -138,8 +138,6 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // listQuery.value.startTime = timeRange.value[0] as string || ''
-  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiveApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IsolveListType) => {
       return {
diff --git a/src/views/device/standingBook/standingBook-interface.ts b/src/views/device/standingBook/standingBook-interface.ts
index e3cf134..4d239dd 100644
--- a/src/views/device/standingBook/standingBook-interface.ts
+++ b/src/views/device/standingBook/standingBook-interface.ts
@@ -28,6 +28,7 @@
   name: string
   id: string
   value: string
+  isSelectItemDisabled?: boolean // 选择项目禁用
 }
 // 部门类型
 export interface deptType {
diff --git a/src/views/device/stateManage/components/selectDevice.vue b/src/views/device/stateManage/components/selectDevice.vue
index eddd910..237e92a 100644
--- a/src/views/device/stateManage/components/selectDevice.vue
+++ b/src/views/device/stateManage/components/selectDevice.vue
@@ -43,6 +43,7 @@
     text: '管理状态',
     value: 'managerStateName',
     align: 'center',
+    width: '120',
   },
   {
     text: '使用人',
@@ -54,7 +55,6 @@
     value: 'validDate',
     align: 'center',
     width: '120',
-
   },
 ])
 // 选中的内容
@@ -148,8 +148,13 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[20]"
-        :list-loading="loadingTable" is-showmulti-select
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :page-sizes="[20]"
+        :list-loading="loadingTable"
+        is-showmulti-select
         :height="260"
         @change="changePage"
         @multi-select="handleSelectionChange"
diff --git a/src/views/device/stateManage/components/selectDeviceDialog.vue b/src/views/device/stateManage/components/selectDeviceDialog.vue
index 12cd563..6d63d54 100644
--- a/src/views/device/stateManage/components/selectDeviceDialog.vue
+++ b/src/views/device/stateManage/components/selectDeviceDialog.vue
@@ -2,48 +2,85 @@
 <script lang="ts" setup name="ReceiveDialog">
 import { ref } from 'vue'
 import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
 import type { IdeviceList } from './status-interface'
 import useUserStore from '@/store/modules/user'
 import { listPageApi } from '@/api/device/standingBook'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-
+import { getDictByCode } from '@/api/system/dict'
+import type { selectType } from '@/views/device/standingBook/standingBook-interface'
+import { getStatusList } from '@/api/device/stateManage'
+import { SCHEDULE } from '@/utils/scheduleDict'
 const props = defineProps({
   dialogSelectDiviceVisible: {
     type: Boolean,
     default: false,
   },
-  isMulti: Boolean,
+  isMulti: Boolean, // 是否多选
+  statusTypeName: { // 状态管理类型
+    type: String,
+    default: '',
+  },
 })
+// 提醒文字
 const emits = defineEmits(['closeDialog', 'updateDeviceConfirm'])
+const defineMessageTest = ref('') // 提醒文字
 const loadingTable = ref<boolean>(false)
 const userStore = useUserStore()
 // 查询条件
 const listQuery = ref({
   equipmentName: '', // 设备名称
   equipmentNo: '', // 设备编号
+  managerState: '', // 管理状态
   offset: 1,
   limit: 20,
 })
 const total = ref(20)
 // 多选选中的内容
-const checkoutList = ref([])
-
+const checkoutList = ref([]) as any
+const isSelectDisabled = ref(false) // 状态管理筛选框是否禁用
 const list = ref([])// 表格数据
 const columns = ref<TableColumn[]>([
   { text: '设备名称', value: 'equipmentName', align: 'center', fixed: true },
-  { text: '设备编号', value: 'equipmentNo', align: 'center', fixed: true },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', fixed: true, width: '160' },
   { text: '型号', value: 'modelNo', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '管理状态', value: 'managerStateName', align: 'center' },
+  { text: '管理状态', value: 'managerStateName', align: 'center', width: '120' },
   { text: '使用人', value: 'usePersonName', align: 'center' },
-  { text: '有效日期', value: 'validDate', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center', width: '120' },
 ])
 const table = ref()
 const dialogTableVisible = ref(false)// 控制对话框显隐
-
+// 获取数据
+const managerStateList = ref<selectType[]>([])
+const getDict = () => {
+  // 获取管理状态
+  getDictByCode('managerState').then((response) => {
+    managerStateList.value = response.data.map((item: { name: string; isSelectItemDisabled: boolean }) => {
+      if (props.statusTypeName === '闲置' && item.name !== '在用(启封)') {
+        item.isSelectItemDisabled = true
+      }
+      else if (props.statusTypeName === '封存' && (item.name !== '在用(启封)' && item.name !== '闲置')) {
+        item.isSelectItemDisabled = true
+      }
+      else if (props.statusTypeName === '启封' && (item.name !== '封存' && item.name !== '闲置')) {
+        item.isSelectItemDisabled = true
+      }
+      else if (props.statusTypeName === '报废' && (item.name !== '在用(启封)' && item.name !== '闲置' && item.name !== '封存')) {
+        item.isSelectItemDisabled = true
+      }
+      else if (props.statusTypeName === '处置' && item.name !== '报废') {
+        item.isSelectItemDisabled = true
+      }
+      return item
+    })
+  })
+}
+getDict()
 // 获取数据列表
 const fetchData = () => {
   loadingTable.value = true
+  listQuery.value.limit = props.isMulti ? 20 : 5
   listPageApi(listQuery.value).then((res) => {
     list.value = res.data.rows.map((item: IdeviceList) => {
       return {
@@ -64,12 +101,38 @@
     table.value.clearMulti() // 清除多选选中
   }
 })
+watch(() => props.statusTypeName, (val) => {
+  if (val === '闲置') {
+    defineMessageTest.value = '在用(启封)'
+    listQuery.value.managerState = '1' // 启封 // 默认查询哪个状态
+  }
+  else if (val === '封存') {
+    defineMessageTest.value = '闲置、在用(启封)'
+    listQuery.value.managerState = '1' // 启封
+  }
+  else if (val === '启封') {
+    defineMessageTest.value = '闲置、封存'
+    listQuery.value.managerState = '3' // 封存
+  }
+  else if (val === '报废') {
+    defineMessageTest.value = '闲置、封存、在用(启封)'
+    listQuery.value.managerState = '1' // 启封
+  }
+  else if (val === '处置') {
+    defineMessageTest.value = '报废'
+    listQuery.value.managerState = '4' // 报废
+  }
+})
 // 关闭对话框
 const close = () => {
   emits('closeDialog')
 }
 // 确认
 const confirm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return
+  }
   emits('updateDeviceConfirm', checkoutList.value)
   close()
 }
@@ -101,7 +164,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogTableVisible" width="60%" title="选择设备" class="select-device-dialog" @close="close">
+  <el-dialog v-model="dialogTableVisible" width="65%" title="选择设备" class="select-device-dialog" @close="close">
     <search-area
       :need-clear="true"
       @search="searchList" @clear="clearList"
@@ -120,8 +183,19 @@
           clearable
         />
       </search-item>
+      <search-item>
+        <el-select v-model="listQuery.managerState" class="m-2" placeholder="管理状态" clearable>
+          <el-option
+            v-for="item in managerStateList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+            :disabled="item.isSelectItemDisabled"
+          />
+        </el-select>
+      </search-item>
     </search-area>
-    <table-container>
+    <div style="padding: 12px;">
       <normal-table
         ref="table"
         :data="list"
@@ -131,8 +205,8 @@
         :is-multi="isMulti"
         is-showmulti-select
         :list-loading="loadingTable"
-        :page-sizes="[20]"
-        :height="240"
+        :page-sizes="isMulti ? [20] : [5]"
+        :height="260"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
@@ -144,8 +218,10 @@
           </el-table-column>
         </template>
       </normal-table>
-    </table-container>
-
+    </div>
+    <div style="font-size: 14px;">
+      <span style="color: #f56c6c;">*注意：只能查询管理状态为 <span style="color: #3d7eff;">{{ defineMessageTest }}</span> 的设备</span>
+    </div>
     <template #footer>
       <span class="dialog-footer">
         <el-button @click="close">取消</el-button>

diff --git a/.env.production b/.env.production
index 0fca4ad..ff5a80a 100644
--- a/.env.production
+++ b/.env.production
@@ -3,9 +3,9 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:21609
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-VITE_APP_API_BASEURL = http://192.168.2.96:8085
+# VITE_APP_API_BASEURL = http://192.168.2.96:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index f342066..9c4581f 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -196,7 +196,7 @@
 
       <el-table-column v-if="!isMulti" label="" width="60" align="center" fixed>
         <template #default="scope">
-          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+          <el-radio v-model="singleChecked" :disabled="scope.row.isRadioDisabled" :label="scope.row.id" class="radio" @change="radioChange" />
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index b2bfdba..f685105 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -462,7 +462,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column v-if="activeTitle === '已归还'" label="归还时间" width="160" align="center">
+          <el-table-column v-if="activeTitle === '已归还'" label="归还时间" width="180" align="center">
             <template #default="scope">
               {{ scope.row.backTime }}
             </template>
diff --git a/src/views/device/borrow/editHandle.vue b/src/views/device/borrow/editHandle.vue
index 0bd10c8..e3fe562 100644
--- a/src/views/device/borrow/editHandle.vue
+++ b/src/views/device/borrow/editHandle.vue
@@ -55,6 +55,7 @@
     form.value.applyPerson = res.data.applyPerson// 申请人
     form.value.time = res.data.time // 借用时间
     form.value.applyDesc = res.data.applyDesc // 申请说明
+    form.value.backTime = res.data.backTime // 归还时间
     list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
       return {
         ...item,
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index 0ada9c2..a884fd8 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -19,6 +19,7 @@
   remark: string // 备注
   updateTime: null | string // 更新时间
   approvalStatusName?: string // 审批状态名称
+  decisionItem?: string | number
 }
 // 标准配套设备表头类型
 export interface columnsType {
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 7f02a38..ba6cc7d 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -254,7 +254,13 @@
 }
 // 跳转到详情
 const goDetail = (row: IlistApproval, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`)
+  $router.push({
+    path: `/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`,
+    query: {
+      decisionItem: `${row.decisionItem}`, // 同意、驳回、拒绝
+      taskId: row.taskId,
+    },
+  })
 }
 // 获取到组织信息
 const getDept = () => {
@@ -275,7 +281,7 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    submitEquipmentApply({ id: row.id, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
+    submitEquipmentApply({ id: row.id, formId: SCHEDULE.DEVICE_FIX_APPROVAL, processId: row.processId }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -488,20 +494,8 @@
               >
                 取消
               </el-button>
-              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <!-- <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                @click="clickBtn(row, '删除')"
-              >
-                删除
-              </el-button> -->
-              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
               <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
index 35cbba2..5584541 100644
--- a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -1,10 +1,12 @@
 <!-- 设备检修列表新增、编辑、详情 -->
 <script lang="ts" setup name="maintenanceDetail">
 import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox, rowContextKey } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
+import { Row } from 'element-plus/es/components/table-v2/src/components'
 import type { IlistPageAddTypes, columnsType, returnRowType } from '../checkList_interface'
+import selectDeviceDialog from './selectDevice.vue'
 import { addEquipmentApply, equipmentApplyInfo, failUpdateEquipmentApply, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
@@ -13,17 +15,19 @@
 import type { userType } from '@/views/system/user/user-interface'
 import { cancelApproval, fetchApproval } from '@/api/approval'
 import { SCHEDULE } from '@/utils/scheduleDict'
-import addRow from '@/views/device/stateManage/components/selectDevice.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
 import useUserStore from '@/store/modules/user'
-
+const approvalDialog = ref() // 审批对话ref
 const user = useUserStore() // 用户信息
 const approvalRecord = ref() // 审批流程组件ref
 const infoId = ref('') // id
 const from = ref('') // reject代表未通过-驳回
 const buttonArray = ref<string[]>([])
 const pageType = ref('add') // 页面类型: add,edit, detail
+const decisionItem = ref('') // 同意、驳回、拒绝按钮权限
+const approvalStatusName = ref('') // 审批状态名称
+const taskId = ref('') // 任务id，用于同意、驳回、拒绝审批
 const textMap: { [key: string]: string } = {
   add: '新建',
   edit: '编辑',
@@ -167,44 +171,7 @@
 
 // 表格选中的数组
 const SelectionList = ref<object[]>([])
-// 取消
-const handleCancel = () => {
-  const params = {
-    processInstanceId: formInline.value.processId!,
-    comments: '取消审批',
-  }
-  ElMessageBox.confirm(
-    '确认取消该审批吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  ).then(() => {
-    cancelApproval(params).then(() => {
-      ElMessage.success('取消成功')
-    })
-  })
-}
-const approvalDialog = ref()
-// 点击数据后的操作按钮
-const clickBtn = (buttonType: string) => {
-  switch (buttonType) {
-    case '同意':
-      approvalDialog.value.initDialog('agree', formInline.value.taskId)
-      break
-    case '驳回':
-      approvalDialog.value.initDialog('reject', formInline.value.taskId)
-      break
-    case '拒绝':
-      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
-      break
-    case '取消':
-      handleCancel()
-      break
-  }
-}
+
 // 获取详情信息
 const getInfo = () => {
   equipmentApplyInfo({ id: infoId.value }).then((res) => {
@@ -302,10 +269,15 @@
   }
 }
 
-const addRowRef = ref()
+// ----------------------------------------------表格---------------------------------------
+const dialogSelectDiviceVisible = ref(false)
 // 点击批量增加
 const batchIncrease = () => {
-  addRowRef.value.initDialog({ title: '' })
+  dialogSelectDiviceVisible.value = true
+}
+// 选择设备对话框关闭
+const closeDialog = () => {
+  dialogSelectDiviceVisible.value = false
 }
 
 // 删除行
@@ -341,6 +313,8 @@
   })
 }
 
+// ----------------------------------------------------------------------------------
+
 // 选好申请人 userId用户id
 const changeSelectReceiver = (userId: string) => {
   // 在用户列表里找到选择的接收人的名字
@@ -362,18 +336,6 @@
     usePersonOptions.value = usePersonList.value
   }
 }
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
 // 获取部门列表
 const fetchDeptTreeList = () => {
   getDeptTreeList().then((res) => {
@@ -388,6 +350,7 @@
     usePersonOptions.value = res.data.rows
   })
 }
+// -------------------------------------------审批----------------------------------------
 const approvalRecordData = ref([]) // 审批流程数据
 // 查询审批记录
 function getApprovalRecord(processId: string) {
@@ -404,8 +367,45 @@
 }
 // 审批结束回调
 const approvalSuccess = () => {
-  getInfo()
+  close()
 }
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: formInline.value.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', taskId.value)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', taskId.value)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', taskId.value)
+  }
+}
+// ---------------------------------------------------------------------------------------
 onMounted(async () => {
   formInline.value.applyName = '设备检修申请' // 申请名称固定
   formInline.value.applyUnit = user.deptId // 申请单位
@@ -416,6 +416,11 @@
   await fetchUserList()
   await fetchDeptTreeList()
   formInline.value.processId = $route.params.processId as string // 任务id
+  decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
+  taskId.value = $route.query.taskId as string // 流程实例id
+  approvalStatusName.value = $route.params.approvalStatusName as string // 审批状态名称
+  console.log(approvalStatusName.value)
+
   formInline.value.approvalStatusName = $route.params.approvalStatusName as string // 任务id
   if (formInline.value.approvalStatusName !== '草稿箱') {
     getApprovalRecord(formInline.value.processId) // 查询审批记录
@@ -427,6 +432,18 @@
   <app-container>
     <detail-page :title="`${$route.meta.title}-${textMap[pageType]}`">
       <template #btns>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批' && decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批' && decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
         <el-button v-if="pageType === 'add'" type="primary" @click="submit">
           提交
         </el-button>
@@ -555,7 +572,7 @@
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection" width="55" />
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="55" />
         <el-table-column align="center" label="序号" width="60" type="index" />
         <el-table-column
           v-for="(item, index) in columns"
@@ -576,9 +593,14 @@
       <!-- 审批流程 -->
       <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
     </detail-block>
+    <!-- 审批弹窗 -->
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-    <!-- 借用设备列表 -->
-    <add-row ref="addRowRef" @add="confirmSelectDevice" />
+    <select-device-dialog
+      :dialog-select-divice-visible="dialogSelectDiviceVisible"
+      :is-multi="true"
+      @close-dialog="closeDialog"
+      @updateDeviceConfirm="confirmSelectDevice"
+    />
   </app-container>
 </template>
 
diff --git a/src/views/device/deviceMaintenance/components/selectDevice.vue b/src/views/device/deviceMaintenance/components/selectDevice.vue
new file mode 100644
index 0000000..3c04be6
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/selectDevice.vue
@@ -0,0 +1,216 @@
+<!-- 选择设备对话框 -->
+<script lang="ts" setup name="ReceiveDialog">
+import { ref } from 'vue'
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import type { IdeviceList } from '@/views/device/stateManage/components/status-interface'
+import useUserStore from '@/store/modules/user'
+import { listPageApi } from '@/api/device/standingBook'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { selectType } from '@/views/device/standingBook/standingBook-interface'
+import { getStatusList } from '@/api/device/stateManage'
+import { SCHEDULE } from '@/utils/scheduleDict'
+const props = defineProps({
+  dialogSelectDiviceVisible: {
+    type: Boolean,
+    default: false,
+  },
+  isMulti: Boolean, // 是否多选
+  statusTypeName: { // 状态管理类型
+    type: String,
+    default: '',
+  },
+})
+// 提醒文字
+const emits = defineEmits(['closeDialog', 'updateDeviceConfirm'])
+const defineMessageTest = ref('闲置、封存、在用(启封)') // 提醒文字
+const loadingTable = ref<boolean>(false)
+const userStore = useUserStore()
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  managerState: '1', // 管理状态 // 默认在用(启封)
+  offset: 1,
+  limit: 20,
+})
+const total = ref(20)
+// 多选选中的内容
+const checkoutList = ref([]) as any
+const list = ref([])// 表格数据
+const columns = ref<TableColumn[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center', fixed: true },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', fixed: true, width: '160' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '管理状态', value: 'managerStateName', align: 'center', width: '120' },
+  { text: '使用人', value: 'usePersonName', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center', width: '120' },
+])
+const table = ref()
+const dialogTableVisible = ref(false)// 控制对话框显隐
+// 获取数据
+const managerStateList = ref<selectType[]>([])
+const getDict = () => {
+  // 获取管理状态
+  getDictByCode('managerState').then((response) => {
+    managerStateList.value = response.data.map((item: { name: string; isSelectItemDisabled: boolean }) => {
+      if (item.name === '报废' || item.name === '处置') {
+        item.isSelectItemDisabled = true
+      }
+      return item
+    })
+  })
+}
+getDict()
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listQuery.value.limit = props.isMulti ? 20 : 5
+  listPageApi(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: IdeviceList) => {
+      return {
+        ...item,
+        validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+      }
+    })
+    total.value = res.data.total
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+watch(() => props.dialogSelectDiviceVisible, (newValue) => {
+  dialogTableVisible.value = newValue
+  fetchData()
+  if (!newValue) {
+    table.value.clearMulti() // 清除多选选中
+  }
+})
+
+// 关闭对话框
+const close = () => {
+  emits('closeDialog')
+}
+// 确认
+const confirm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return
+  }
+  emits('updateDeviceConfirm', checkoutList.value)
+  close()
+}
+// 重置
+const clearList = () => {
+  listQuery.value.equipmentName = ''
+  listQuery.value.equipmentNo = ''
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData()
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  console.log('多选', val)
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogTableVisible" width="65%" title="选择设备" class="select-device-dialog" @close="close">
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentName"
+          placeholder="设备名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentNo"
+          placeholder="设备编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.managerState" class="m-2" placeholder="管理状态" clearable>
+          <el-option
+            v-for="item in managerStateList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+            :disabled="item.isSelectItemDisabled"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+    <div style="padding: 12px;">
+      <normal-table
+        ref="table"
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :is-multi="isMulti"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :page-sizes="isMulti ? [20] : [5]"
+        :height="260"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <div style="font-size: 14px;">
+      <span style="color: #f56c6c;">*注意：只能查询管理状态为 <span style="color: #3d7eff;">{{ defineMessageTest }}</span> 的设备</span>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="close">取消</el-button>
+        <el-button type="primary" @click="confirm">
+          确定
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.receive-dialog {
+  .receive-dialog-item {
+    display: flex;
+    align-items: center;
+    margin-bottom: 28px;
+
+    .text {
+      margin-right: 30px;
+      white-space: nowrap;
+    }
+  }
+}
+</style>
diff --git a/src/views/device/receive/apply/applyEdit.vue b/src/views/device/receive/apply/applyEdit.vue
index 13e9528..8b50fc0 100644
--- a/src/views/device/receive/apply/applyEdit.vue
+++ b/src/views/device/receive/apply/applyEdit.vue
@@ -10,6 +10,7 @@
 import SelectDeviceDialog from '../selectDeviceDialog.vue'
 import { toTreeList } from '@/utils/structure'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import {
   failUpdateEquipmentApply,
@@ -22,9 +23,9 @@
 import type { deptType } from '@/views/device/standingBook/standingBook-interface'
 import { getDeptTreeList } from '@/api/system/dept'
 import { getUserList } from '@/api/system/user'
-import { fetchApproval, submitApproval } from '@/api/approval'
 import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
 import useUserStore from '@/store/modules/user'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 
 const user = useUserStore() // 用户信息
 const $route = useRoute()
@@ -39,6 +40,8 @@
 const isMulti = ref(false) // 是否批量添加(允许多选)
 const selectIndex = ref() // 点击选择的index--点击第几行
 const dialogSelectDiviceVisible = ref(false) // 控制选择设备对话框显隐
+const decisionItem = ref('') // 同意、驳回、拒绝按钮权限
+const taskId = ref('') // 任务id，用于同意、驳回、拒绝审批
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
@@ -88,42 +91,6 @@
   $router.back()
 }
 
-const handleClick = (val: string) => {
-  if (val === 'agree') { // 同意
-    approvalDialog.value.initDialog('agree', form.value.taskId)
-  }
-  else if (val === 'reject') { // 驳回
-    approvalDialog.value.initDialog('reject', form.value.taskId)
-  }
-  else if (val === 'refuse') { // 拒绝
-    approvalDialog.value.initDialog('refuse', form.value.taskId)
-  }
-  else if (val === 'revoke') {
-    const params = {
-      taskId: form.value.taskId!,
-      comments: '',
-    }
-    ElMessageBox.confirm(
-      '确认撤回该审批吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        submitApproval('revoke', params).then((res) => {
-          ElMessage({
-            type: 'success',
-            message: '已撤回',
-          })
-        })
-        close()
-      })
-  }
-}
-
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
@@ -314,11 +281,6 @@
   })
 }
 
-// 审批结束回调
-const approvalSuccess = () => {
-  close()
-}
-
 // 编辑、详情--获取详细信息
 const fetchReceiveApplyListDetail = () => {
   getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
@@ -355,6 +317,7 @@
   }
 }
 
+// ---------------------------------------------审批--------------------------------------
 const approvalRecordData = ref([]) // 审批流程数据
 // 查询审批记录
 function getApprovalRecord(processId: string) {
@@ -369,6 +332,47 @@
     }
   }
 }
+// 审批结束回调
+const approvalSuccess = () => {
+  close()
+}
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: form.value.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', taskId.value)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', taskId.value)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', taskId.value)
+  }
+}
+// --------------------------------------------------------------------------------------
 
 onMounted(() => {
   typeValue.value = $route.query.typeValue // 类型add、edit、detail
@@ -376,6 +380,8 @@
   form.value.taskId = $route.query.taskId as string // 任务id
   form.value.processId = $route.query.processId as string // 任务id
   approvalStatus.value = $route.query.approvalStatus // 审批类型
+  decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
+  taskId.value = $route.query.taskId as string // 流程实例id
   approvalStatusName.value = $route.query.approvalStatusName // 审批类型名称
   form.value.applyName = '设备领用申请' // 申请名称固定
   form.value.applyUnit = user.deptId // 申请单位
@@ -401,24 +407,24 @@
   <app-container>
     <detail-page :title="`设备领用申请-${textMap[typeValue]}`">
       <template #btns>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('agree')">
+        <el-button v-if="typeValue === 'detail' && approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
           同意
         </el-button>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('reject')">
+        <el-button v-if="typeValue === 'detail' && approvalStatusName === '待审批' && decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
           驳回
         </el-button>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('refuse')">
+        <el-button v-if="typeValue === 'detail' && approvalStatusName === '待审批' && decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
           拒绝
         </el-button>
+        <el-button v-if="typeValue === 'detail' && approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
         <el-button v-if="typeValue === 'add'" type="primary" @click="submit">
           提交
         </el-button>
         <el-button v-if="typeValue === 'add' || typeValue === 'edit'" type="primary" @click="save">
           保存
         </el-button>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '3'" type="primary" @click="handleClick('revoke')">
-          撤回
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
@@ -544,7 +550,7 @@
             align="center"
           >
             <template v-if="item.value === 'equipmentNo' && (typeValue === 'add' || typeValue === 'edit')" #default="scope">
-              <el-input v-model="scope.row.equipmentNo" placeholder="请选择设备" class="input">
+              <el-input v-model="scope.row.equipmentNo" disabled placeholder="请选择设备" class="input">
                 <template #append>
                   <el-button size="small" @click="handleSelect(scope.$index, scope.row)">
                     选择
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 50b014c..13e05df 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -169,42 +169,6 @@
   $router.push({ path: '/receive/add', query: { typeValue: 'add' } })
 }
 
-// 导出
-const exportAll = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: '下载中请稍后',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (list.value.length > 0) {
-    const params = {
-      applyNo: listQuery.value.applyNo, // 申请编号
-      applyName: listQuery.value.applyName, // 申请名称
-      applyUnit: listQuery.value.applyUnit, // 申请部门
-      applyPerson: listQuery.value.applyPerson, // 申请人
-      startTime: listQuery.value.startTime, // 申请开始日期
-      endTime: listQuery.value.endTime, // 申请结束日期
-      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
-      processResult: listQuery.value.processResult, // 	处置结果
-      applyType: listQuery.value.applyType, // 申请类型 领用0
-      createUser: listQuery.value.createUser, // 创建人
-      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
-      offset: 1,
-      limit: 20,
-      ids: checkoutList.value,
-    }
-    // 调导出接口
-    exportReceiveApplyList(params).then((res) => {
-      const blob = new Blob([res.data])
-      exportFile(blob, '设备领用申请列表.xlsx')
-    })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
-}
-
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -450,7 +414,6 @@
     <table-container>
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/device/receive/applyList/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/device/receive/applyList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
diff --git a/src/views/device/receive/solve/solveDetail.vue b/src/views/device/receive/solve/solveDetail.vue
index e0fc823..927ac8b 100644
--- a/src/views/device/receive/solve/solveDetail.vue
+++ b/src/views/device/receive/solve/solveDetail.vue
@@ -134,55 +134,55 @@
     </detail-page>
     <div id="lysq" class="lysq-create-check">
       <div class="top-info">
-        <detail-block title="领用申请">
-          <div class="form-area">
-            <el-form
-              ref="ruleFormRef"
-              :model="form"
-              label-width="120px"
-            >
-              <el-row :gutter="24">
-                <el-col :span="6">
-                  <el-form-item label="申请名称" prop="applyName">
-                    <el-input v-model="form.applyName" disabled />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="申请单位" prop="applyUnit">
-                    <dept-select
-                      v-model="form.applyUnit"
-                      :data="useDeptList"
-                      disabled
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="申请人" prop="applyPerson">
-                    <el-select v-model="form.applyPerson" disabled style="width: 100%;">
-                      <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="领用时间" prop="time">
-                    <el-date-picker
-                      v-model="form.time"
-                      type="datetime"
-                      format="YYYY-MM-DD hh:mm"
-                      value-format="YYYY-MM-DD hh:mm"
-                      disabled
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="申请说明" prop="applyDesc">
-                    <el-input v-model="form.applyDesc" type="textarea" disabled autosize />
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </el-form>
-          </div>
-        </detail-block>
+        <!-- <detail-block title="领用申请"> -->
+        <div class="form-area">
+          <el-form
+            ref="ruleFormRef"
+            :model="form"
+            label-width="120px"
+          >
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="申请名称" prop="applyName">
+                  <el-input v-model="form.applyName" disabled />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="申请单位" prop="applyUnit">
+                  <dept-select
+                    v-model="form.applyUnit"
+                    :data="useDeptList"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="申请人" prop="applyPerson">
+                  <el-select v-model="form.applyPerson" disabled style="width: 100%;">
+                    <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="领用时间" prop="time">
+                  <el-date-picker
+                    v-model="form.time"
+                    type="datetime"
+                    format="YYYY-MM-DD hh:mm"
+                    value-format="YYYY-MM-DD hh:mm"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="申请说明" prop="applyDesc">
+                  <el-input v-model="form.applyDesc" type="textarea" disabled autosize />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </div>
+        <!-- </detail-block> -->
       </div>
       <detail-block title="设备领用列表">
         <el-table
diff --git a/src/views/device/receive/solve/solveList.vue b/src/views/device/receive/solve/solveList.vue
index ec1e8bb..93bee2c 100644
--- a/src/views/device/receive/solve/solveList.vue
+++ b/src/views/device/receive/solve/solveList.vue
@@ -138,8 +138,6 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // listQuery.value.startTime = timeRange.value[0] as string || ''
-  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiveApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IsolveListType) => {
       return {
diff --git a/src/views/device/standingBook/standingBook-interface.ts b/src/views/device/standingBook/standingBook-interface.ts
index e3cf134..4d239dd 100644
--- a/src/views/device/standingBook/standingBook-interface.ts
+++ b/src/views/device/standingBook/standingBook-interface.ts
@@ -28,6 +28,7 @@
   name: string
   id: string
   value: string
+  isSelectItemDisabled?: boolean // 选择项目禁用
 }
 // 部门类型
 export interface deptType {
diff --git a/src/views/device/stateManage/components/selectDevice.vue b/src/views/device/stateManage/components/selectDevice.vue
index eddd910..237e92a 100644
--- a/src/views/device/stateManage/components/selectDevice.vue
+++ b/src/views/device/stateManage/components/selectDevice.vue
@@ -43,6 +43,7 @@
     text: '管理状态',
     value: 'managerStateName',
     align: 'center',
+    width: '120',
   },
   {
     text: '使用人',
@@ -54,7 +55,6 @@
     value: 'validDate',
     align: 'center',
     width: '120',
-
   },
 ])
 // 选中的内容
@@ -148,8 +148,13 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[20]"
-        :list-loading="loadingTable" is-showmulti-select
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :page-sizes="[20]"
+        :list-loading="loadingTable"
+        is-showmulti-select
         :height="260"
         @change="changePage"
         @multi-select="handleSelectionChange"
diff --git a/src/views/device/stateManage/components/selectDeviceDialog.vue b/src/views/device/stateManage/components/selectDeviceDialog.vue
index 12cd563..6d63d54 100644
--- a/src/views/device/stateManage/components/selectDeviceDialog.vue
+++ b/src/views/device/stateManage/components/selectDeviceDialog.vue
@@ -2,48 +2,85 @@
 <script lang="ts" setup name="ReceiveDialog">
 import { ref } from 'vue'
 import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
 import type { IdeviceList } from './status-interface'
 import useUserStore from '@/store/modules/user'
 import { listPageApi } from '@/api/device/standingBook'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-
+import { getDictByCode } from '@/api/system/dict'
+import type { selectType } from '@/views/device/standingBook/standingBook-interface'
+import { getStatusList } from '@/api/device/stateManage'
+import { SCHEDULE } from '@/utils/scheduleDict'
 const props = defineProps({
   dialogSelectDiviceVisible: {
     type: Boolean,
     default: false,
   },
-  isMulti: Boolean,
+  isMulti: Boolean, // 是否多选
+  statusTypeName: { // 状态管理类型
+    type: String,
+    default: '',
+  },
 })
+// 提醒文字
 const emits = defineEmits(['closeDialog', 'updateDeviceConfirm'])
+const defineMessageTest = ref('') // 提醒文字
 const loadingTable = ref<boolean>(false)
 const userStore = useUserStore()
 // 查询条件
 const listQuery = ref({
   equipmentName: '', // 设备名称
   equipmentNo: '', // 设备编号
+  managerState: '', // 管理状态
   offset: 1,
   limit: 20,
 })
 const total = ref(20)
 // 多选选中的内容
-const checkoutList = ref([])
-
+const checkoutList = ref([]) as any
+const isSelectDisabled = ref(false) // 状态管理筛选框是否禁用
 const list = ref([])// 表格数据
 const columns = ref<TableColumn[]>([
   { text: '设备名称', value: 'equipmentName', align: 'center', fixed: true },
-  { text: '设备编号', value: 'equipmentNo', align: 'center', fixed: true },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', fixed: true, width: '160' },
   { text: '型号', value: 'modelNo', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '管理状态', value: 'managerStateName', align: 'center' },
+  { text: '管理状态', value: 'managerStateName', align: 'center', width: '120' },
   { text: '使用人', value: 'usePersonName', align: 'center' },
-  { text: '有效日期', value: 'validDate', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center', width: '120' },
 ])
 const table = ref()
 const dialogTableVisible = ref(false)// 控制对话框显隐
-
+// 获取数据
+const managerStateList = ref<selectType[]>([])
+const getDict = () => {
+  // 获取管理状态
+  getDictByCode('managerState').then((response) => {
+    managerStateList.value = response.data.map((item: { name: string; isSelectItemDisabled: boolean }) => {
+      if (props.statusTypeName === '闲置' && item.name !== '在用(启封)') {
+        item.isSelectItemDisabled = true
+      }
+      else if (props.statusTypeName === '封存' && (item.name !== '在用(启封)' && item.name !== '闲置')) {
+        item.isSelectItemDisabled = true
+      }
+      else if (props.statusTypeName === '启封' && (item.name !== '封存' && item.name !== '闲置')) {
+        item.isSelectItemDisabled = true
+      }
+      else if (props.statusTypeName === '报废' && (item.name !== '在用(启封)' && item.name !== '闲置' && item.name !== '封存')) {
+        item.isSelectItemDisabled = true
+      }
+      else if (props.statusTypeName === '处置' && item.name !== '报废') {
+        item.isSelectItemDisabled = true
+      }
+      return item
+    })
+  })
+}
+getDict()
 // 获取数据列表
 const fetchData = () => {
   loadingTable.value = true
+  listQuery.value.limit = props.isMulti ? 20 : 5
   listPageApi(listQuery.value).then((res) => {
     list.value = res.data.rows.map((item: IdeviceList) => {
       return {
@@ -64,12 +101,38 @@
     table.value.clearMulti() // 清除多选选中
   }
 })
+watch(() => props.statusTypeName, (val) => {
+  if (val === '闲置') {
+    defineMessageTest.value = '在用(启封)'
+    listQuery.value.managerState = '1' // 启封 // 默认查询哪个状态
+  }
+  else if (val === '封存') {
+    defineMessageTest.value = '闲置、在用(启封)'
+    listQuery.value.managerState = '1' // 启封
+  }
+  else if (val === '启封') {
+    defineMessageTest.value = '闲置、封存'
+    listQuery.value.managerState = '3' // 封存
+  }
+  else if (val === '报废') {
+    defineMessageTest.value = '闲置、封存、在用(启封)'
+    listQuery.value.managerState = '1' // 启封
+  }
+  else if (val === '处置') {
+    defineMessageTest.value = '报废'
+    listQuery.value.managerState = '4' // 报废
+  }
+})
 // 关闭对话框
 const close = () => {
   emits('closeDialog')
 }
 // 确认
 const confirm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return
+  }
   emits('updateDeviceConfirm', checkoutList.value)
   close()
 }
@@ -101,7 +164,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogTableVisible" width="60%" title="选择设备" class="select-device-dialog" @close="close">
+  <el-dialog v-model="dialogTableVisible" width="65%" title="选择设备" class="select-device-dialog" @close="close">
     <search-area
       :need-clear="true"
       @search="searchList" @clear="clearList"
@@ -120,8 +183,19 @@
           clearable
         />
       </search-item>
+      <search-item>
+        <el-select v-model="listQuery.managerState" class="m-2" placeholder="管理状态" clearable>
+          <el-option
+            v-for="item in managerStateList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+            :disabled="item.isSelectItemDisabled"
+          />
+        </el-select>
+      </search-item>
     </search-area>
-    <table-container>
+    <div style="padding: 12px;">
       <normal-table
         ref="table"
         :data="list"
@@ -131,8 +205,8 @@
         :is-multi="isMulti"
         is-showmulti-select
         :list-loading="loadingTable"
-        :page-sizes="[20]"
-        :height="240"
+        :page-sizes="isMulti ? [20] : [5]"
+        :height="260"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
@@ -144,8 +218,10 @@
           </el-table-column>
         </template>
       </normal-table>
-    </table-container>
-
+    </div>
+    <div style="font-size: 14px;">
+      <span style="color: #f56c6c;">*注意：只能查询管理状态为 <span style="color: #3d7eff;">{{ defineMessageTest }}</span> 的设备</span>
+    </div>
     <template #footer>
       <span class="dialog-footer">
         <el-button @click="close">取消</el-button>
diff --git a/src/views/device/stateManage/components/status-interface.ts b/src/views/device/stateManage/components/status-interface.ts
index dd27189..acb9b35 100644
--- a/src/views/device/stateManage/components/status-interface.ts
+++ b/src/views/device/stateManage/components/status-interface.ts
@@ -41,6 +41,7 @@
   time: string // 时间
   updateTime: string // 修改时间
   version: string // 版本
+  decisionItem?: string | number
 }
 
 // 删除/提交/取消
@@ -72,6 +73,9 @@
   equipmentSpecifications?: string | undefined
   manufacturingNo?: string | undefined
   manufacturer?: string | undefined
+  isRadioDisabled?: boolean // 禁用单选按钮
+  isMultiDisabled?: boolean // 禁用多选框
+  isSelectItemDisabled?: boolean // 选择器选项禁用
 }
 
 export interface IdeviceListQuery {

diff --git a/.env.production b/.env.production
index 0fca4ad..ff5a80a 100644
--- a/.env.production
+++ b/.env.production
@@ -3,9 +3,9 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:21609
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-VITE_APP_API_BASEURL = http://192.168.2.96:8085
+# VITE_APP_API_BASEURL = http://192.168.2.96:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index f342066..9c4581f 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -196,7 +196,7 @@
 
       <el-table-column v-if="!isMulti" label="" width="60" align="center" fixed>
         <template #default="scope">
-          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+          <el-radio v-model="singleChecked" :disabled="scope.row.isRadioDisabled" :label="scope.row.id" class="radio" @change="radioChange" />
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index b2bfdba..f685105 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -462,7 +462,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column v-if="activeTitle === '已归还'" label="归还时间" width="160" align="center">
+          <el-table-column v-if="activeTitle === '已归还'" label="归还时间" width="180" align="center">
             <template #default="scope">
               {{ scope.row.backTime }}
             </template>
diff --git a/src/views/device/borrow/editHandle.vue b/src/views/device/borrow/editHandle.vue
index 0bd10c8..e3fe562 100644
--- a/src/views/device/borrow/editHandle.vue
+++ b/src/views/device/borrow/editHandle.vue
@@ -55,6 +55,7 @@
     form.value.applyPerson = res.data.applyPerson// 申请人
     form.value.time = res.data.time // 借用时间
     form.value.applyDesc = res.data.applyDesc // 申请说明
+    form.value.backTime = res.data.backTime // 归还时间
     list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
       return {
         ...item,
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index 0ada9c2..a884fd8 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -19,6 +19,7 @@
   remark: string // 备注
   updateTime: null | string // 更新时间
   approvalStatusName?: string // 审批状态名称
+  decisionItem?: string | number
 }
 // 标准配套设备表头类型
 export interface columnsType {
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 7f02a38..ba6cc7d 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -254,7 +254,13 @@
 }
 // 跳转到详情
 const goDetail = (row: IlistApproval, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`)
+  $router.push({
+    path: `/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`,
+    query: {
+      decisionItem: `${row.decisionItem}`, // 同意、驳回、拒绝
+      taskId: row.taskId,
+    },
+  })
 }
 // 获取到组织信息
 const getDept = () => {
@@ -275,7 +281,7 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    submitEquipmentApply({ id: row.id, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
+    submitEquipmentApply({ id: row.id, formId: SCHEDULE.DEVICE_FIX_APPROVAL, processId: row.processId }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -488,20 +494,8 @@
               >
                 取消
               </el-button>
-              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <!-- <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                @click="clickBtn(row, '删除')"
-              >
-                删除
-              </el-button> -->
-              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
               <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
index 35cbba2..5584541 100644
--- a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -1,10 +1,12 @@
 <!-- 设备检修列表新增、编辑、详情 -->
 <script lang="ts" setup name="maintenanceDetail">
 import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox, rowContextKey } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
+import { Row } from 'element-plus/es/components/table-v2/src/components'
 import type { IlistPageAddTypes, columnsType, returnRowType } from '../checkList_interface'
+import selectDeviceDialog from './selectDevice.vue'
 import { addEquipmentApply, equipmentApplyInfo, failUpdateEquipmentApply, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
@@ -13,17 +15,19 @@
 import type { userType } from '@/views/system/user/user-interface'
 import { cancelApproval, fetchApproval } from '@/api/approval'
 import { SCHEDULE } from '@/utils/scheduleDict'
-import addRow from '@/views/device/stateManage/components/selectDevice.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
 import useUserStore from '@/store/modules/user'
-
+const approvalDialog = ref() // 审批对话ref
 const user = useUserStore() // 用户信息
 const approvalRecord = ref() // 审批流程组件ref
 const infoId = ref('') // id
 const from = ref('') // reject代表未通过-驳回
 const buttonArray = ref<string[]>([])
 const pageType = ref('add') // 页面类型: add,edit, detail
+const decisionItem = ref('') // 同意、驳回、拒绝按钮权限
+const approvalStatusName = ref('') // 审批状态名称
+const taskId = ref('') // 任务id，用于同意、驳回、拒绝审批
 const textMap: { [key: string]: string } = {
   add: '新建',
   edit: '编辑',
@@ -167,44 +171,7 @@
 
 // 表格选中的数组
 const SelectionList = ref<object[]>([])
-// 取消
-const handleCancel = () => {
-  const params = {
-    processInstanceId: formInline.value.processId!,
-    comments: '取消审批',
-  }
-  ElMessageBox.confirm(
-    '确认取消该审批吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  ).then(() => {
-    cancelApproval(params).then(() => {
-      ElMessage.success('取消成功')
-    })
-  })
-}
-const approvalDialog = ref()
-// 点击数据后的操作按钮
-const clickBtn = (buttonType: string) => {
-  switch (buttonType) {
-    case '同意':
-      approvalDialog.value.initDialog('agree', formInline.value.taskId)
-      break
-    case '驳回':
-      approvalDialog.value.initDialog('reject', formInline.value.taskId)
-      break
-    case '拒绝':
-      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
-      break
-    case '取消':
-      handleCancel()
-      break
-  }
-}
+
 // 获取详情信息
 const getInfo = () => {
   equipmentApplyInfo({ id: infoId.value }).then((res) => {
@@ -302,10 +269,15 @@
   }
 }
 
-const addRowRef = ref()
+// ----------------------------------------------表格---------------------------------------
+const dialogSelectDiviceVisible = ref(false)
 // 点击批量增加
 const batchIncrease = () => {
-  addRowRef.value.initDialog({ title: '' })
+  dialogSelectDiviceVisible.value = true
+}
+// 选择设备对话框关闭
+const closeDialog = () => {
+  dialogSelectDiviceVisible.value = false
 }
 
 // 删除行
@@ -341,6 +313,8 @@
   })
 }
 
+// ----------------------------------------------------------------------------------
+
 // 选好申请人 userId用户id
 const changeSelectReceiver = (userId: string) => {
   // 在用户列表里找到选择的接收人的名字
@@ -362,18 +336,6 @@
     usePersonOptions.value = usePersonList.value
   }
 }
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
 // 获取部门列表
 const fetchDeptTreeList = () => {
   getDeptTreeList().then((res) => {
@@ -388,6 +350,7 @@
     usePersonOptions.value = res.data.rows
   })
 }
+// -------------------------------------------审批----------------------------------------
 const approvalRecordData = ref([]) // 审批流程数据
 // 查询审批记录
 function getApprovalRecord(processId: string) {
@@ -404,8 +367,45 @@
 }
 // 审批结束回调
 const approvalSuccess = () => {
-  getInfo()
+  close()
 }
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: formInline.value.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', taskId.value)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', taskId.value)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', taskId.value)
+  }
+}
+// ---------------------------------------------------------------------------------------
 onMounted(async () => {
   formInline.value.applyName = '设备检修申请' // 申请名称固定
   formInline.value.applyUnit = user.deptId // 申请单位
@@ -416,6 +416,11 @@
   await fetchUserList()
   await fetchDeptTreeList()
   formInline.value.processId = $route.params.processId as string // 任务id
+  decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
+  taskId.value = $route.query.taskId as string // 流程实例id
+  approvalStatusName.value = $route.params.approvalStatusName as string // 审批状态名称
+  console.log(approvalStatusName.value)
+
   formInline.value.approvalStatusName = $route.params.approvalStatusName as string // 任务id
   if (formInline.value.approvalStatusName !== '草稿箱') {
     getApprovalRecord(formInline.value.processId) // 查询审批记录
@@ -427,6 +432,18 @@
   <app-container>
     <detail-page :title="`${$route.meta.title}-${textMap[pageType]}`">
       <template #btns>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批' && decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批' && decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
         <el-button v-if="pageType === 'add'" type="primary" @click="submit">
           提交
         </el-button>
@@ -555,7 +572,7 @@
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection" width="55" />
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="55" />
         <el-table-column align="center" label="序号" width="60" type="index" />
         <el-table-column
           v-for="(item, index) in columns"
@@ -576,9 +593,14 @@
       <!-- 审批流程 -->
       <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
     </detail-block>
+    <!-- 审批弹窗 -->
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-    <!-- 借用设备列表 -->
-    <add-row ref="addRowRef" @add="confirmSelectDevice" />
+    <select-device-dialog
+      :dialog-select-divice-visible="dialogSelectDiviceVisible"
+      :is-multi="true"
+      @close-dialog="closeDialog"
+      @updateDeviceConfirm="confirmSelectDevice"
+    />
   </app-container>
 </template>
 
diff --git a/src/views/device/deviceMaintenance/components/selectDevice.vue b/src/views/device/deviceMaintenance/components/selectDevice.vue
new file mode 100644
index 0000000..3c04be6
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/selectDevice.vue
@@ -0,0 +1,216 @@
+<!-- 选择设备对话框 -->
+<script lang="ts" setup name="ReceiveDialog">
+import { ref } from 'vue'
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import type { IdeviceList } from '@/views/device/stateManage/components/status-interface'
+import useUserStore from '@/store/modules/user'
+import { listPageApi } from '@/api/device/standingBook'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { selectType } from '@/views/device/standingBook/standingBook-interface'
+import { getStatusList } from '@/api/device/stateManage'
+import { SCHEDULE } from '@/utils/scheduleDict'
+const props = defineProps({
+  dialogSelectDiviceVisible: {
+    type: Boolean,
+    default: false,
+  },
+  isMulti: Boolean, // 是否多选
+  statusTypeName: { // 状态管理类型
+    type: String,
+    default: '',
+  },
+})
+// 提醒文字
+const emits = defineEmits(['closeDialog', 'updateDeviceConfirm'])
+const defineMessageTest = ref('闲置、封存、在用(启封)') // 提醒文字
+const loadingTable = ref<boolean>(false)
+const userStore = useUserStore()
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  managerState: '1', // 管理状态 // 默认在用(启封)
+  offset: 1,
+  limit: 20,
+})
+const total = ref(20)
+// 多选选中的内容
+const checkoutList = ref([]) as any
+const list = ref([])// 表格数据
+const columns = ref<TableColumn[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center', fixed: true },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', fixed: true, width: '160' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '管理状态', value: 'managerStateName', align: 'center', width: '120' },
+  { text: '使用人', value: 'usePersonName', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center', width: '120' },
+])
+const table = ref()
+const dialogTableVisible = ref(false)// 控制对话框显隐
+// 获取数据
+const managerStateList = ref<selectType[]>([])
+const getDict = () => {
+  // 获取管理状态
+  getDictByCode('managerState').then((response) => {
+    managerStateList.value = response.data.map((item: { name: string; isSelectItemDisabled: boolean }) => {
+      if (item.name === '报废' || item.name === '处置') {
+        item.isSelectItemDisabled = true
+      }
+      return item
+    })
+  })
+}
+getDict()
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listQuery.value.limit = props.isMulti ? 20 : 5
+  listPageApi(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: IdeviceList) => {
+      return {
+        ...item,
+        validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+      }
+    })
+    total.value = res.data.total
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+watch(() => props.dialogSelectDiviceVisible, (newValue) => {
+  dialogTableVisible.value = newValue
+  fetchData()
+  if (!newValue) {
+    table.value.clearMulti() // 清除多选选中
+  }
+})
+
+// 关闭对话框
+const close = () => {
+  emits('closeDialog')
+}
+// 确认
+const confirm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return
+  }
+  emits('updateDeviceConfirm', checkoutList.value)
+  close()
+}
+// 重置
+const clearList = () => {
+  listQuery.value.equipmentName = ''
+  listQuery.value.equipmentNo = ''
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData()
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  console.log('多选', val)
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogTableVisible" width="65%" title="选择设备" class="select-device-dialog" @close="close">
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentName"
+          placeholder="设备名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentNo"
+          placeholder="设备编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.managerState" class="m-2" placeholder="管理状态" clearable>
+          <el-option
+            v-for="item in managerStateList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+            :disabled="item.isSelectItemDisabled"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+    <div style="padding: 12px;">
+      <normal-table
+        ref="table"
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :is-multi="isMulti"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :page-sizes="isMulti ? [20] : [5]"
+        :height="260"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <div style="font-size: 14px;">
+      <span style="color: #f56c6c;">*注意：只能查询管理状态为 <span style="color: #3d7eff;">{{ defineMessageTest }}</span> 的设备</span>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="close">取消</el-button>
+        <el-button type="primary" @click="confirm">
+          确定
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.receive-dialog {
+  .receive-dialog-item {
+    display: flex;
+    align-items: center;
+    margin-bottom: 28px;
+
+    .text {
+      margin-right: 30px;
+      white-space: nowrap;
+    }
+  }
+}
+</style>
diff --git a/src/views/device/receive/apply/applyEdit.vue b/src/views/device/receive/apply/applyEdit.vue
index 13e9528..8b50fc0 100644
--- a/src/views/device/receive/apply/applyEdit.vue
+++ b/src/views/device/receive/apply/applyEdit.vue
@@ -10,6 +10,7 @@
 import SelectDeviceDialog from '../selectDeviceDialog.vue'
 import { toTreeList } from '@/utils/structure'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import {
   failUpdateEquipmentApply,
@@ -22,9 +23,9 @@
 import type { deptType } from '@/views/device/standingBook/standingBook-interface'
 import { getDeptTreeList } from '@/api/system/dept'
 import { getUserList } from '@/api/system/user'
-import { fetchApproval, submitApproval } from '@/api/approval'
 import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
 import useUserStore from '@/store/modules/user'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 
 const user = useUserStore() // 用户信息
 const $route = useRoute()
@@ -39,6 +40,8 @@
 const isMulti = ref(false) // 是否批量添加(允许多选)
 const selectIndex = ref() // 点击选择的index--点击第几行
 const dialogSelectDiviceVisible = ref(false) // 控制选择设备对话框显隐
+const decisionItem = ref('') // 同意、驳回、拒绝按钮权限
+const taskId = ref('') // 任务id，用于同意、驳回、拒绝审批
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
@@ -88,42 +91,6 @@
   $router.back()
 }
 
-const handleClick = (val: string) => {
-  if (val === 'agree') { // 同意
-    approvalDialog.value.initDialog('agree', form.value.taskId)
-  }
-  else if (val === 'reject') { // 驳回
-    approvalDialog.value.initDialog('reject', form.value.taskId)
-  }
-  else if (val === 'refuse') { // 拒绝
-    approvalDialog.value.initDialog('refuse', form.value.taskId)
-  }
-  else if (val === 'revoke') {
-    const params = {
-      taskId: form.value.taskId!,
-      comments: '',
-    }
-    ElMessageBox.confirm(
-      '确认撤回该审批吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        submitApproval('revoke', params).then((res) => {
-          ElMessage({
-            type: 'success',
-            message: '已撤回',
-          })
-        })
-        close()
-      })
-  }
-}
-
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
@@ -314,11 +281,6 @@
   })
 }
 
-// 审批结束回调
-const approvalSuccess = () => {
-  close()
-}
-
 // 编辑、详情--获取详细信息
 const fetchReceiveApplyListDetail = () => {
   getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
@@ -355,6 +317,7 @@
   }
 }
 
+// ---------------------------------------------审批--------------------------------------
 const approvalRecordData = ref([]) // 审批流程数据
 // 查询审批记录
 function getApprovalRecord(processId: string) {
@@ -369,6 +332,47 @@
     }
   }
 }
+// 审批结束回调
+const approvalSuccess = () => {
+  close()
+}
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: form.value.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', taskId.value)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', taskId.value)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', taskId.value)
+  }
+}
+// --------------------------------------------------------------------------------------
 
 onMounted(() => {
   typeValue.value = $route.query.typeValue // 类型add、edit、detail
@@ -376,6 +380,8 @@
   form.value.taskId = $route.query.taskId as string // 任务id
   form.value.processId = $route.query.processId as string // 任务id
   approvalStatus.value = $route.query.approvalStatus // 审批类型
+  decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
+  taskId.value = $route.query.taskId as string // 流程实例id
   approvalStatusName.value = $route.query.approvalStatusName // 审批类型名称
   form.value.applyName = '设备领用申请' // 申请名称固定
   form.value.applyUnit = user.deptId // 申请单位
@@ -401,24 +407,24 @@
   <app-container>
     <detail-page :title="`设备领用申请-${textMap[typeValue]}`">
       <template #btns>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('agree')">
+        <el-button v-if="typeValue === 'detail' && approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
           同意
         </el-button>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('reject')">
+        <el-button v-if="typeValue === 'detail' && approvalStatusName === '待审批' && decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
           驳回
         </el-button>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('refuse')">
+        <el-button v-if="typeValue === 'detail' && approvalStatusName === '待审批' && decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
           拒绝
         </el-button>
+        <el-button v-if="typeValue === 'detail' && approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
         <el-button v-if="typeValue === 'add'" type="primary" @click="submit">
           提交
         </el-button>
         <el-button v-if="typeValue === 'add' || typeValue === 'edit'" type="primary" @click="save">
           保存
         </el-button>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '3'" type="primary" @click="handleClick('revoke')">
-          撤回
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
@@ -544,7 +550,7 @@
             align="center"
           >
             <template v-if="item.value === 'equipmentNo' && (typeValue === 'add' || typeValue === 'edit')" #default="scope">
-              <el-input v-model="scope.row.equipmentNo" placeholder="请选择设备" class="input">
+              <el-input v-model="scope.row.equipmentNo" disabled placeholder="请选择设备" class="input">
                 <template #append>
                   <el-button size="small" @click="handleSelect(scope.$index, scope.row)">
                     选择
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 50b014c..13e05df 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -169,42 +169,6 @@
   $router.push({ path: '/receive/add', query: { typeValue: 'add' } })
 }
 
-// 导出
-const exportAll = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: '下载中请稍后',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (list.value.length > 0) {
-    const params = {
-      applyNo: listQuery.value.applyNo, // 申请编号
-      applyName: listQuery.value.applyName, // 申请名称
-      applyUnit: listQuery.value.applyUnit, // 申请部门
-      applyPerson: listQuery.value.applyPerson, // 申请人
-      startTime: listQuery.value.startTime, // 申请开始日期
-      endTime: listQuery.value.endTime, // 申请结束日期
-      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
-      processResult: listQuery.value.processResult, // 	处置结果
-      applyType: listQuery.value.applyType, // 申请类型 领用0
-      createUser: listQuery.value.createUser, // 创建人
-      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
-      offset: 1,
-      limit: 20,
-      ids: checkoutList.value,
-    }
-    // 调导出接口
-    exportReceiveApplyList(params).then((res) => {
-      const blob = new Blob([res.data])
-      exportFile(blob, '设备领用申请列表.xlsx')
-    })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
-}
-
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -450,7 +414,6 @@
     <table-container>
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/device/receive/applyList/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/device/receive/applyList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
diff --git a/src/views/device/receive/solve/solveDetail.vue b/src/views/device/receive/solve/solveDetail.vue
index e0fc823..927ac8b 100644
--- a/src/views/device/receive/solve/solveDetail.vue
+++ b/src/views/device/receive/solve/solveDetail.vue
@@ -134,55 +134,55 @@
     </detail-page>
     <div id="lysq" class="lysq-create-check">
       <div class="top-info">
-        <detail-block title="领用申请">
-          <div class="form-area">
-            <el-form
-              ref="ruleFormRef"
-              :model="form"
-              label-width="120px"
-            >
-              <el-row :gutter="24">
-                <el-col :span="6">
-                  <el-form-item label="申请名称" prop="applyName">
-                    <el-input v-model="form.applyName" disabled />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="申请单位" prop="applyUnit">
-                    <dept-select
-                      v-model="form.applyUnit"
-                      :data="useDeptList"
-                      disabled
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="申请人" prop="applyPerson">
-                    <el-select v-model="form.applyPerson" disabled style="width: 100%;">
-                      <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="领用时间" prop="time">
-                    <el-date-picker
-                      v-model="form.time"
-                      type="datetime"
-                      format="YYYY-MM-DD hh:mm"
-                      value-format="YYYY-MM-DD hh:mm"
-                      disabled
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="申请说明" prop="applyDesc">
-                    <el-input v-model="form.applyDesc" type="textarea" disabled autosize />
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </el-form>
-          </div>
-        </detail-block>
+        <!-- <detail-block title="领用申请"> -->
+        <div class="form-area">
+          <el-form
+            ref="ruleFormRef"
+            :model="form"
+            label-width="120px"
+          >
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="申请名称" prop="applyName">
+                  <el-input v-model="form.applyName" disabled />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="申请单位" prop="applyUnit">
+                  <dept-select
+                    v-model="form.applyUnit"
+                    :data="useDeptList"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="申请人" prop="applyPerson">
+                  <el-select v-model="form.applyPerson" disabled style="width: 100%;">
+                    <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="领用时间" prop="time">
+                  <el-date-picker
+                    v-model="form.time"
+                    type="datetime"
+                    format="YYYY-MM-DD hh:mm"
+                    value-format="YYYY-MM-DD hh:mm"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="申请说明" prop="applyDesc">
+                  <el-input v-model="form.applyDesc" type="textarea" disabled autosize />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </div>
+        <!-- </detail-block> -->
       </div>
       <detail-block title="设备领用列表">
         <el-table
diff --git a/src/views/device/receive/solve/solveList.vue b/src/views/device/receive/solve/solveList.vue
index ec1e8bb..93bee2c 100644
--- a/src/views/device/receive/solve/solveList.vue
+++ b/src/views/device/receive/solve/solveList.vue
@@ -138,8 +138,6 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // listQuery.value.startTime = timeRange.value[0] as string || ''
-  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiveApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IsolveListType) => {
       return {
diff --git a/src/views/device/standingBook/standingBook-interface.ts b/src/views/device/standingBook/standingBook-interface.ts
index e3cf134..4d239dd 100644
--- a/src/views/device/standingBook/standingBook-interface.ts
+++ b/src/views/device/standingBook/standingBook-interface.ts
@@ -28,6 +28,7 @@
   name: string
   id: string
   value: string
+  isSelectItemDisabled?: boolean // 选择项目禁用
 }
 // 部门类型
 export interface deptType {
diff --git a/src/views/device/stateManage/components/selectDevice.vue b/src/views/device/stateManage/components/selectDevice.vue
index eddd910..237e92a 100644
--- a/src/views/device/stateManage/components/selectDevice.vue
+++ b/src/views/device/stateManage/components/selectDevice.vue
@@ -43,6 +43,7 @@
     text: '管理状态',
     value: 'managerStateName',
     align: 'center',
+    width: '120',
   },
   {
     text: '使用人',
@@ -54,7 +55,6 @@
     value: 'validDate',
     align: 'center',
     width: '120',
-
   },
 ])
 // 选中的内容
@@ -148,8 +148,13 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[20]"
-        :list-loading="loadingTable" is-showmulti-select
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :page-sizes="[20]"
+        :list-loading="loadingTable"
+        is-showmulti-select
         :height="260"
         @change="changePage"
         @multi-select="handleSelectionChange"
diff --git a/src/views/device/stateManage/components/selectDeviceDialog.vue b/src/views/device/stateManage/components/selectDeviceDialog.vue
index 12cd563..6d63d54 100644
--- a/src/views/device/stateManage/components/selectDeviceDialog.vue
+++ b/src/views/device/stateManage/components/selectDeviceDialog.vue
@@ -2,48 +2,85 @@
 <script lang="ts" setup name="ReceiveDialog">
 import { ref } from 'vue'
 import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
 import type { IdeviceList } from './status-interface'
 import useUserStore from '@/store/modules/user'
 import { listPageApi } from '@/api/device/standingBook'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-
+import { getDictByCode } from '@/api/system/dict'
+import type { selectType } from '@/views/device/standingBook/standingBook-interface'
+import { getStatusList } from '@/api/device/stateManage'
+import { SCHEDULE } from '@/utils/scheduleDict'
 const props = defineProps({
   dialogSelectDiviceVisible: {
     type: Boolean,
     default: false,
   },
-  isMulti: Boolean,
+  isMulti: Boolean, // 是否多选
+  statusTypeName: { // 状态管理类型
+    type: String,
+    default: '',
+  },
 })
+// 提醒文字
 const emits = defineEmits(['closeDialog', 'updateDeviceConfirm'])
+const defineMessageTest = ref('') // 提醒文字
 const loadingTable = ref<boolean>(false)
 const userStore = useUserStore()
 // 查询条件
 const listQuery = ref({
   equipmentName: '', // 设备名称
   equipmentNo: '', // 设备编号
+  managerState: '', // 管理状态
   offset: 1,
   limit: 20,
 })
 const total = ref(20)
 // 多选选中的内容
-const checkoutList = ref([])
-
+const checkoutList = ref([]) as any
+const isSelectDisabled = ref(false) // 状态管理筛选框是否禁用
 const list = ref([])// 表格数据
 const columns = ref<TableColumn[]>([
   { text: '设备名称', value: 'equipmentName', align: 'center', fixed: true },
-  { text: '设备编号', value: 'equipmentNo', align: 'center', fixed: true },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', fixed: true, width: '160' },
   { text: '型号', value: 'modelNo', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '管理状态', value: 'managerStateName', align: 'center' },
+  { text: '管理状态', value: 'managerStateName', align: 'center', width: '120' },
   { text: '使用人', value: 'usePersonName', align: 'center' },
-  { text: '有效日期', value: 'validDate', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center', width: '120' },
 ])
 const table = ref()
 const dialogTableVisible = ref(false)// 控制对话框显隐
-
+// 获取数据
+const managerStateList = ref<selectType[]>([])
+const getDict = () => {
+  // 获取管理状态
+  getDictByCode('managerState').then((response) => {
+    managerStateList.value = response.data.map((item: { name: string; isSelectItemDisabled: boolean }) => {
+      if (props.statusTypeName === '闲置' && item.name !== '在用(启封)') {
+        item.isSelectItemDisabled = true
+      }
+      else if (props.statusTypeName === '封存' && (item.name !== '在用(启封)' && item.name !== '闲置')) {
+        item.isSelectItemDisabled = true
+      }
+      else if (props.statusTypeName === '启封' && (item.name !== '封存' && item.name !== '闲置')) {
+        item.isSelectItemDisabled = true
+      }
+      else if (props.statusTypeName === '报废' && (item.name !== '在用(启封)' && item.name !== '闲置' && item.name !== '封存')) {
+        item.isSelectItemDisabled = true
+      }
+      else if (props.statusTypeName === '处置' && item.name !== '报废') {
+        item.isSelectItemDisabled = true
+      }
+      return item
+    })
+  })
+}
+getDict()
 // 获取数据列表
 const fetchData = () => {
   loadingTable.value = true
+  listQuery.value.limit = props.isMulti ? 20 : 5
   listPageApi(listQuery.value).then((res) => {
     list.value = res.data.rows.map((item: IdeviceList) => {
       return {
@@ -64,12 +101,38 @@
     table.value.clearMulti() // 清除多选选中
   }
 })
+watch(() => props.statusTypeName, (val) => {
+  if (val === '闲置') {
+    defineMessageTest.value = '在用(启封)'
+    listQuery.value.managerState = '1' // 启封 // 默认查询哪个状态
+  }
+  else if (val === '封存') {
+    defineMessageTest.value = '闲置、在用(启封)'
+    listQuery.value.managerState = '1' // 启封
+  }
+  else if (val === '启封') {
+    defineMessageTest.value = '闲置、封存'
+    listQuery.value.managerState = '3' // 封存
+  }
+  else if (val === '报废') {
+    defineMessageTest.value = '闲置、封存、在用(启封)'
+    listQuery.value.managerState = '1' // 启封
+  }
+  else if (val === '处置') {
+    defineMessageTest.value = '报废'
+    listQuery.value.managerState = '4' // 报废
+  }
+})
 // 关闭对话框
 const close = () => {
   emits('closeDialog')
 }
 // 确认
 const confirm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return
+  }
   emits('updateDeviceConfirm', checkoutList.value)
   close()
 }
@@ -101,7 +164,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogTableVisible" width="60%" title="选择设备" class="select-device-dialog" @close="close">
+  <el-dialog v-model="dialogTableVisible" width="65%" title="选择设备" class="select-device-dialog" @close="close">
     <search-area
       :need-clear="true"
       @search="searchList" @clear="clearList"
@@ -120,8 +183,19 @@
           clearable
         />
       </search-item>
+      <search-item>
+        <el-select v-model="listQuery.managerState" class="m-2" placeholder="管理状态" clearable>
+          <el-option
+            v-for="item in managerStateList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+            :disabled="item.isSelectItemDisabled"
+          />
+        </el-select>
+      </search-item>
     </search-area>
-    <table-container>
+    <div style="padding: 12px;">
       <normal-table
         ref="table"
         :data="list"
@@ -131,8 +205,8 @@
         :is-multi="isMulti"
         is-showmulti-select
         :list-loading="loadingTable"
-        :page-sizes="[20]"
-        :height="240"
+        :page-sizes="isMulti ? [20] : [5]"
+        :height="260"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
@@ -144,8 +218,10 @@
           </el-table-column>
         </template>
       </normal-table>
-    </table-container>
-
+    </div>
+    <div style="font-size: 14px;">
+      <span style="color: #f56c6c;">*注意：只能查询管理状态为 <span style="color: #3d7eff;">{{ defineMessageTest }}</span> 的设备</span>
+    </div>
     <template #footer>
       <span class="dialog-footer">
         <el-button @click="close">取消</el-button>
diff --git a/src/views/device/stateManage/components/status-interface.ts b/src/views/device/stateManage/components/status-interface.ts
index dd27189..acb9b35 100644
--- a/src/views/device/stateManage/components/status-interface.ts
+++ b/src/views/device/stateManage/components/status-interface.ts
@@ -41,6 +41,7 @@
   time: string // 时间
   updateTime: string // 修改时间
   version: string // 版本
+  decisionItem?: string | number
 }
 
 // 删除/提交/取消
@@ -72,6 +73,9 @@
   equipmentSpecifications?: string | undefined
   manufacturingNo?: string | undefined
   manufacturer?: string | undefined
+  isRadioDisabled?: boolean // 禁用单选按钮
+  isMultiDisabled?: boolean // 禁用多选框
+  isSelectItemDisabled?: boolean // 选择器选项禁用
 }
 
 export interface IdeviceListQuery {
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 73f8ddb..114d99c 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -1,36 +1,38 @@
 <!-- 新增或详情弹窗 设备借用处理新增编辑 -->
 <script lang="ts" setup name="TemplateAdd">
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import type { EquipmentListRow } from './status-interface'
 // import addRow from './addRow.vue'
 import SelectDeviceDialog from './selectDeviceDialog.vue'
-import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
 import { addStatus, detailStatus, submitStatus, updateRejectStatus, updateStatus } from '@/api/device/stateManage'
 import useUserStore from '@/store/modules/user'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue' // 审批对话ref
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { cancelApproval, fetchApproval } from '@/api/approval'
-
+const approvalDialog = ref()
 const user = useUserStore() // 用户信息
 const $route = useRoute()
 const userInfo = useUserStore()
 const $router = useRouter()
-const ruleFormRef1 = ref() // from组件
-const ruleFormRef2 = ref() // from组件
+const ruleFormRef = ref() // from组件
 const title = ref('')
 const name = ref('')
 const isMulti = ref(false) // 是否批量添加(允许多选)
 const dialogSelectDiviceVisible = ref(false) // 控制选择设备对话框显隐
 const processId = ref('')
-const _approvalStatusName = $route.query.approvalStatusName
-const _title = $route.query.title
+const decisionItem = ref('') // 同意、驳回、拒绝按钮权限
+const taskId = ref('') // 任务id，用于同意、驳回、拒绝审批
+const _approvalStatusName = ref('')
+const statusTypeName = ref('') // 状态管理类型
+
 // 状态管理
 const ruleForm = ref({
   applyType: $route.query.applyType, // 申请类型
@@ -70,76 +72,21 @@
 watch(() => ruleForm.value, (newVal) => {
   if (name.value === '详情') {
     if (newVal.applyUnit) {
-      ruleFormRef1.value.validateField('applyUnit')
+      ruleFormRef.value.validateField('applyUnit')
     }
     if (newVal.applyPerson) {
-      ruleFormRef1.value.validateField('applyPerson')
+      ruleFormRef.value.validateField('applyPerson')
     }
   }
 }, {
   deep: true,
   immediate: true,
 })
-const assetTypeList = ref<selectType[]>([]) // 资产类型
-const ABCList = ref<selectType[]>([]) // ABC
-const mesureTypeList = ref<selectType[]>([]) // 检定方式
-const majorCategoryList = ref<selectType[]>([]) // 专业分类
-const equipmentCategoryList = ref<selectType[]>([]) // 设备类别
-const mesureResultList = ref<selectType[]>([]) //  检定结果
-const equipmentTypeList = ref<selectType[]>([]) // 设备类型
-const managerLevelList = ref<selectType[]>([]) // 管理级别
-const depreciationMethodList = ref<selectType[]>([]) // 折旧方法
-const managerStateList = ref<selectType[]>([]) // 管理状态
-const capitalSourceList = ref<selectType[]>([]) // 资本来源
 const usePersonList = ref<userType[]>([]) // 使用人列表
 const useDeptList = ref<deptType[]>([]) // 使用部门列表
 const useDeptListNoTree = ref([]) // 使用部门列表非树结构
 // 获取字典
 const fetchData = () => {
-// 获取资产类型
-  getDictByCode('assetType').then((response) => {
-    assetTypeList.value = response.data
-  })
-  // 获取ABC
-  getDictByCode('ABC').then((response) => {
-    ABCList.value = response.data
-  })
-  // 获取检定方式
-  getDictByCode('mesureType').then((response) => {
-    mesureTypeList.value = response.data
-  })
-  // 获取专业分类
-  getDictByCode('majorCategory').then((response) => {
-    majorCategoryList.value = response.data
-  })
-  // 获取检定结果
-  getDictByCode('mesureResult').then((response) => {
-    mesureResultList.value = response.data
-  })
-  // 获取设备类别
-  getDictByCode('equipmentCategory').then((response) => {
-    equipmentCategoryList.value = response.data
-  })
-  // 获取设备类型
-  getDictByCode('equipmentType').then((response) => {
-    equipmentTypeList.value = response.data
-  })
-  // 获取管理级别
-  getDictByCode('managerLevel').then((response) => {
-    managerLevelList.value = response.data
-  })
-  // 获取折旧方法
-  getDictByCode('depreciationMethod').then((response) => {
-    depreciationMethodList.value = response.data
-  })
-  // 获取管理状态
-  getDictByCode('managerState').then((response) => {
-    managerStateList.value = response.data
-  })
-  // 获取资本来源
-  getDictByCode('capitalSource').then((response) => {
-    capitalSourceList.value = response.data
-  })
   // 获取用户列表
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
     usePersonList.value = res.data.rows
@@ -172,6 +119,12 @@
     })
   }
 }
+// 关闭弹窗
+const close = () => {
+  $router.back()
+}
+
+// -----------------------------------------审批----------------------------------------
 const approvalRecordData = ref([]) // 审批流程数据
 // 查询审批记录
 function getApprovalRecord(processId: string) {
@@ -187,49 +140,49 @@
   }
 }
 
-// 关闭弹窗
-const close = () => {
-  $router.back()
+// 审批结束回调
+const approvalSuccess = () => {
+  close() // 返回上一页
 }
-
-// 状态管理编辑
-const statusManageEdit = () => {
-  if (title.value == '编辑') {
-    if (ruleForm.value.equipmentList && ruleForm.value.equipmentList[0]) {
-      ruleForm.value.equipmentId = ruleForm.value.equipmentList[0].equipmentId
-      // delete ruleForm.value.equipmentList
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: processId.value!,
+      comments: '',
     }
-    updateStatus(ruleForm.value).then((res) => {
-      if (res.code === 200) {
-        ElMessage.success('操作成功!')
-        $router.back()
-      }
-      else {
-        ElMessage.warning(res.message)
-      }
-    })
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', taskId.value)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', taskId.value)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', taskId.value)
   }
 }
+// ------------------------------------------------------------------------------------------
 
-// 驳回编辑
-const statusManageRejectEdit = () => {
-  if (title.value == '编辑') {
-    if (ruleForm.value.equipmentList && ruleForm.value.equipmentList[0]) {
-      ruleForm.value.equipmentId = ruleForm.value.equipmentList[0].equipmentId
-      // delete ruleForm.value.equipmentList
-    }
-    updateRejectStatus(ruleForm.value).then((res) => {
-      if (res.code === 200) {
-        ElMessage.success('操作成功!')
-        $router.back()
-      }
-      else {
-        ElMessage.warning(res.message)
-      }
-    })
-  }
-}
-// 新建 状态管理保存
+// 保存
 const statusManageSave = async (formEl1: FormInstance | undefined) => {
   if (!formEl1) { return }
   await formEl1.validate((valid, fields) => {
@@ -243,26 +196,70 @@
           type: 'warning',
         },
       ).then((res) => {
-        ruleForm.value.equipmentList[0].assetOriginValue = ruleForm.value.assetOriginValue
-        ruleForm.value.equipmentList[0].financialValue = ruleForm.value.financialValue
-        addStatus(ruleForm.value).then((res) => {
-          if (res.code === 200) {
-            ElMessage.success('操作成功!')
-            ruleForm.value.id = res.data
-          }
-          else {
-            ElMessage.warning(res.message)
-          }
+        const loading = ElLoading.service({
+          lock: true,
+          background: 'rgba(255, 255, 255, 0.8)',
         })
+        if (title.value === '新建') { // 新建
+          ruleForm.value.equipmentList[0].assetOriginValue = ruleForm.value.assetOriginValue
+          ruleForm.value.equipmentList[0].financialValue = ruleForm.value.financialValue
+          addStatus(ruleForm.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('操作成功!')
+              ruleForm.value.id = res.data
+              loading.close()
+            }
+            else {
+              ElMessage.warning(res.message)
+              loading.close()
+            }
+          })
+        }
+        else { // 编辑
+          if (_approvalStatusName.value === '未通过-驳回') {
+            if (ruleForm.value.equipmentList && ruleForm.value.equipmentList[0]) {
+              ruleForm.value.equipmentId = ruleForm.value.equipmentList[0].equipmentId
+              // delete ruleForm.value.equipmentList
+            }
+            updateRejectStatus(ruleForm.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('操作成功!')
+                loading.close()
+                $router.back()
+              }
+              else {
+                ElMessage.warning(res.message)
+                loading.close()
+              }
+            })
+          }
+          else { // 草稿箱、已取消
+            if (ruleForm.value.equipmentList && ruleForm.value.equipmentList[0]) {
+              ruleForm.value.equipmentId = ruleForm.value.equipmentList[0].equipmentId
+              // delete ruleForm.value.equipmentList
+            }
+            updateStatus(ruleForm.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('操作成功!')
+                loading.close()
+                $router.back()
+              }
+              else {
+                ElMessage.warning(res.message)
+                loading.close()
+              }
+            })
+          }
+        }
       })
     }
   })
 }
 
-// 新建 状态管理提交
+// 提交
 const statusManageSubmit = async (formEl1: FormInstance | undefined) => {
   if (ruleForm.value.id === '') {
-    ElMessage.warning('请保存之后再提交!')
+    ElMessage.warning('请先保存再提交!')
     return
   }
   if (!formEl1) { return }
@@ -294,15 +291,7 @@
     }
   })
 }
-// 取消
-const resetForm = () => {
-  close()
-}
-// 编辑当前
-const editForm = () => {
-  // 并且隐藏编辑按钮
-  title.value = '编辑'
-}
+
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -314,6 +303,10 @@
     for (var i = 0; i < files.length; i++) {
       fd.append('multipartFile', files[i])
     }
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     UploadFile(fd).then((res) => {
       console.log(res)
       if (res.code === 200 && res.data.length >= 1) {
@@ -325,11 +318,13 @@
           // id: '',
           })
         }
-        ruleFormRef1.value?.clearValidate('minioFileName')
+        ruleFormRef.value?.clearValidate('minioFileName')
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
+        loading.close()
         ElMessage.error(res.message)
       }
     })
@@ -343,16 +338,6 @@
   fileRef.value.click()
 }
 
-// 已取消状态
-const isCancel = computed(() => {
-  if ($route.query?.approvalStatus === '6' || $route.query?.approvalStatusName === '已取消') {
-    return true
-  }
-  else {
-    return false
-  }
-})
-
 // 设备状态管理
 const addRowBtn = () => {
   dialogSelectDiviceVisible.value = true // 选择设备对话框显隐
@@ -374,23 +359,25 @@
   ruleForm.value.equipmentSpecifications = device.equipmentSpecifications as string
   ruleForm.value.manufacturingNo = device.manufacturingNo as string
   ruleForm.value.manufacturer = device.manufacturer as string
-  ruleFormRef1.value.clearValidate('equipmentNo')
+  ruleFormRef.value.clearValidate('equipmentNo')
   // 赋值
   ruleForm.value.equipmentList = [{
     equipmentId: device.id as string,
   }]
   return false
 }
-
 onMounted(() => {
   initDialog($route.query)
-  console.log(name.value, 'pppppp')
   const tempName = name.value.substring(2, 4)
+  statusTypeName.value = tempName
   ruleForm.value.applyName = `设备${tempName}申请` // 申请名称固定
   ruleForm.value.applyUnit = user.deptId // 申请单位
   ruleForm.value.applyUnitName = user.deptName // 申请单位名称
   ruleForm.value.applyPerson = user.id // 申请人
   ruleForm.value.applyPersonName = user.name // 申请人名称
+  decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
+  taskId.value = $route.query.taskId as string // 流程实例id
+  _approvalStatusName.value = $route.query.approvalStatusName as string // 审批状态名称
 })
 </script>
 
@@ -398,47 +385,30 @@
   <app-container style="overflow: hidden;">
     <detail-page :title="`${name}-${title}`">
       <template #btns>
-        <!-- 状态管理 -->
-        <template>
-          <!-- 新建 -->
-          <el-button v-if="title === '新建'" type="primary" @click="statusManageSubmit(ruleFormRef1)">
-            提交
-          </el-button>
-          <el-button v-if="title === '新建'" type="primary" @click="statusManageSave(ruleFormRef1)">
-            保存
-          </el-button>
-          <!-- 草稿箱 + 已取消 -->
-          <el-button v-if="_approvalStatusName === '草稿箱' || _approvalStatusName === '已取消'" type="primary" @click="statusManageEdit">
-            保存
-          </el-button>
-          <!-- 未通过-驳回 -->
-          <el-button v-if="title === '编辑' && _approvalStatusName === '未通过-驳回'" type="primary" @click="statusManageRejectEdit">
-            保存
-          </el-button>
-          <!-- 待审批 -->
-          <!-- <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
-            同意
-          </el-button>
-          <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'reject' })">
-            驳回
-          </el-button>
-          <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'refuse' })">
-            拒绝
-          </el-button> -->
-          <!-- </template> -->
-        </template>
-        <el-button v-if="(title === '详情' && $route.query?.approvalStatusName === '草稿箱' && isCancel)" type="primary" @click="editForm">
-          编辑
+        <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
         </el-button>
-        <!-- <el-button v-if="isCancel" type="primary" @click="deleteForm">
-          删除
-        </el-button> -->
-        <el-button type="info" @click="resetForm()">
+        <el-button v-if="title === '详情' && _approvalStatusName === '待审批' && decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="title === '详情' && _approvalStatusName === '待审批' && decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="title === '详情' && _approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
+        <el-button v-if="title === '新建'" type="primary" @click="statusManageSubmit(ruleFormRef)">
+          提交
+        </el-button>
+        <el-button v-if="title === '新建' || title === '编辑'" type="primary" @click="statusManageSave(ruleFormRef)">
+          保存
+        </el-button>
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
       <!-- 状态管理 -->
-      <el-form ref="ruleFormRef1" :model="ruleForm" :rules="rules1" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules1" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="申请单编号" prop="applyNo">
@@ -466,7 +436,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="设备编号" prop="equipmentNo" class="equipmentNo">
-              <el-input v-model.trim="ruleForm.equipmentNo" :placeholder="title === '详情' ? '' : '设备名称'" disabled>
+              <el-input v-model.trim="ruleForm.equipmentNo" :placeholder="title === '详情' ? ' ' : '设备编号'" disabled>
                 <template v-if="title !== '详情'" #append>
                   <el-button type="primary" size="small" @click="addRowBtn">
                     选择
@@ -477,12 +447,12 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备名称" prop="equipmentName">
-              <el-input v-model.trim="ruleForm.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" disabled />
+              <el-input v-model.trim="ruleForm.equipmentName" :placeholder="title === '详情' ? ' ' : '设备名称'" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="型号" prop="modelNo">
-              <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === '详情' ? '' : '型号'" disabled />
+              <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === '详情' ? ' ' : '型号'" disabled />
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
@@ -492,24 +462,25 @@
           </el-col> -->
           <el-col :span="6">
             <el-form-item label="出厂编号" prop="manufacturingNo">
-              <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" disabled />
+              <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === '详情' ? ' ' : '出厂编号'" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="生产厂家" prop="manufacturer">
-              <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" disabled />
+              <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === '详情' ? ' ' : '生产厂家'" disabled />
             </el-form-item>
           </el-col>
           <el-col v-if="name.substring(2, 4) !== '处置'" :span="6">
-            <el-form-item :label="`${name.substring(2, 4)}开始时间`" prop="time">
+            <el-form-item :label="`${name.substring(2, 4)}时间`" prop="time">
               <el-date-picker
                 v-model="ruleForm.time" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD hh:mm" :disabled="title === '详情'"
-                :placeholder="title === '详情' ? '' : `${name.substring(2, 4)}开始时间`"
+                :placeholder="title === '详情' ? '' : `${name.substring(2, 4)}时间`"
                 style="width: 100%;"
               />
             </el-form-item>
           </el-col>
-          <el-col v-else :span="6">
+          <!-- 处置的报废时间-后端通知暂时隐藏 -->
+          <!-- <el-col v-else :span="6">
             <el-form-item label="报废时间" prop="time">
               <el-date-picker
                 v-model="ruleForm.time" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD hh:mm" :disabled="title === '详情'"
@@ -517,7 +488,7 @@
                 style="width: 100%;"
               />
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col v-if="name.substring(2, 4) === '处置'" :span="6">
             <el-form-item label="资产原值(元)" prop="assetOriginValue">
               <el-input v-model.trim="ruleForm.assetOriginValue" :placeholder="title === '详情' ? '' : '资产原值'" :disabled="title === '详情'" />
@@ -543,7 +514,7 @@
                 上传
               </el-button>
               <div style="display: flex;">
-                <show-photo v-for="(item, index) in ruleForm.fileList" :key="item" :index="index" :minio-file-name="item.minioFileName || ''" style="display: inline-block;margin: 10px;">
+                <show-photo v-for="(item, index) in ruleForm.fileList" :key="item" :index="index" :minio-file-name="item.minioFileName || ''" style="display: inline-block;margin: 0 10px;">
                   <span v-if="title !== '详情'" class="photo-close" @click="del(index)">×</span>
                 </show-photo>
               </div>
@@ -559,11 +530,14 @@
       <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
     </detail-block>
     <select-device-dialog
+      :status-type-name="statusTypeName"
       :dialog-select-divice-visible="dialogSelectDiviceVisible"
       :is-multi="isMulti"
       @close-dialog="closeDialog"
       @updateDeviceConfirm="updateDeviceConfirm"
     />
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
 

diff --git a/.env.production b/.env.production
index 0fca4ad..ff5a80a 100644
--- a/.env.production
+++ b/.env.production
@@ -3,9 +3,9 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:21609
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-VITE_APP_API_BASEURL = http://192.168.2.96:8085
+# VITE_APP_API_BASEURL = http://192.168.2.96:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index f342066..9c4581f 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -196,7 +196,7 @@
 
       <el-table-column v-if="!isMulti" label="" width="60" align="center" fixed>
         <template #default="scope">
-          <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
+          <el-radio v-model="singleChecked" :disabled="scope.row.isRadioDisabled" :label="scope.row.id" class="radio" @change="radioChange" />
         </template>
       </el-table-column>
       <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index b2bfdba..f685105 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -462,7 +462,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column v-if="activeTitle === '已归还'" label="归还时间" width="160" align="center">
+          <el-table-column v-if="activeTitle === '已归还'" label="归还时间" width="180" align="center">
             <template #default="scope">
               {{ scope.row.backTime }}
             </template>
diff --git a/src/views/device/borrow/editHandle.vue b/src/views/device/borrow/editHandle.vue
index 0bd10c8..e3fe562 100644
--- a/src/views/device/borrow/editHandle.vue
+++ b/src/views/device/borrow/editHandle.vue
@@ -55,6 +55,7 @@
     form.value.applyPerson = res.data.applyPerson// 申请人
     form.value.time = res.data.time // 借用时间
     form.value.applyDesc = res.data.applyDesc // 申请说明
+    form.value.backTime = res.data.backTime // 归还时间
     list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
       return {
         ...item,
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index 0ada9c2..a884fd8 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -19,6 +19,7 @@
   remark: string // 备注
   updateTime: null | string // 更新时间
   approvalStatusName?: string // 审批状态名称
+  decisionItem?: string | number
 }
 // 标准配套设备表头类型
 export interface columnsType {
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 7f02a38..ba6cc7d 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -254,7 +254,13 @@
 }
 // 跳转到详情
 const goDetail = (row: IlistApproval, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`)
+  $router.push({
+    path: `/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`,
+    query: {
+      decisionItem: `${row.decisionItem}`, // 同意、驳回、拒绝
+      taskId: row.taskId,
+    },
+  })
 }
 // 获取到组织信息
 const getDept = () => {
@@ -275,7 +281,7 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    submitEquipmentApply({ id: row.id, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
+    submitEquipmentApply({ id: row.id, formId: SCHEDULE.DEVICE_FIX_APPROVAL, processId: row.processId }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -488,20 +494,8 @@
               >
                 取消
               </el-button>
-              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <!-- <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                @click="clickBtn(row, '删除')"
-              >
-                删除
-              </el-button> -->
-              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
               <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
index 35cbba2..5584541 100644
--- a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -1,10 +1,12 @@
 <!-- 设备检修列表新增、编辑、详情 -->
 <script lang="ts" setup name="maintenanceDetail">
 import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox, rowContextKey } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
+import { Row } from 'element-plus/es/components/table-v2/src/components'
 import type { IlistPageAddTypes, columnsType, returnRowType } from '../checkList_interface'
+import selectDeviceDialog from './selectDevice.vue'
 import { addEquipmentApply, equipmentApplyInfo, failUpdateEquipmentApply, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
@@ -13,17 +15,19 @@
 import type { userType } from '@/views/system/user/user-interface'
 import { cancelApproval, fetchApproval } from '@/api/approval'
 import { SCHEDULE } from '@/utils/scheduleDict'
-import addRow from '@/views/device/stateManage/components/selectDevice.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
 import useUserStore from '@/store/modules/user'
-
+const approvalDialog = ref() // 审批对话ref
 const user = useUserStore() // 用户信息
 const approvalRecord = ref() // 审批流程组件ref
 const infoId = ref('') // id
 const from = ref('') // reject代表未通过-驳回
 const buttonArray = ref<string[]>([])
 const pageType = ref('add') // 页面类型: add,edit, detail
+const decisionItem = ref('') // 同意、驳回、拒绝按钮权限
+const approvalStatusName = ref('') // 审批状态名称
+const taskId = ref('') // 任务id，用于同意、驳回、拒绝审批
 const textMap: { [key: string]: string } = {
   add: '新建',
   edit: '编辑',
@@ -167,44 +171,7 @@
 
 // 表格选中的数组
 const SelectionList = ref<object[]>([])
-// 取消
-const handleCancel = () => {
-  const params = {
-    processInstanceId: formInline.value.processId!,
-    comments: '取消审批',
-  }
-  ElMessageBox.confirm(
-    '确认取消该审批吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  ).then(() => {
-    cancelApproval(params).then(() => {
-      ElMessage.success('取消成功')
-    })
-  })
-}
-const approvalDialog = ref()
-// 点击数据后的操作按钮
-const clickBtn = (buttonType: string) => {
-  switch (buttonType) {
-    case '同意':
-      approvalDialog.value.initDialog('agree', formInline.value.taskId)
-      break
-    case '驳回':
-      approvalDialog.value.initDialog('reject', formInline.value.taskId)
-      break
-    case '拒绝':
-      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
-      break
-    case '取消':
-      handleCancel()
-      break
-  }
-}
+
 // 获取详情信息
 const getInfo = () => {
   equipmentApplyInfo({ id: infoId.value }).then((res) => {
@@ -302,10 +269,15 @@
   }
 }
 
-const addRowRef = ref()
+// ----------------------------------------------表格---------------------------------------
+const dialogSelectDiviceVisible = ref(false)
 // 点击批量增加
 const batchIncrease = () => {
-  addRowRef.value.initDialog({ title: '' })
+  dialogSelectDiviceVisible.value = true
+}
+// 选择设备对话框关闭
+const closeDialog = () => {
+  dialogSelectDiviceVisible.value = false
 }
 
 // 删除行
@@ -341,6 +313,8 @@
   })
 }
 
+// ----------------------------------------------------------------------------------
+
 // 选好申请人 userId用户id
 const changeSelectReceiver = (userId: string) => {
   // 在用户列表里找到选择的接收人的名字
@@ -362,18 +336,6 @@
     usePersonOptions.value = usePersonList.value
   }
 }
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
 // 获取部门列表
 const fetchDeptTreeList = () => {
   getDeptTreeList().then((res) => {
@@ -388,6 +350,7 @@
     usePersonOptions.value = res.data.rows
   })
 }
+// -------------------------------------------审批----------------------------------------
 const approvalRecordData = ref([]) // 审批流程数据
 // 查询审批记录
 function getApprovalRecord(processId: string) {
@@ -404,8 +367,45 @@
 }
 // 审批结束回调
 const approvalSuccess = () => {
-  getInfo()
+  close()
 }
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: formInline.value.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', taskId.value)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', taskId.value)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', taskId.value)
+  }
+}
+// ---------------------------------------------------------------------------------------
 onMounted(async () => {
   formInline.value.applyName = '设备检修申请' // 申请名称固定
   formInline.value.applyUnit = user.deptId // 申请单位
@@ -416,6 +416,11 @@
   await fetchUserList()
   await fetchDeptTreeList()
   formInline.value.processId = $route.params.processId as string // 任务id
+  decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
+  taskId.value = $route.query.taskId as string // 流程实例id
+  approvalStatusName.value = $route.params.approvalStatusName as string // 审批状态名称
+  console.log(approvalStatusName.value)
+
   formInline.value.approvalStatusName = $route.params.approvalStatusName as string // 任务id
   if (formInline.value.approvalStatusName !== '草稿箱') {
     getApprovalRecord(formInline.value.processId) // 查询审批记录
@@ -427,6 +432,18 @@
   <app-container>
     <detail-page :title="`${$route.meta.title}-${textMap[pageType]}`">
       <template #btns>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批' && decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批' && decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
         <el-button v-if="pageType === 'add'" type="primary" @click="submit">
           提交
         </el-button>
@@ -555,7 +572,7 @@
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection" width="55" />
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="55" />
         <el-table-column align="center" label="序号" width="60" type="index" />
         <el-table-column
           v-for="(item, index) in columns"
@@ -576,9 +593,14 @@
       <!-- 审批流程 -->
       <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
     </detail-block>
+    <!-- 审批弹窗 -->
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-    <!-- 借用设备列表 -->
-    <add-row ref="addRowRef" @add="confirmSelectDevice" />
+    <select-device-dialog
+      :dialog-select-divice-visible="dialogSelectDiviceVisible"
+      :is-multi="true"
+      @close-dialog="closeDialog"
+      @updateDeviceConfirm="confirmSelectDevice"
+    />
   </app-container>
 </template>
 
diff --git a/src/views/device/deviceMaintenance/components/selectDevice.vue b/src/views/device/deviceMaintenance/components/selectDevice.vue
new file mode 100644
index 0000000..3c04be6
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/selectDevice.vue
@@ -0,0 +1,216 @@
+<!-- 选择设备对话框 -->
+<script lang="ts" setup name="ReceiveDialog">
+import { ref } from 'vue'
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import type { IdeviceList } from '@/views/device/stateManage/components/status-interface'
+import useUserStore from '@/store/modules/user'
+import { listPageApi } from '@/api/device/standingBook'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { selectType } from '@/views/device/standingBook/standingBook-interface'
+import { getStatusList } from '@/api/device/stateManage'
+import { SCHEDULE } from '@/utils/scheduleDict'
+const props = defineProps({
+  dialogSelectDiviceVisible: {
+    type: Boolean,
+    default: false,
+  },
+  isMulti: Boolean, // 是否多选
+  statusTypeName: { // 状态管理类型
+    type: String,
+    default: '',
+  },
+})
+// 提醒文字
+const emits = defineEmits(['closeDialog', 'updateDeviceConfirm'])
+const defineMessageTest = ref('闲置、封存、在用(启封)') // 提醒文字
+const loadingTable = ref<boolean>(false)
+const userStore = useUserStore()
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  managerState: '1', // 管理状态 // 默认在用(启封)
+  offset: 1,
+  limit: 20,
+})
+const total = ref(20)
+// 多选选中的内容
+const checkoutList = ref([]) as any
+const list = ref([])// 表格数据
+const columns = ref<TableColumn[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center', fixed: true },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', fixed: true, width: '160' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '管理状态', value: 'managerStateName', align: 'center', width: '120' },
+  { text: '使用人', value: 'usePersonName', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center', width: '120' },
+])
+const table = ref()
+const dialogTableVisible = ref(false)// 控制对话框显隐
+// 获取数据
+const managerStateList = ref<selectType[]>([])
+const getDict = () => {
+  // 获取管理状态
+  getDictByCode('managerState').then((response) => {
+    managerStateList.value = response.data.map((item: { name: string; isSelectItemDisabled: boolean }) => {
+      if (item.name === '报废' || item.name === '处置') {
+        item.isSelectItemDisabled = true
+      }
+      return item
+    })
+  })
+}
+getDict()
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listQuery.value.limit = props.isMulti ? 20 : 5
+  listPageApi(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: IdeviceList) => {
+      return {
+        ...item,
+        validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+      }
+    })
+    total.value = res.data.total
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+watch(() => props.dialogSelectDiviceVisible, (newValue) => {
+  dialogTableVisible.value = newValue
+  fetchData()
+  if (!newValue) {
+    table.value.clearMulti() // 清除多选选中
+  }
+})
+
+// 关闭对话框
+const close = () => {
+  emits('closeDialog')
+}
+// 确认
+const confirm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return
+  }
+  emits('updateDeviceConfirm', checkoutList.value)
+  close()
+}
+// 重置
+const clearList = () => {
+  listQuery.value.equipmentName = ''
+  listQuery.value.equipmentNo = ''
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData()
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  console.log('多选', val)
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogTableVisible" width="65%" title="选择设备" class="select-device-dialog" @close="close">
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentName"
+          placeholder="设备名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentNo"
+          placeholder="设备编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.managerState" class="m-2" placeholder="管理状态" clearable>
+          <el-option
+            v-for="item in managerStateList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+            :disabled="item.isSelectItemDisabled"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+    <div style="padding: 12px;">
+      <normal-table
+        ref="table"
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :is-multi="isMulti"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :page-sizes="isMulti ? [20] : [5]"
+        :height="260"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <div style="font-size: 14px;">
+      <span style="color: #f56c6c;">*注意：只能查询管理状态为 <span style="color: #3d7eff;">{{ defineMessageTest }}</span> 的设备</span>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="close">取消</el-button>
+        <el-button type="primary" @click="confirm">
+          确定
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.receive-dialog {
+  .receive-dialog-item {
+    display: flex;
+    align-items: center;
+    margin-bottom: 28px;
+
+    .text {
+      margin-right: 30px;
+      white-space: nowrap;
+    }
+  }
+}
+</style>
diff --git a/src/views/device/receive/apply/applyEdit.vue b/src/views/device/receive/apply/applyEdit.vue
index 13e9528..8b50fc0 100644
--- a/src/views/device/receive/apply/applyEdit.vue
+++ b/src/views/device/receive/apply/applyEdit.vue
@@ -10,6 +10,7 @@
 import SelectDeviceDialog from '../selectDeviceDialog.vue'
 import { toTreeList } from '@/utils/structure'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import {
   failUpdateEquipmentApply,
@@ -22,9 +23,9 @@
 import type { deptType } from '@/views/device/standingBook/standingBook-interface'
 import { getDeptTreeList } from '@/api/system/dept'
 import { getUserList } from '@/api/system/user'
-import { fetchApproval, submitApproval } from '@/api/approval'
 import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
 import useUserStore from '@/store/modules/user'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 
 const user = useUserStore() // 用户信息
 const $route = useRoute()
@@ -39,6 +40,8 @@
 const isMulti = ref(false) // 是否批量添加(允许多选)
 const selectIndex = ref() // 点击选择的index--点击第几行
 const dialogSelectDiviceVisible = ref(false) // 控制选择设备对话框显隐
+const decisionItem = ref('') // 同意、驳回、拒绝按钮权限
+const taskId = ref('') // 任务id，用于同意、驳回、拒绝审批
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
@@ -88,42 +91,6 @@
   $router.back()
 }
 
-const handleClick = (val: string) => {
-  if (val === 'agree') { // 同意
-    approvalDialog.value.initDialog('agree', form.value.taskId)
-  }
-  else if (val === 'reject') { // 驳回
-    approvalDialog.value.initDialog('reject', form.value.taskId)
-  }
-  else if (val === 'refuse') { // 拒绝
-    approvalDialog.value.initDialog('refuse', form.value.taskId)
-  }
-  else if (val === 'revoke') {
-    const params = {
-      taskId: form.value.taskId!,
-      comments: '',
-    }
-    ElMessageBox.confirm(
-      '确认撤回该审批吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        submitApproval('revoke', params).then((res) => {
-          ElMessage({
-            type: 'success',
-            message: '已撤回',
-          })
-        })
-        close()
-      })
-  }
-}
-
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
@@ -314,11 +281,6 @@
   })
 }
 
-// 审批结束回调
-const approvalSuccess = () => {
-  close()
-}
-
 // 编辑、详情--获取详细信息
 const fetchReceiveApplyListDetail = () => {
   getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
@@ -355,6 +317,7 @@
   }
 }
 
+// ---------------------------------------------审批--------------------------------------
 const approvalRecordData = ref([]) // 审批流程数据
 // 查询审批记录
 function getApprovalRecord(processId: string) {
@@ -369,6 +332,47 @@
     }
   }
 }
+// 审批结束回调
+const approvalSuccess = () => {
+  close()
+}
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: form.value.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', taskId.value)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', taskId.value)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', taskId.value)
+  }
+}
+// --------------------------------------------------------------------------------------
 
 onMounted(() => {
   typeValue.value = $route.query.typeValue // 类型add、edit、detail
@@ -376,6 +380,8 @@
   form.value.taskId = $route.query.taskId as string // 任务id
   form.value.processId = $route.query.processId as string // 任务id
   approvalStatus.value = $route.query.approvalStatus // 审批类型
+  decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
+  taskId.value = $route.query.taskId as string // 流程实例id
   approvalStatusName.value = $route.query.approvalStatusName // 审批类型名称
   form.value.applyName = '设备领用申请' // 申请名称固定
   form.value.applyUnit = user.deptId // 申请单位
@@ -401,24 +407,24 @@
   <app-container>
     <detail-page :title="`设备领用申请-${textMap[typeValue]}`">
       <template #btns>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('agree')">
+        <el-button v-if="typeValue === 'detail' && approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
           同意
         </el-button>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('reject')">
+        <el-button v-if="typeValue === 'detail' && approvalStatusName === '待审批' && decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
           驳回
         </el-button>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('refuse')">
+        <el-button v-if="typeValue === 'detail' && approvalStatusName === '待审批' && decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
           拒绝
         </el-button>
+        <el-button v-if="typeValue === 'detail' && approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
         <el-button v-if="typeValue === 'add'" type="primary" @click="submit">
           提交
         </el-button>
         <el-button v-if="typeValue === 'add' || typeValue === 'edit'" type="primary" @click="save">
           保存
         </el-button>
-        <el-button v-if="typeValue === 'edit' && approvalStatus === '3'" type="primary" @click="handleClick('revoke')">
-          撤回
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
@@ -544,7 +550,7 @@
             align="center"
           >
             <template v-if="item.value === 'equipmentNo' && (typeValue === 'add' || typeValue === 'edit')" #default="scope">
-              <el-input v-model="scope.row.equipmentNo" placeholder="请选择设备" class="input">
+              <el-input v-model="scope.row.equipmentNo" disabled placeholder="请选择设备" class="input">
                 <template #append>
                   <el-button size="small" @click="handleSelect(scope.$index, scope.row)">
                     选择
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 50b014c..13e05df 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -169,42 +169,6 @@
   $router.push({ path: '/receive/add', query: { typeValue: 'add' } })
 }
 
-// 导出
-const exportAll = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: '下载中请稍后',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (list.value.length > 0) {
-    const params = {
-      applyNo: listQuery.value.applyNo, // 申请编号
-      applyName: listQuery.value.applyName, // 申请名称
-      applyUnit: listQuery.value.applyUnit, // 申请部门
-      applyPerson: listQuery.value.applyPerson, // 申请人
-      startTime: listQuery.value.startTime, // 申请开始日期
-      endTime: listQuery.value.endTime, // 申请结束日期
-      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
-      processResult: listQuery.value.processResult, // 	处置结果
-      applyType: listQuery.value.applyType, // 申请类型 领用0
-      createUser: listQuery.value.createUser, // 创建人
-      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
-      offset: 1,
-      limit: 20,
-      ids: checkoutList.value,
-    }
-    // 调导出接口
-    exportReceiveApplyList(params).then((res) => {
-      const blob = new Blob([res.data])
-      exportFile(blob, '设备领用申请列表.xlsx')
-    })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
-}
-
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -450,7 +414,6 @@
     <table-container>
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/device/receive/applyList/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/device/receive/applyList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
diff --git a/src/views/device/receive/solve/solveDetail.vue b/src/views/device/receive/solve/solveDetail.vue
index e0fc823..927ac8b 100644
--- a/src/views/device/receive/solve/solveDetail.vue
+++ b/src/views/device/receive/solve/solveDetail.vue
@@ -134,55 +134,55 @@
     </detail-page>
     <div id="lysq" class="lysq-create-check">
       <div class="top-info">
-        <detail-block title="领用申请">
-          <div class="form-area">
-            <el-form
-              ref="ruleFormRef"
-              :model="form"
-              label-width="120px"
-            >
-              <el-row :gutter="24">
-                <el-col :span="6">
-                  <el-form-item label="申请名称" prop="applyName">
-                    <el-input v-model="form.applyName" disabled />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="申请单位" prop="applyUnit">
-                    <dept-select
-                      v-model="form.applyUnit"
-                      :data="useDeptList"
-                      disabled
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="申请人" prop="applyPerson">
-                    <el-select v-model="form.applyPerson" disabled style="width: 100%;">
-                      <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="领用时间" prop="time">
-                    <el-date-picker
-                      v-model="form.time"
-                      type="datetime"
-                      format="YYYY-MM-DD hh:mm"
-                      value-format="YYYY-MM-DD hh:mm"
-                      disabled
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="申请说明" prop="applyDesc">
-                    <el-input v-model="form.applyDesc" type="textarea" disabled autosize />
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </el-form>
-          </div>
-        </detail-block>
+        <!-- <detail-block title="领用申请"> -->
+        <div class="form-area">
+          <el-form
+            ref="ruleFormRef"
+            :model="form"
+            label-width="120px"
+          >
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="申请名称" prop="applyName">
+                  <el-input v-model="form.applyName" disabled />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="申请单位" prop="applyUnit">
+                  <dept-select
+                    v-model="form.applyUnit"
+                    :data="useDeptList"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="申请人" prop="applyPerson">
+                  <el-select v-model="form.applyPerson" disabled style="width: 100%;">
+                    <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="领用时间" prop="time">
+                  <el-date-picker
+                    v-model="form.time"
+                    type="datetime"
+                    format="YYYY-MM-DD hh:mm"
+                    value-format="YYYY-MM-DD hh:mm"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="申请说明" prop="applyDesc">
+                  <el-input v-model="form.applyDesc" type="textarea" disabled autosize />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </div>
+        <!-- </detail-block> -->
       </div>
       <detail-block title="设备领用列表">
         <el-table
diff --git a/src/views/device/receive/solve/solveList.vue b/src/views/device/receive/solve/solveList.vue
index ec1e8bb..93bee2c 100644
--- a/src/views/device/receive/solve/solveList.vue
+++ b/src/views/device/receive/solve/solveList.vue
@@ -138,8 +138,6 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // listQuery.value.startTime = timeRange.value[0] as string || ''
-  // listQuery.value.endTime = timeRange.value[1] as string || ''
   getReceiveApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: IsolveListType) => {
       return {
diff --git a/src/views/device/standingBook/standingBook-interface.ts b/src/views/device/standingBook/standingBook-interface.ts
index e3cf134..4d239dd 100644
--- a/src/views/device/standingBook/standingBook-interface.ts
+++ b/src/views/device/standingBook/standingBook-interface.ts
@@ -28,6 +28,7 @@
   name: string
   id: string
   value: string
+  isSelectItemDisabled?: boolean // 选择项目禁用
 }
 // 部门类型
 export interface deptType {
diff --git a/src/views/device/stateManage/components/selectDevice.vue b/src/views/device/stateManage/components/selectDevice.vue
index eddd910..237e92a 100644
--- a/src/views/device/stateManage/components/selectDevice.vue
+++ b/src/views/device/stateManage/components/selectDevice.vue
@@ -43,6 +43,7 @@
     text: '管理状态',
     value: 'managerStateName',
     align: 'center',
+    width: '120',
   },
   {
     text: '使用人',
@@ -54,7 +55,6 @@
     value: 'validDate',
     align: 'center',
     width: '120',
-
   },
 ])
 // 选中的内容
@@ -148,8 +148,13 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[20]"
-        :list-loading="loadingTable" is-showmulti-select
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :page-sizes="[20]"
+        :list-loading="loadingTable"
+        is-showmulti-select
         :height="260"
         @change="changePage"
         @multi-select="handleSelectionChange"
diff --git a/src/views/device/stateManage/components/selectDeviceDialog.vue b/src/views/device/stateManage/components/selectDeviceDialog.vue
index 12cd563..6d63d54 100644
--- a/src/views/device/stateManage/components/selectDeviceDialog.vue
+++ b/src/views/device/stateManage/components/selectDeviceDialog.vue
@@ -2,48 +2,85 @@
 <script lang="ts" setup name="ReceiveDialog">
 import { ref } from 'vue'
 import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
 import type { IdeviceList } from './status-interface'
 import useUserStore from '@/store/modules/user'
 import { listPageApi } from '@/api/device/standingBook'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-
+import { getDictByCode } from '@/api/system/dict'
+import type { selectType } from '@/views/device/standingBook/standingBook-interface'
+import { getStatusList } from '@/api/device/stateManage'
+import { SCHEDULE } from '@/utils/scheduleDict'
 const props = defineProps({
   dialogSelectDiviceVisible: {
     type: Boolean,
     default: false,
   },
-  isMulti: Boolean,
+  isMulti: Boolean, // 是否多选
+  statusTypeName: { // 状态管理类型
+    type: String,
+    default: '',
+  },
 })
+// 提醒文字
 const emits = defineEmits(['closeDialog', 'updateDeviceConfirm'])
+const defineMessageTest = ref('') // 提醒文字
 const loadingTable = ref<boolean>(false)
 const userStore = useUserStore()
 // 查询条件
 const listQuery = ref({
   equipmentName: '', // 设备名称
   equipmentNo: '', // 设备编号
+  managerState: '', // 管理状态
   offset: 1,
   limit: 20,
 })
 const total = ref(20)
 // 多选选中的内容
-const checkoutList = ref([])
-
+const checkoutList = ref([]) as any
+const isSelectDisabled = ref(false) // 状态管理筛选框是否禁用
 const list = ref([])// 表格数据
 const columns = ref<TableColumn[]>([
   { text: '设备名称', value: 'equipmentName', align: 'center', fixed: true },
-  { text: '设备编号', value: 'equipmentNo', align: 'center', fixed: true },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', fixed: true, width: '160' },
   { text: '型号', value: 'modelNo', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '管理状态', value: 'managerStateName', align: 'center' },
+  { text: '管理状态', value: 'managerStateName', align: 'center', width: '120' },
   { text: '使用人', value: 'usePersonName', align: 'center' },
-  { text: '有效日期', value: 'validDate', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center', width: '120' },
 ])
 const table = ref()
 const dialogTableVisible = ref(false)// 控制对话框显隐
-
+// 获取数据
+const managerStateList = ref<selectType[]>([])
+const getDict = () => {
+  // 获取管理状态
+  getDictByCode('managerState').then((response) => {
+    managerStateList.value = response.data.map((item: { name: string; isSelectItemDisabled: boolean }) => {
+      if (props.statusTypeName === '闲置' && item.name !== '在用(启封)') {
+        item.isSelectItemDisabled = true
+      }
+      else if (props.statusTypeName === '封存' && (item.name !== '在用(启封)' && item.name !== '闲置')) {
+        item.isSelectItemDisabled = true
+      }
+      else if (props.statusTypeName === '启封' && (item.name !== '封存' && item.name !== '闲置')) {
+        item.isSelectItemDisabled = true
+      }
+      else if (props.statusTypeName === '报废' && (item.name !== '在用(启封)' && item.name !== '闲置' && item.name !== '封存')) {
+        item.isSelectItemDisabled = true
+      }
+      else if (props.statusTypeName === '处置' && item.name !== '报废') {
+        item.isSelectItemDisabled = true
+      }
+      return item
+    })
+  })
+}
+getDict()
 // 获取数据列表
 const fetchData = () => {
   loadingTable.value = true
+  listQuery.value.limit = props.isMulti ? 20 : 5
   listPageApi(listQuery.value).then((res) => {
     list.value = res.data.rows.map((item: IdeviceList) => {
       return {
@@ -64,12 +101,38 @@
     table.value.clearMulti() // 清除多选选中
   }
 })
+watch(() => props.statusTypeName, (val) => {
+  if (val === '闲置') {
+    defineMessageTest.value = '在用(启封)'
+    listQuery.value.managerState = '1' // 启封 // 默认查询哪个状态
+  }
+  else if (val === '封存') {
+    defineMessageTest.value = '闲置、在用(启封)'
+    listQuery.value.managerState = '1' // 启封
+  }
+  else if (val === '启封') {
+    defineMessageTest.value = '闲置、封存'
+    listQuery.value.managerState = '3' // 封存
+  }
+  else if (val === '报废') {
+    defineMessageTest.value = '闲置、封存、在用(启封)'
+    listQuery.value.managerState = '1' // 启封
+  }
+  else if (val === '处置') {
+    defineMessageTest.value = '报废'
+    listQuery.value.managerState = '4' // 报废
+  }
+})
 // 关闭对话框
 const close = () => {
   emits('closeDialog')
 }
 // 确认
 const confirm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return
+  }
   emits('updateDeviceConfirm', checkoutList.value)
   close()
 }
@@ -101,7 +164,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogTableVisible" width="60%" title="选择设备" class="select-device-dialog" @close="close">
+  <el-dialog v-model="dialogTableVisible" width="65%" title="选择设备" class="select-device-dialog" @close="close">
     <search-area
       :need-clear="true"
       @search="searchList" @clear="clearList"
@@ -120,8 +183,19 @@
           clearable
         />
       </search-item>
+      <search-item>
+        <el-select v-model="listQuery.managerState" class="m-2" placeholder="管理状态" clearable>
+          <el-option
+            v-for="item in managerStateList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+            :disabled="item.isSelectItemDisabled"
+          />
+        </el-select>
+      </search-item>
     </search-area>
-    <table-container>
+    <div style="padding: 12px;">
       <normal-table
         ref="table"
         :data="list"
@@ -131,8 +205,8 @@
         :is-multi="isMulti"
         is-showmulti-select
         :list-loading="loadingTable"
-        :page-sizes="[20]"
-        :height="240"
+        :page-sizes="isMulti ? [20] : [5]"
+        :height="260"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
@@ -144,8 +218,10 @@
           </el-table-column>
         </template>
       </normal-table>
-    </table-container>
-
+    </div>
+    <div style="font-size: 14px;">
+      <span style="color: #f56c6c;">*注意：只能查询管理状态为 <span style="color: #3d7eff;">{{ defineMessageTest }}</span> 的设备</span>
+    </div>
     <template #footer>
       <span class="dialog-footer">
         <el-button @click="close">取消</el-button>
diff --git a/src/views/device/stateManage/components/status-interface.ts b/src/views/device/stateManage/components/status-interface.ts
index dd27189..acb9b35 100644
--- a/src/views/device/stateManage/components/status-interface.ts
+++ b/src/views/device/stateManage/components/status-interface.ts
@@ -41,6 +41,7 @@
   time: string // 时间
   updateTime: string // 修改时间
   version: string // 版本
+  decisionItem?: string | number
 }
 
 // 删除/提交/取消
@@ -72,6 +73,9 @@
   equipmentSpecifications?: string | undefined
   manufacturingNo?: string | undefined
   manufacturer?: string | undefined
+  isRadioDisabled?: boolean // 禁用单选按钮
+  isMultiDisabled?: boolean // 禁用多选框
+  isSelectItemDisabled?: boolean // 选择器选项禁用
 }
 
 export interface IdeviceListQuery {
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 73f8ddb..114d99c 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -1,36 +1,38 @@
 <!-- 新增或详情弹窗 设备借用处理新增编辑 -->
 <script lang="ts" setup name="TemplateAdd">
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import type { EquipmentListRow } from './status-interface'
 // import addRow from './addRow.vue'
 import SelectDeviceDialog from './selectDeviceDialog.vue'
-import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
 import { addStatus, detailStatus, submitStatus, updateRejectStatus, updateStatus } from '@/api/device/stateManage'
 import useUserStore from '@/store/modules/user'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue' // 审批对话ref
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { cancelApproval, fetchApproval } from '@/api/approval'
-
+const approvalDialog = ref()
 const user = useUserStore() // 用户信息
 const $route = useRoute()
 const userInfo = useUserStore()
 const $router = useRouter()
-const ruleFormRef1 = ref() // from组件
-const ruleFormRef2 = ref() // from组件
+const ruleFormRef = ref() // from组件
 const title = ref('')
 const name = ref('')
 const isMulti = ref(false) // 是否批量添加(允许多选)
 const dialogSelectDiviceVisible = ref(false) // 控制选择设备对话框显隐
 const processId = ref('')
-const _approvalStatusName = $route.query.approvalStatusName
-const _title = $route.query.title
+const decisionItem = ref('') // 同意、驳回、拒绝按钮权限
+const taskId = ref('') // 任务id，用于同意、驳回、拒绝审批
+const _approvalStatusName = ref('')
+const statusTypeName = ref('') // 状态管理类型
+
 // 状态管理
 const ruleForm = ref({
   applyType: $route.query.applyType, // 申请类型
@@ -70,76 +72,21 @@
 watch(() => ruleForm.value, (newVal) => {
   if (name.value === '详情') {
     if (newVal.applyUnit) {
-      ruleFormRef1.value.validateField('applyUnit')
+      ruleFormRef.value.validateField('applyUnit')
     }
     if (newVal.applyPerson) {
-      ruleFormRef1.value.validateField('applyPerson')
+      ruleFormRef.value.validateField('applyPerson')
     }
   }
 }, {
   deep: true,
   immediate: true,
 })
-const assetTypeList = ref<selectType[]>([]) // 资产类型
-const ABCList = ref<selectType[]>([]) // ABC
-const mesureTypeList = ref<selectType[]>([]) // 检定方式
-const majorCategoryList = ref<selectType[]>([]) // 专业分类
-const equipmentCategoryList = ref<selectType[]>([]) // 设备类别
-const mesureResultList = ref<selectType[]>([]) //  检定结果
-const equipmentTypeList = ref<selectType[]>([]) // 设备类型
-const managerLevelList = ref<selectType[]>([]) // 管理级别
-const depreciationMethodList = ref<selectType[]>([]) // 折旧方法
-const managerStateList = ref<selectType[]>([]) // 管理状态
-const capitalSourceList = ref<selectType[]>([]) // 资本来源
 const usePersonList = ref<userType[]>([]) // 使用人列表
 const useDeptList = ref<deptType[]>([]) // 使用部门列表
 const useDeptListNoTree = ref([]) // 使用部门列表非树结构
 // 获取字典
 const fetchData = () => {
-// 获取资产类型
-  getDictByCode('assetType').then((response) => {
-    assetTypeList.value = response.data
-  })
-  // 获取ABC
-  getDictByCode('ABC').then((response) => {
-    ABCList.value = response.data
-  })
-  // 获取检定方式
-  getDictByCode('mesureType').then((response) => {
-    mesureTypeList.value = response.data
-  })
-  // 获取专业分类
-  getDictByCode('majorCategory').then((response) => {
-    majorCategoryList.value = response.data
-  })
-  // 获取检定结果
-  getDictByCode('mesureResult').then((response) => {
-    mesureResultList.value = response.data
-  })
-  // 获取设备类别
-  getDictByCode('equipmentCategory').then((response) => {
-    equipmentCategoryList.value = response.data
-  })
-  // 获取设备类型
-  getDictByCode('equipmentType').then((response) => {
-    equipmentTypeList.value = response.data
-  })
-  // 获取管理级别
-  getDictByCode('managerLevel').then((response) => {
-    managerLevelList.value = response.data
-  })
-  // 获取折旧方法
-  getDictByCode('depreciationMethod').then((response) => {
-    depreciationMethodList.value = response.data
-  })
-  // 获取管理状态
-  getDictByCode('managerState').then((response) => {
-    managerStateList.value = response.data
-  })
-  // 获取资本来源
-  getDictByCode('capitalSource').then((response) => {
-    capitalSourceList.value = response.data
-  })
   // 获取用户列表
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
     usePersonList.value = res.data.rows
@@ -172,6 +119,12 @@
     })
   }
 }
+// 关闭弹窗
+const close = () => {
+  $router.back()
+}
+
+// -----------------------------------------审批----------------------------------------
 const approvalRecordData = ref([]) // 审批流程数据
 // 查询审批记录
 function getApprovalRecord(processId: string) {
@@ -187,49 +140,49 @@
   }
 }
 
-// 关闭弹窗
-const close = () => {
-  $router.back()
+// 审批结束回调
+const approvalSuccess = () => {
+  close() // 返回上一页
 }
-
-// 状态管理编辑
-const statusManageEdit = () => {
-  if (title.value == '编辑') {
-    if (ruleForm.value.equipmentList && ruleForm.value.equipmentList[0]) {
-      ruleForm.value.equipmentId = ruleForm.value.equipmentList[0].equipmentId
-      // delete ruleForm.value.equipmentList
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: processId.value!,
+      comments: '',
     }
-    updateStatus(ruleForm.value).then((res) => {
-      if (res.code === 200) {
-        ElMessage.success('操作成功!')
-        $router.back()
-      }
-      else {
-        ElMessage.warning(res.message)
-      }
-    })
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', taskId.value)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', taskId.value)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', taskId.value)
   }
 }
+// ------------------------------------------------------------------------------------------
 
-// 驳回编辑
-const statusManageRejectEdit = () => {
-  if (title.value == '编辑') {
-    if (ruleForm.value.equipmentList && ruleForm.value.equipmentList[0]) {
-      ruleForm.value.equipmentId = ruleForm.value.equipmentList[0].equipmentId
-      // delete ruleForm.value.equipmentList
-    }
-    updateRejectStatus(ruleForm.value).then((res) => {
-      if (res.code === 200) {
-        ElMessage.success('操作成功!')
-        $router.back()
-      }
-      else {
-        ElMessage.warning(res.message)
-      }
-    })
-  }
-}
-// 新建 状态管理保存
+// 保存
 const statusManageSave = async (formEl1: FormInstance | undefined) => {
   if (!formEl1) { return }
   await formEl1.validate((valid, fields) => {
@@ -243,26 +196,70 @@
           type: 'warning',
         },
       ).then((res) => {
-        ruleForm.value.equipmentList[0].assetOriginValue = ruleForm.value.assetOriginValue
-        ruleForm.value.equipmentList[0].financialValue = ruleForm.value.financialValue
-        addStatus(ruleForm.value).then((res) => {
-          if (res.code === 200) {
-            ElMessage.success('操作成功!')
-            ruleForm.value.id = res.data
-          }
-          else {
-            ElMessage.warning(res.message)
-          }
+        const loading = ElLoading.service({
+          lock: true,
+          background: 'rgba(255, 255, 255, 0.8)',
         })
+        if (title.value === '新建') { // 新建
+          ruleForm.value.equipmentList[0].assetOriginValue = ruleForm.value.assetOriginValue
+          ruleForm.value.equipmentList[0].financialValue = ruleForm.value.financialValue
+          addStatus(ruleForm.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('操作成功!')
+              ruleForm.value.id = res.data
+              loading.close()
+            }
+            else {
+              ElMessage.warning(res.message)
+              loading.close()
+            }
+          })
+        }
+        else { // 编辑
+          if (_approvalStatusName.value === '未通过-驳回') {
+            if (ruleForm.value.equipmentList && ruleForm.value.equipmentList[0]) {
+              ruleForm.value.equipmentId = ruleForm.value.equipmentList[0].equipmentId
+              // delete ruleForm.value.equipmentList
+            }
+            updateRejectStatus(ruleForm.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('操作成功!')
+                loading.close()
+                $router.back()
+              }
+              else {
+                ElMessage.warning(res.message)
+                loading.close()
+              }
+            })
+          }
+          else { // 草稿箱、已取消
+            if (ruleForm.value.equipmentList && ruleForm.value.equipmentList[0]) {
+              ruleForm.value.equipmentId = ruleForm.value.equipmentList[0].equipmentId
+              // delete ruleForm.value.equipmentList
+            }
+            updateStatus(ruleForm.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('操作成功!')
+                loading.close()
+                $router.back()
+              }
+              else {
+                ElMessage.warning(res.message)
+                loading.close()
+              }
+            })
+          }
+        }
       })
     }
   })
 }
 
-// 新建 状态管理提交
+// 提交
 const statusManageSubmit = async (formEl1: FormInstance | undefined) => {
   if (ruleForm.value.id === '') {
-    ElMessage.warning('请保存之后再提交!')
+    ElMessage.warning('请先保存再提交!')
     return
   }
   if (!formEl1) { return }
@@ -294,15 +291,7 @@
     }
   })
 }
-// 取消
-const resetForm = () => {
-  close()
-}
-// 编辑当前
-const editForm = () => {
-  // 并且隐藏编辑按钮
-  title.value = '编辑'
-}
+
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -314,6 +303,10 @@
     for (var i = 0; i < files.length; i++) {
       fd.append('multipartFile', files[i])
     }
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
     UploadFile(fd).then((res) => {
       console.log(res)
       if (res.code === 200 && res.data.length >= 1) {
@@ -325,11 +318,13 @@
           // id: '',
           })
         }
-        ruleFormRef1.value?.clearValidate('minioFileName')
+        ruleFormRef.value?.clearValidate('minioFileName')
         // 重置当前验证
         ElMessage.success('文件上传成功')
+        loading.close()
       }
       else {
+        loading.close()
         ElMessage.error(res.message)
       }
     })
@@ -343,16 +338,6 @@
   fileRef.value.click()
 }
 
-// 已取消状态
-const isCancel = computed(() => {
-  if ($route.query?.approvalStatus === '6' || $route.query?.approvalStatusName === '已取消') {
-    return true
-  }
-  else {
-    return false
-  }
-})
-
 // 设备状态管理
 const addRowBtn = () => {
   dialogSelectDiviceVisible.value = true // 选择设备对话框显隐
@@ -374,23 +359,25 @@
   ruleForm.value.equipmentSpecifications = device.equipmentSpecifications as string
   ruleForm.value.manufacturingNo = device.manufacturingNo as string
   ruleForm.value.manufacturer = device.manufacturer as string
-  ruleFormRef1.value.clearValidate('equipmentNo')
+  ruleFormRef.value.clearValidate('equipmentNo')
   // 赋值
   ruleForm.value.equipmentList = [{
     equipmentId: device.id as string,
   }]
   return false
 }
-
 onMounted(() => {
   initDialog($route.query)
-  console.log(name.value, 'pppppp')
   const tempName = name.value.substring(2, 4)
+  statusTypeName.value = tempName
   ruleForm.value.applyName = `设备${tempName}申请` // 申请名称固定
   ruleForm.value.applyUnit = user.deptId // 申请单位
   ruleForm.value.applyUnitName = user.deptName // 申请单位名称
   ruleForm.value.applyPerson = user.id // 申请人
   ruleForm.value.applyPersonName = user.name // 申请人名称
+  decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
+  taskId.value = $route.query.taskId as string // 流程实例id
+  _approvalStatusName.value = $route.query.approvalStatusName as string // 审批状态名称
 })
 </script>
 
@@ -398,47 +385,30 @@
   <app-container style="overflow: hidden;">
     <detail-page :title="`${name}-${title}`">
       <template #btns>
-        <!-- 状态管理 -->
-        <template>
-          <!-- 新建 -->
-          <el-button v-if="title === '新建'" type="primary" @click="statusManageSubmit(ruleFormRef1)">
-            提交
-          </el-button>
-          <el-button v-if="title === '新建'" type="primary" @click="statusManageSave(ruleFormRef1)">
-            保存
-          </el-button>
-          <!-- 草稿箱 + 已取消 -->
-          <el-button v-if="_approvalStatusName === '草稿箱' || _approvalStatusName === '已取消'" type="primary" @click="statusManageEdit">
-            保存
-          </el-button>
-          <!-- 未通过-驳回 -->
-          <el-button v-if="title === '编辑' && _approvalStatusName === '未通过-驳回'" type="primary" @click="statusManageRejectEdit">
-            保存
-          </el-button>
-          <!-- 待审批 -->
-          <!-- <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
-            同意
-          </el-button>
-          <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'reject' })">
-            驳回
-          </el-button>
-          <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="approval({ id: ruleForm2.id, type: 'refuse' })">
-            拒绝
-          </el-button> -->
-          <!-- </template> -->
-        </template>
-        <el-button v-if="(title === '详情' && $route.query?.approvalStatusName === '草稿箱' && isCancel)" type="primary" @click="editForm">
-          编辑
+        <el-button v-if="title === '详情' && _approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
         </el-button>
-        <!-- <el-button v-if="isCancel" type="primary" @click="deleteForm">
-          删除
-        </el-button> -->
-        <el-button type="info" @click="resetForm()">
+        <el-button v-if="title === '详情' && _approvalStatusName === '待审批' && decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="title === '详情' && _approvalStatusName === '待审批' && decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="title === '详情' && _approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
+        <el-button v-if="title === '新建'" type="primary" @click="statusManageSubmit(ruleFormRef)">
+          提交
+        </el-button>
+        <el-button v-if="title === '新建' || title === '编辑'" type="primary" @click="statusManageSave(ruleFormRef)">
+          保存
+        </el-button>
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
       <!-- 状态管理 -->
-      <el-form ref="ruleFormRef1" :model="ruleForm" :rules="rules1" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules1" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="申请单编号" prop="applyNo">
@@ -466,7 +436,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="设备编号" prop="equipmentNo" class="equipmentNo">
-              <el-input v-model.trim="ruleForm.equipmentNo" :placeholder="title === '详情' ? '' : '设备名称'" disabled>
+              <el-input v-model.trim="ruleForm.equipmentNo" :placeholder="title === '详情' ? ' ' : '设备编号'" disabled>
                 <template v-if="title !== '详情'" #append>
                   <el-button type="primary" size="small" @click="addRowBtn">
                     选择
@@ -477,12 +447,12 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备名称" prop="equipmentName">
-              <el-input v-model.trim="ruleForm.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" disabled />
+              <el-input v-model.trim="ruleForm.equipmentName" :placeholder="title === '详情' ? ' ' : '设备名称'" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="型号" prop="modelNo">
-              <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === '详情' ? '' : '型号'" disabled />
+              <el-input v-model.trim="ruleForm.modelNo" :placeholder="title === '详情' ? ' ' : '型号'" disabled />
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
@@ -492,24 +462,25 @@
           </el-col> -->
           <el-col :span="6">
             <el-form-item label="出厂编号" prop="manufacturingNo">
-              <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === '详情' ? '' : '出厂编号'" disabled />
+              <el-input v-model.trim="ruleForm.manufacturingNo" :placeholder="title === '详情' ? ' ' : '出厂编号'" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="生产厂家" prop="manufacturer">
-              <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === '详情' ? '' : '生产厂家'" disabled />
+              <el-input v-model.trim="ruleForm.manufacturer" :placeholder="title === '详情' ? ' ' : '生产厂家'" disabled />
             </el-form-item>
           </el-col>
           <el-col v-if="name.substring(2, 4) !== '处置'" :span="6">
-            <el-form-item :label="`${name.substring(2, 4)}开始时间`" prop="time">
+            <el-form-item :label="`${name.substring(2, 4)}时间`" prop="time">
               <el-date-picker
                 v-model="ruleForm.time" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD hh:mm" :disabled="title === '详情'"
-                :placeholder="title === '详情' ? '' : `${name.substring(2, 4)}开始时间`"
+                :placeholder="title === '详情' ? '' : `${name.substring(2, 4)}时间`"
                 style="width: 100%;"
               />
             </el-form-item>
           </el-col>
-          <el-col v-else :span="6">
+          <!-- 处置的报废时间-后端通知暂时隐藏 -->
+          <!-- <el-col v-else :span="6">
             <el-form-item label="报废时间" prop="time">
               <el-date-picker
                 v-model="ruleForm.time" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD hh:mm" :disabled="title === '详情'"
@@ -517,7 +488,7 @@
                 style="width: 100%;"
               />
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col v-if="name.substring(2, 4) === '处置'" :span="6">
             <el-form-item label="资产原值(元)" prop="assetOriginValue">
               <el-input v-model.trim="ruleForm.assetOriginValue" :placeholder="title === '详情' ? '' : '资产原值'" :disabled="title === '详情'" />
@@ -543,7 +514,7 @@
                 上传
               </el-button>
               <div style="display: flex;">
-                <show-photo v-for="(item, index) in ruleForm.fileList" :key="item" :index="index" :minio-file-name="item.minioFileName || ''" style="display: inline-block;margin: 10px;">
+                <show-photo v-for="(item, index) in ruleForm.fileList" :key="item" :index="index" :minio-file-name="item.minioFileName || ''" style="display: inline-block;margin: 0 10px;">
                   <span v-if="title !== '详情'" class="photo-close" @click="del(index)">×</span>
                 </show-photo>
               </div>
@@ -559,11 +530,14 @@
       <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
     </detail-block>
     <select-device-dialog
+      :status-type-name="statusTypeName"
       :dialog-select-divice-visible="dialogSelectDiviceVisible"
       :is-multi="isMulti"
       @close-dialog="closeDialog"
       @updateDeviceConfirm="updateDeviceConfirm"
     />
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index d5b53e2..bb932dd 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -48,8 +48,8 @@
   cancel: '/device/unusedApply/cancle', // 取消
   delete: '/device/unusedApply/delete', // 删除
 }
-const activeTitle = ref<string>(props.title) // 状态按钮选中
 const approvalStatusVal = ref<string>(props.type)
+
 // const approvalStatusMap = ref({}) as any// 审批状态字典{1：草稿箱}
 // const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 const $router = useRouter()
@@ -150,18 +150,24 @@
 }
 
 // 获取数据列表
-const getList = () => {
+const getList = (isNowPage = false) => {
   loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.offset = 1
+  }
+  if (!searchQuery.approvalStatus) {
+    searchQuery.approvalStatus = '0'
+  }
   getStatusList(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
       total.value = res.data.total
     }
     loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
   })
-    .catch((_) => {
-      loadingTable.value = false
-    })
 }
 
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -187,7 +193,8 @@
       name: props.name,
       applyType: props.applyType,
       approvalStatusName: row.approvalStatusName,
-
+      decisionItem: `${row.decisionItem}`, // 同意、驳回、拒绝
+      taskId: row.taskId,
     },
   })
 }
@@ -304,10 +311,6 @@
   clearSearch()
   getList()
 }
-// 模板下载
-const templateDownload = () => {}
-// 标签识别
-const identify = () => {}
 // 新增
 const add = () => {
   $router.push({
@@ -351,51 +354,6 @@
     ElMessage('无可打印内容')
   }
 }
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: '下载中请稍后',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (list.value.length > 0) {
-    const selectIds = selectList.value.map(item => item.id)
-    const params = {
-      applyNo: searchQuery.applyNo, // 申请编号
-      applyStatus: searchQuery.applyStatus, // 申请状态
-      applyUnit: searchQuery.applyUnit, // 申请部门
-      approvalStatus: searchQuery.approvalStatus, // 申请状态
-      createUser: searchQuery.createUser, // 创建人
-      equipmentName: searchQuery.equipmentName, // 设备名称
-      equipmentNo: searchQuery.equipmentNo, // 	设备编号
-      applyType: searchQuery.applyType, // 申请类型
-      formId: SCHEDULE[props.formCode as keyof typeof SCHEDULE],
-      ids: selectIds,
-    }
-    // 调导出接口
-    exportStatus(params).then((res) => {
-      const blob = new Blob([res.data])
-      exportFile(blob, `${props.name}.xlsx`)
-    })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
-}
-const fileRef = ref() // 文件上传input
-const onFileChange = (event: any) => {
-  // 原生上传
-  if (event.target.files?.length !== 0) {
-    // 创建formdata对象
-    const fd = new FormData()
-    fd.append('multipartFile', event.target.files[0])
-  }
-}
-// 批量导入
-const batchImport = () => {
-  fileRef.value.click()
-}
 
 const getApplyUnitList = () => {
   // 获取部门列表
@@ -412,178 +370,160 @@
 }
 
 onMounted(() => {
-  getList()
   // 获取申请单位
   getApplyUnitList()
+  nextTick(() => {
+    getList()
+  })
 })
 </script>
 
 <template>
-  <div>
-    <!-- 审批操作组件 -->
-    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-    <!-- 布局 -->
-    <app-container>
-      {{ title }}
-
-      <!-- 筛选条件 -->
-      <search-area :need-clear="true" @search="search" @clear="reset">
-        <search-item>
-          <el-input
-            v-model="searchQuery.applyNo"
-            placeholder="申请编号"
-            clearable
-            class="short-input"
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model="searchQuery.equipmentNo"
-            placeholder="设备编号"
-            clearable
-            class="short-input"
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model="searchQuery.equipmentName"
-            placeholder="设备名称"
-            clearable
-            class="short-input"
-          />
-        </search-item>
-        <search-item>
-          <dept-select v-model="searchQuery.applyUnit" :data="applyUnitList" placeholder="申请单位" />
-        </search-item>
-      </search-area>
-      <table-container>
-        <!-- 表头区域 -->
-        <template #btns-right>
-          <input
-            v-show="searchQuery.limit === 0"
-            ref="fileRef"
-            type="file"
-            multiple
-            @change="onFileChange"
-          >
-          <icon-button v-if="proxy.hasPerm('/device/unusedApply/add')" icon="icon-add" title="新建" @click="add" />
-          <icon-button
-            v-if="proxy.hasPerm('/device/unusedApply/export')"
-            icon="icon-export"
-            title="导出"
-            @click="exportExcelBtn"
-          />
-          <icon-button v-if="proxy.hasPerm('/device/unusedApply/print')" icon="icon-print" title="打印" @click="printList" />
-        </template>
-        <!-- 表格区域 -->
-        <normal-table
-          id="print"
-          :data="list"
-          :total="total"
-          :columns="columns"
-          :is-showmulti-select="true"
-          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-          :list-loading="loadingTable"
-          :is-multi="true"
-          @change="changePage"
-          @multi-select="multiSelect"
+  <!-- 筛选条件 -->
+  <search-area :need-clear="true" @search="search" @clear="reset">
+    <search-item>
+      <el-input
+        v-model="searchQuery.applyNo"
+        placeholder="申请编号"
+        clearable
+        class="short-input"
+      />
+    </search-item>
+    <search-item>
+      <el-input
+        v-model="searchQuery.equipmentNo"
+        placeholder="设备编号"
+        clearable
+        class="short-input"
+      />
+    </search-item>
+    <search-item>
+      <el-input
+        v-model="searchQuery.equipmentName"
+        placeholder="设备名称"
+        clearable
+        class="short-input"
+      />
+    </search-item>
+    <search-item>
+      <dept-select v-model="searchQuery.applyUnit" :data="applyUnitList" placeholder="申请单位" />
+    </search-item>
+  </search-area>
+  <table-container>
+    <!-- 表头区域 -->
+    <template #btns-right>
+      <icon-button v-if="proxy.hasPerm('/device/unusedApply/add')" icon="icon-add" title="新建" @click="add" />
+      <icon-button v-if="proxy.hasPerm('/device/unusedApply/print')" icon="icon-print" title="打印" @click="printList" />
+    </template>
+    <!-- 表格区域 -->
+    <normal-table
+      id="print"
+      :data="list"
+      :total="total"
+      :columns="columns"
+      :is-showmulti-select="true"
+      :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+      :list-loading="loadingTable"
+      :is-multi="true"
+      @change="changePage"
+      @multi-select="multiSelect"
+    >
+      <template #preColumns>
+        <el-table-column label="序号" width="55" align="center">
+          <template #default="scope">
+            {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column>
+      </template>
+      <template #columns>
+        <el-table-column
+          label="操作"
+          align="center"
+          :width="(title === '全部') ? 150 : (title === '草稿箱' || title === '已取消') ? 150 : (title === '已通过' || title === '未通过' || title === '审批中') ? 100 : 150"
+          fixed="right"
         >
-          <template #preColumns>
-            <el-table-column label="序号" width="55" align="center">
-              <template #default="scope">
-                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-              </template>
-            </el-table-column>
-          </template>
-          <template #columns>
-            <el-table-column
-              label="操作"
-              align="center"
-              :width="(title === '全部') ? 150 : (title === '草稿箱' || title === '已取消') ? 150 : (title === '已通过' || title === '未通过' || title === '审批中') ? 100 : 150"
-              fixed="right"
+          <template #default="{ row }">
+            <el-button
+              size="small"
+              type="primary"
+              link
+              @click="detail(row)"
             >
-              <template #default="{ row }">
-                <el-button
-                  size="small"
-                  type="primary"
-                  link
-                  @click="detail(row)"
-                >
-                  查看
-                </el-button>
-                <el-button
-                  v-if="proxy.buttonPerm.edit.if(row, permUrl.edit)"
-                  size="small"
-                  type="primary"
-                  link
-                  @click="update(row)"
-                >
-                  编辑
-                </el-button>
-                <el-button
-                  v-if="proxy.buttonPerm.submit.if(row)"
-                  size="small"
-                  type="primary"
-                  link
-                  @click="submit(row)"
-                >
-                  提交
-                </el-button>
-                <el-button
-                  v-if="proxy.buttonPerm.agree.if(row, permUrl.agree)"
-                  size="small"
-                  type="primary"
-                  link
-                  :disabled="proxy.buttonPerm.agree.disabled(row)"
-                  @click="agree(row)"
-                >
-                  同意
-                </el-button>
-                <el-button
-                  v-if="proxy.buttonPerm.reject.if(row, permUrl.reject)"
-                  size="small"
-                  type="primary"
-                  link
-                  :disabled="proxy.buttonPerm.reject.disabled(row)"
-                  @click="reject(row)"
-                >
-                  驳回
-                </el-button>
-                <el-button
-                  v-if="proxy.buttonPerm.refuse.if(row, permUrl.reject)"
-                  size="small"
-                  type="danger"
-                  link
-                  :disabled="proxy.buttonPerm.refuse.disabled(row)"
-                  @click="refuse(row)"
-                >
-                  拒绝
-                </el-button>
-                <el-button
-                  v-if="proxy.buttonPerm.cancel.if(row, permUrl.cancel)"
-                  size="small"
-                  type="info"
-                  link
-                  :disabled="proxy.buttonPerm.cancel.disabled(row)"
-                  @click="cancel(row)"
-                >
-                  取消
-                </el-button>
-                <el-button
-                  v-if="proxy.buttonPerm.delete.if(row, permUrl.delete)"
-                  :disabled="proxy.buttonPerm.delete.disabled(row)"
-                  size="small"
-                  type="danger"
-                  link
-                  @click="remove(row)"
-                >
-                  删除
-                </el-button>
-              </template>
-            </el-table-column>
+              查看
+            </el-button>
+            <el-button
+              v-if="proxy.buttonPerm.edit.if(row, permUrl.edit)"
+              size="small"
+              type="primary"
+              link
+              @click="update(row)"
+            >
+              编辑
+            </el-button>
+            <el-button
+              v-if="proxy.buttonPerm.submit.if(row)"
+              size="small"
+              type="primary"
+              link
+              @click="submit(row)"
+            >
+              提交
+            </el-button>
+            <el-button
+              v-if="proxy.buttonPerm.agree.if(row, permUrl.agree)"
+              size="small"
+              type="primary"
+              link
+              :disabled="proxy.buttonPerm.agree.disabled(row)"
+              @click="agree(row)"
+            >
+              同意
+            </el-button>
+            <el-button
+              v-if="proxy.buttonPerm.reject.if(row, permUrl.reject)"
+              size="small"
+              type="primary"
+              link
+              :disabled="proxy.buttonPerm.reject.disabled(row)"
+              @click="reject(row)"
+            >
+              驳回
+            </el-button>
+            <el-button
+              v-if="proxy.buttonPerm.refuse.if(row, permUrl.reject)"
+              size="small"
+              type="danger"
+              link
+              :disabled="proxy.buttonPerm.refuse.disabled(row)"
+              @click="refuse(row)"
+            >
+              拒绝
+            </el-button>
+            <el-button
+              v-if="proxy.buttonPerm.cancel.if(row, permUrl.cancel)"
+              size="small"
+              type="info"
+              link
+              :disabled="proxy.buttonPerm.cancel.disabled(row)"
+              @click="cancel(row)"
+            >
+              取消
+            </el-button>
+            <el-button
+              v-if="proxy.buttonPerm.delete.if(row, permUrl.delete)"
+              :disabled="proxy.buttonPerm.delete.disabled(row)"
+              size="small"
+              type="danger"
+              link
+              @click="remove(row)"
+            >
+              删除
+            </el-button>
           </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+        </el-table-column>
+      </template>
+    </normal-table>
+  </table-container>
+  <!-- 审批操作组件 -->
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
 </template>