diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 8771c29..17c5b36 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -16,6 +16,16 @@
     data,
   })
 }
+
+// 状态管理编辑
+export function updateStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/updateStateManageInfo',
+    method: 'post',
+    data,
+  })
+}
+
 // 状态管理删除
 export function deleteStatus(data: object) {
   return request({
@@ -24,6 +34,22 @@
     data,
   })
 }
+// 状态管理取消
+export function cancelStatus(data: object) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
+// 状态管理提交
+export function submitStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/submitStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
 // 状态管理详情
 export function detailStatus(data: object) {
   return request({

diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 8771c29..17c5b36 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -16,6 +16,16 @@
     data,
   })
 }
+
+// 状态管理编辑
+export function updateStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/updateStateManageInfo',
+    method: 'post',
+    data,
+  })
+}
+
 // 状态管理删除
 export function deleteStatus(data: object) {
   return request({
@@ -24,6 +34,22 @@
     data,
   })
 }
+// 状态管理取消
+export function cancelStatus(data: object) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
+// 状态管理提交
+export function submitStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/submitStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
 // 状态管理详情
 export function detailStatus(data: object) {
   return request({
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 7f8f5ce..f751201 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -5,12 +5,14 @@
   applyPerson: string // 	申请人
   applyUnit: string // 	申请单位
   approvalStatus?: string // 	审批状态
-  createUser: string // 	创建人
-  processResult: string // 	处置结果
+  createUser?: string // 	创建人
+  processResult?: string // 	处置结果
+  applyType: string // 申请类型
   time: string // 	申请日期
   limit?: number
   offset?: number
   ids?: string[]
+  formId?: string
 }
 // 借用设备类型
 export interface borrowDeviceType {

diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 8771c29..17c5b36 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -16,6 +16,16 @@
     data,
   })
 }
+
+// 状态管理编辑
+export function updateStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/updateStateManageInfo',
+    method: 'post',
+    data,
+  })
+}
+
 // 状态管理删除
 export function deleteStatus(data: object) {
   return request({
@@ -24,6 +34,22 @@
     data,
   })
 }
+// 状态管理取消
+export function cancelStatus(data: object) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
+// 状态管理提交
+export function submitStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/submitStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
 // 状态管理详情
 export function detailStatus(data: object) {
   return request({
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 7f8f5ce..f751201 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -5,12 +5,14 @@
   applyPerson: string // 	申请人
   applyUnit: string // 	申请单位
   approvalStatus?: string // 	审批状态
-  createUser: string // 	创建人
-  processResult: string // 	处置结果
+  createUser?: string // 	创建人
+  processResult?: string // 	处置结果
+  applyType: string // 申请类型
   time: string // 	申请日期
   limit?: number
   offset?: number
   ids?: string[]
+  formId?: string
 }
 // 借用设备类型
 export interface borrowDeviceType {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 470bad1..2f7a26f 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -35,7 +35,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :status="current" />
+    <component :is="currentComp" :status="current" apply-type="2" />
   </div>
 </template>
 

diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 8771c29..17c5b36 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -16,6 +16,16 @@
     data,
   })
 }
+
+// 状态管理编辑
+export function updateStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/updateStateManageInfo',
+    method: 'post',
+    data,
+  })
+}
+
 // 状态管理删除
 export function deleteStatus(data: object) {
   return request({
@@ -24,6 +34,22 @@
     data,
   })
 }
+// 状态管理取消
+export function cancelStatus(data: object) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
+// 状态管理提交
+export function submitStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/submitStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
 // 状态管理详情
 export function detailStatus(data: object) {
   return request({
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 7f8f5ce..f751201 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -5,12 +5,14 @@
   applyPerson: string // 	申请人
   applyUnit: string // 	申请单位
   approvalStatus?: string // 	审批状态
-  createUser: string // 	创建人
-  processResult: string // 	处置结果
+  createUser?: string // 	创建人
+  processResult?: string // 	处置结果
+  applyType: string // 申请类型
   time: string // 	申请日期
   limit?: number
   offset?: number
   ids?: string[]
+  formId?: string
 }
 // 借用设备类型
 export interface borrowDeviceType {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 470bad1..2f7a26f 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -35,7 +35,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :status="current" />
+    <component :is="currentComp" :status="current" apply-type="2" />
   </div>
 </template>
 
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 53046f0..1c13501 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -56,7 +56,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :name="current" :type="type" />
+    <component :is="currentComp" :name="current" :type="type" apply-type="2" />
   </div>
 </template>
 

diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 8771c29..17c5b36 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -16,6 +16,16 @@
     data,
   })
 }
+
+// 状态管理编辑
+export function updateStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/updateStateManageInfo',
+    method: 'post',
+    data,
+  })
+}
+
 // 状态管理删除
 export function deleteStatus(data: object) {
   return request({
@@ -24,6 +34,22 @@
     data,
   })
 }
+// 状态管理取消
+export function cancelStatus(data: object) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
+// 状态管理提交
+export function submitStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/submitStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
 // 状态管理详情
 export function detailStatus(data: object) {
   return request({
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 7f8f5ce..f751201 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -5,12 +5,14 @@
   applyPerson: string // 	申请人
   applyUnit: string // 	申请单位
   approvalStatus?: string // 	审批状态
-  createUser: string // 	创建人
-  processResult: string // 	处置结果
+  createUser?: string // 	创建人
+  processResult?: string // 	处置结果
+  applyType: string // 申请类型
   time: string // 	申请日期
   limit?: number
   offset?: number
   ids?: string[]
+  formId?: string
 }
 // 借用设备类型
 export interface borrowDeviceType {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 470bad1..2f7a26f 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -35,7 +35,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :status="current" />
+    <component :is="currentComp" :status="current" apply-type="2" />
   </div>
 </template>
 
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 53046f0..1c13501 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -56,7 +56,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :name="current" :type="type" />
+    <component :is="currentComp" :name="current" :type="type" apply-type="2" />
   </div>
 </template>
 
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index e43c46a..1e8075c 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -7,11 +7,17 @@
 import { exportFile } from '@/utils/exportUtils'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
+import { SCHEDULE } from '@/utils/scheduleDict'
+
 const props = defineProps({
   type: {
     type: String,
     required: true,
   },
+  applyType: {
+    type: String,
+    required: true,
+  },
 })
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
@@ -21,13 +27,15 @@
   applyNo: '', // 申请编号
   applyPerson: '', // 	申请人
   applyUnit: '', // 	申请单位
-  approvalStatus: '', // 	审批状态
+  approvalStatus: '0', // 	审批状态
   createUser: '', // 	创建人
   processResult: '', // 	处置结果
+  applyType: props.applyType,
   time: '', // 	申请日期
   ids: [] as string[],
   limit: 20,
   offset: 1,
+  formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
 }) // 查询参数
 watch(() => time.value, (newVal) => {
   if (newVal) {
@@ -94,12 +102,12 @@
   },
   {
     text: '申请部门',
-    value: 'applyUnit',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'applyPerson',
+    value: 'applyPersonName',
     align: 'center',
   },
   {

diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 8771c29..17c5b36 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -16,6 +16,16 @@
     data,
   })
 }
+
+// 状态管理编辑
+export function updateStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/updateStateManageInfo',
+    method: 'post',
+    data,
+  })
+}
+
 // 状态管理删除
 export function deleteStatus(data: object) {
   return request({
@@ -24,6 +34,22 @@
     data,
   })
 }
+// 状态管理取消
+export function cancelStatus(data: object) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
+// 状态管理提交
+export function submitStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/submitStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
 // 状态管理详情
 export function detailStatus(data: object) {
   return request({
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 7f8f5ce..f751201 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -5,12 +5,14 @@
   applyPerson: string // 	申请人
   applyUnit: string // 	申请单位
   approvalStatus?: string // 	审批状态
-  createUser: string // 	创建人
-  processResult: string // 	处置结果
+  createUser?: string // 	创建人
+  processResult?: string // 	处置结果
+  applyType: string // 申请类型
   time: string // 	申请日期
   limit?: number
   offset?: number
   ids?: string[]
+  formId?: string
 }
 // 借用设备类型
 export interface borrowDeviceType {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 470bad1..2f7a26f 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -35,7 +35,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :status="current" />
+    <component :is="currentComp" :status="current" apply-type="2" />
   </div>
 </template>
 
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 53046f0..1c13501 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -56,7 +56,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :name="current" :type="type" />
+    <component :is="currentComp" :name="current" :type="type" apply-type="2" />
   </div>
 </template>
 
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index e43c46a..1e8075c 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -7,11 +7,17 @@
 import { exportFile } from '@/utils/exportUtils'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
+import { SCHEDULE } from '@/utils/scheduleDict'
+
 const props = defineProps({
   type: {
     type: String,
     required: true,
   },
+  applyType: {
+    type: String,
+    required: true,
+  },
 })
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
@@ -21,13 +27,15 @@
   applyNo: '', // 申请编号
   applyPerson: '', // 	申请人
   applyUnit: '', // 	申请单位
-  approvalStatus: '', // 	审批状态
+  approvalStatus: '0', // 	审批状态
   createUser: '', // 	创建人
   processResult: '', // 	处置结果
+  applyType: props.applyType,
   time: '', // 	申请日期
   ids: [] as string[],
   limit: 20,
   offset: 1,
+  formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
 }) // 查询参数
 watch(() => time.value, (newVal) => {
   if (newVal) {
@@ -94,12 +102,12 @@
   },
   {
     text: '申请部门',
-    value: 'applyUnit',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'applyPerson',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index 7f3ea3e..293be0c 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,24 +1,37 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
+import { deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
+import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import { SCHEDULE } from '@/utils/scheduleDict'
 import { printJSON } from '@/utils/printUtils'
 const props = defineProps({
   status: {
     type: String,
     required: true,
   },
+  applyType: {
+    type: String,
+    required: true,
+  },
 })
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const time = ref()
-const searchQuery = reactive({
-  applyNo: '',
-  applyName: '',
-  applyUnit: '',
-  applyPerson: '',
-  limit: 10,
+const searchQuery = reactive<searchType>({
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 	申请人
+  applyUnit: '', // 	申请单位
+  approvalStatus: '0', // 	审批状态
+  createUser: '', // 	创建人
+  processResult: '', // 	处置结果
+  applyType: props.applyType,
+  time: '', // 	申请日期
+  ids: [] as string[],
+  limit: 20,
   offset: 1,
-  ids: [],
+  formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
 }) // 查询参数
 watch(() => time.value, (newVal) => {
   if (newVal) {
@@ -68,35 +81,16 @@
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
-  // loadingTable.value = true
-  // listPageApi(searchQuery).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  //   loadingTable.value = false
-  // }).catch((_) => {
-  //   loadingTable.value = false
-  // })
-  // list.value = [
-  //   {
-  //     applyName: '借用测试设备',
-  //     applyNo: '1433223',
-  //     applyUnit: '顶级',
-  //     applyPerson: '张三',
-  //     time: '2020-12-12 00:00:00',
-  //     approvalStatusName: '审批中',
-  //   },
-  //   {
-  //     applyName: '借用电脑',
-  //     applyNo: '1433223',
-  //     applyUnit: '徐州分中心',
-  //     applyPerson: '里斯',
-  //     time: '2020-12-12 00:00:00',
-  //     approvalStatusName: '已通过',
-  //   },
-  // ] as any
-  // total.value = 2
+  loadingTable.value = true
+  getApplyList(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -124,6 +118,7 @@
     query: {
       title: '详情',
       name: '设备借用处理',
+      // approvalStatusName: row.approvalStatusName,
     },
   })
 }
@@ -157,15 +152,15 @@
     },
   )
     .then(() => {
-      // assetsDeleteApi({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     getList()
-      //   }
-      // })
+      deleteApply({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
     })
 }
 // 搜索
@@ -174,7 +169,11 @@
 }
 // 重置
 const reset = () => {
-  // searchQuery.equipmentCategory = ''
+  searchQuery.applyName = ''
+  searchQuery.applyNo = ''
+  searchQuery.applyPerson = ''
+  searchQuery.applyUnit = ''
+  searchQuery.time = ''
   getList()
 }
 // 模板下载

diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 8771c29..17c5b36 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -16,6 +16,16 @@
     data,
   })
 }
+
+// 状态管理编辑
+export function updateStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/updateStateManageInfo',
+    method: 'post',
+    data,
+  })
+}
+
 // 状态管理删除
 export function deleteStatus(data: object) {
   return request({
@@ -24,6 +34,22 @@
     data,
   })
 }
+// 状态管理取消
+export function cancelStatus(data: object) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
+// 状态管理提交
+export function submitStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/submitStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
 // 状态管理详情
 export function detailStatus(data: object) {
   return request({
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 7f8f5ce..f751201 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -5,12 +5,14 @@
   applyPerson: string // 	申请人
   applyUnit: string // 	申请单位
   approvalStatus?: string // 	审批状态
-  createUser: string // 	创建人
-  processResult: string // 	处置结果
+  createUser?: string // 	创建人
+  processResult?: string // 	处置结果
+  applyType: string // 申请类型
   time: string // 	申请日期
   limit?: number
   offset?: number
   ids?: string[]
+  formId?: string
 }
 // 借用设备类型
 export interface borrowDeviceType {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 470bad1..2f7a26f 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -35,7 +35,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :status="current" />
+    <component :is="currentComp" :status="current" apply-type="2" />
   </div>
 </template>
 
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 53046f0..1c13501 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -56,7 +56,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :name="current" :type="type" />
+    <component :is="currentComp" :name="current" :type="type" apply-type="2" />
   </div>
 </template>
 
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index e43c46a..1e8075c 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -7,11 +7,17 @@
 import { exportFile } from '@/utils/exportUtils'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
+import { SCHEDULE } from '@/utils/scheduleDict'
+
 const props = defineProps({
   type: {
     type: String,
     required: true,
   },
+  applyType: {
+    type: String,
+    required: true,
+  },
 })
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
@@ -21,13 +27,15 @@
   applyNo: '', // 申请编号
   applyPerson: '', // 	申请人
   applyUnit: '', // 	申请单位
-  approvalStatus: '', // 	审批状态
+  approvalStatus: '0', // 	审批状态
   createUser: '', // 	创建人
   processResult: '', // 	处置结果
+  applyType: props.applyType,
   time: '', // 	申请日期
   ids: [] as string[],
   limit: 20,
   offset: 1,
+  formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
 }) // 查询参数
 watch(() => time.value, (newVal) => {
   if (newVal) {
@@ -94,12 +102,12 @@
   },
   {
     text: '申请部门',
-    value: 'applyUnit',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'applyPerson',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index 7f3ea3e..293be0c 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,24 +1,37 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
+import { deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
+import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import { SCHEDULE } from '@/utils/scheduleDict'
 import { printJSON } from '@/utils/printUtils'
 const props = defineProps({
   status: {
     type: String,
     required: true,
   },
+  applyType: {
+    type: String,
+    required: true,
+  },
 })
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const time = ref()
-const searchQuery = reactive({
-  applyNo: '',
-  applyName: '',
-  applyUnit: '',
-  applyPerson: '',
-  limit: 10,
+const searchQuery = reactive<searchType>({
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 	申请人
+  applyUnit: '', // 	申请单位
+  approvalStatus: '0', // 	审批状态
+  createUser: '', // 	创建人
+  processResult: '', // 	处置结果
+  applyType: props.applyType,
+  time: '', // 	申请日期
+  ids: [] as string[],
+  limit: 20,
   offset: 1,
-  ids: [],
+  formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
 }) // 查询参数
 watch(() => time.value, (newVal) => {
   if (newVal) {
@@ -68,35 +81,16 @@
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
-  // loadingTable.value = true
-  // listPageApi(searchQuery).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  //   loadingTable.value = false
-  // }).catch((_) => {
-  //   loadingTable.value = false
-  // })
-  // list.value = [
-  //   {
-  //     applyName: '借用测试设备',
-  //     applyNo: '1433223',
-  //     applyUnit: '顶级',
-  //     applyPerson: '张三',
-  //     time: '2020-12-12 00:00:00',
-  //     approvalStatusName: '审批中',
-  //   },
-  //   {
-  //     applyName: '借用电脑',
-  //     applyNo: '1433223',
-  //     applyUnit: '徐州分中心',
-  //     applyPerson: '里斯',
-  //     time: '2020-12-12 00:00:00',
-  //     approvalStatusName: '已通过',
-  //   },
-  // ] as any
-  // total.value = 2
+  loadingTable.value = true
+  getApplyList(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -124,6 +118,7 @@
     query: {
       title: '详情',
       name: '设备借用处理',
+      // approvalStatusName: row.approvalStatusName,
     },
   })
 }
@@ -157,15 +152,15 @@
     },
   )
     .then(() => {
-      // assetsDeleteApi({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     getList()
-      //   }
-      // })
+      deleteApply({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
     })
 }
 // 搜索
@@ -174,7 +169,11 @@
 }
 // 重置
 const reset = () => {
-  // searchQuery.equipmentCategory = ''
+  searchQuery.applyName = ''
+  searchQuery.applyNo = ''
+  searchQuery.applyPerson = ''
+  searchQuery.applyUnit = ''
+  searchQuery.time = ''
   getList()
 }
 // 模板下载
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index ec522cf..0d33dfb 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -13,7 +13,7 @@
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
 import { addApply, deleteApply, detailApply, editApply } from '@/api/device/borrow'
-import { addStatus, detailStatus } from '@/api/device/stateManage'
+import { addStatus, detailStatus, updateStatus } from '@/api/device/stateManage'
 import type { borrowDeviceType } from '@/views/device/borrow/borrow-interface'
 import useUserStore from '@/store/modules/user'
 
@@ -30,7 +30,7 @@
 }
 const ruleForm1 = ref({
   applyType: $route.query.applyType, // 申请类型
-  applyDesc: '', // 申请说明
+  remark: '', // 申请说明
   time: '', // 时间
   fileList: [] as any[], //	说明书
   applyUnit: '', // 申请单位
@@ -41,6 +41,7 @@
   equipmentSpecifications: '', // 设备规格
   manufacturingNo: '', // 出厂编号
   manufacturer: '', // 生产厂家
+  equipmentId: '',
   equipmentList: [] as EquipmentListRow[],
   id: '',
 }) // 表单
@@ -212,7 +213,7 @@
         ruleForm1.value = res.data
         ruleForm1.value.applyUnit = res.data.applyUnit
         ruleForm1.value.equipmentNo = res.data.applyNo
-        ruleForm1.value.equipmentName = res.data.applyTypeName
+        ruleForm1.value.equipmentName = res.data.equipmentName
         ruleForm1.value.time = res.data.time
       })
     }
@@ -304,15 +305,34 @@
             type: 'warning',
           },
         ).then((res) => {
-          addStatus(ruleForm1.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('操作成功!')
-              $router.go(-1)
+          if (title.value == '编辑') {
+            ruleForm1.value.applyPerson = ruleForm1.value.id
+            ruleForm1.value.applyUnit = ruleForm1.value.id
+            if (ruleForm1.value.equipmentList && ruleForm1.value.equipmentList[0]) {
+              ruleForm1.value.equipmentId = ruleForm1.value.equipmentList[0].equipmentId
+              delete ruleForm1.value.equipmentList
             }
-            else {
-              ElMessage.warning(res.message)
-            }
-          })
+            updateStatus(ruleForm1.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('操作成功!')
+                $router.go(-1)
+              }
+              else {
+                ElMessage.warning(res.message)
+              }
+            })
+          }
+          else {
+            addStatus(ruleForm1.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('操作成功!')
+                $router.go(-1)
+              }
+              else {
+                ElMessage.warning(res.message)
+              }
+            })
+          }
         })
       }
     })
@@ -680,8 +700,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="18">
-            <el-form-item label="申请理由" prop="applyDesc">
-              <el-input v-model.trim="ruleForm1.applyDesc" :placeholder="title === '详情' ? '' : '申请理由'" :disabled="title === '详情'" />
+            <el-form-item label="申请理由" prop="remark">
+              <el-input v-model.trim="ruleForm1.remark" :placeholder="title === '详情' ? '' : '申请理由'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -760,7 +780,7 @@
           </el-table-column>
         </el-table>
       </detail-block>
-      <detail-block v-if="title !== '新建'" title="审批流程">
+      <!-- <detail-block v-if="title !== '新建'" title="审批流程">
         <el-timeline>
           <el-timeline-item timestamp="2018/4/12" placement="top">
             <el-card>
@@ -781,7 +801,7 @@
             </el-card>
           </el-timeline-item>
         </el-timeline>
-      </detail-block>
+      </detail-block> -->
     </div>
   </app-container>
 </template>

diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 8771c29..17c5b36 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -16,6 +16,16 @@
     data,
   })
 }
+
+// 状态管理编辑
+export function updateStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/updateStateManageInfo',
+    method: 'post',
+    data,
+  })
+}
+
 // 状态管理删除
 export function deleteStatus(data: object) {
   return request({
@@ -24,6 +34,22 @@
     data,
   })
 }
+// 状态管理取消
+export function cancelStatus(data: object) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
+// 状态管理提交
+export function submitStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/submitStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
 // 状态管理详情
 export function detailStatus(data: object) {
   return request({
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 7f8f5ce..f751201 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -5,12 +5,14 @@
   applyPerson: string // 	申请人
   applyUnit: string // 	申请单位
   approvalStatus?: string // 	审批状态
-  createUser: string // 	创建人
-  processResult: string // 	处置结果
+  createUser?: string // 	创建人
+  processResult?: string // 	处置结果
+  applyType: string // 申请类型
   time: string // 	申请日期
   limit?: number
   offset?: number
   ids?: string[]
+  formId?: string
 }
 // 借用设备类型
 export interface borrowDeviceType {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 470bad1..2f7a26f 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -35,7 +35,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :status="current" />
+    <component :is="currentComp" :status="current" apply-type="2" />
   </div>
 </template>
 
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 53046f0..1c13501 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -56,7 +56,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :name="current" :type="type" />
+    <component :is="currentComp" :name="current" :type="type" apply-type="2" />
   </div>
 </template>
 
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index e43c46a..1e8075c 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -7,11 +7,17 @@
 import { exportFile } from '@/utils/exportUtils'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
+import { SCHEDULE } from '@/utils/scheduleDict'
+
 const props = defineProps({
   type: {
     type: String,
     required: true,
   },
+  applyType: {
+    type: String,
+    required: true,
+  },
 })
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
@@ -21,13 +27,15 @@
   applyNo: '', // 申请编号
   applyPerson: '', // 	申请人
   applyUnit: '', // 	申请单位
-  approvalStatus: '', // 	审批状态
+  approvalStatus: '0', // 	审批状态
   createUser: '', // 	创建人
   processResult: '', // 	处置结果
+  applyType: props.applyType,
   time: '', // 	申请日期
   ids: [] as string[],
   limit: 20,
   offset: 1,
+  formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
 }) // 查询参数
 watch(() => time.value, (newVal) => {
   if (newVal) {
@@ -94,12 +102,12 @@
   },
   {
     text: '申请部门',
-    value: 'applyUnit',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'applyPerson',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index 7f3ea3e..293be0c 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,24 +1,37 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
+import { deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
+import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import { SCHEDULE } from '@/utils/scheduleDict'
 import { printJSON } from '@/utils/printUtils'
 const props = defineProps({
   status: {
     type: String,
     required: true,
   },
+  applyType: {
+    type: String,
+    required: true,
+  },
 })
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const time = ref()
-const searchQuery = reactive({
-  applyNo: '',
-  applyName: '',
-  applyUnit: '',
-  applyPerson: '',
-  limit: 10,
+const searchQuery = reactive<searchType>({
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 	申请人
+  applyUnit: '', // 	申请单位
+  approvalStatus: '0', // 	审批状态
+  createUser: '', // 	创建人
+  processResult: '', // 	处置结果
+  applyType: props.applyType,
+  time: '', // 	申请日期
+  ids: [] as string[],
+  limit: 20,
   offset: 1,
-  ids: [],
+  formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
 }) // 查询参数
 watch(() => time.value, (newVal) => {
   if (newVal) {
@@ -68,35 +81,16 @@
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
-  // loadingTable.value = true
-  // listPageApi(searchQuery).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  //   loadingTable.value = false
-  // }).catch((_) => {
-  //   loadingTable.value = false
-  // })
-  // list.value = [
-  //   {
-  //     applyName: '借用测试设备',
-  //     applyNo: '1433223',
-  //     applyUnit: '顶级',
-  //     applyPerson: '张三',
-  //     time: '2020-12-12 00:00:00',
-  //     approvalStatusName: '审批中',
-  //   },
-  //   {
-  //     applyName: '借用电脑',
-  //     applyNo: '1433223',
-  //     applyUnit: '徐州分中心',
-  //     applyPerson: '里斯',
-  //     time: '2020-12-12 00:00:00',
-  //     approvalStatusName: '已通过',
-  //   },
-  // ] as any
-  // total.value = 2
+  loadingTable.value = true
+  getApplyList(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -124,6 +118,7 @@
     query: {
       title: '详情',
       name: '设备借用处理',
+      // approvalStatusName: row.approvalStatusName,
     },
   })
 }
@@ -157,15 +152,15 @@
     },
   )
     .then(() => {
-      // assetsDeleteApi({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     getList()
-      //   }
-      // })
+      deleteApply({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
     })
 }
 // 搜索
@@ -174,7 +169,11 @@
 }
 // 重置
 const reset = () => {
-  // searchQuery.equipmentCategory = ''
+  searchQuery.applyName = ''
+  searchQuery.applyNo = ''
+  searchQuery.applyPerson = ''
+  searchQuery.applyUnit = ''
+  searchQuery.time = ''
   getList()
 }
 // 模板下载
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index ec522cf..0d33dfb 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -13,7 +13,7 @@
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
 import { addApply, deleteApply, detailApply, editApply } from '@/api/device/borrow'
-import { addStatus, detailStatus } from '@/api/device/stateManage'
+import { addStatus, detailStatus, updateStatus } from '@/api/device/stateManage'
 import type { borrowDeviceType } from '@/views/device/borrow/borrow-interface'
 import useUserStore from '@/store/modules/user'
 
@@ -30,7 +30,7 @@
 }
 const ruleForm1 = ref({
   applyType: $route.query.applyType, // 申请类型
-  applyDesc: '', // 申请说明
+  remark: '', // 申请说明
   time: '', // 时间
   fileList: [] as any[], //	说明书
   applyUnit: '', // 申请单位
@@ -41,6 +41,7 @@
   equipmentSpecifications: '', // 设备规格
   manufacturingNo: '', // 出厂编号
   manufacturer: '', // 生产厂家
+  equipmentId: '',
   equipmentList: [] as EquipmentListRow[],
   id: '',
 }) // 表单
@@ -212,7 +213,7 @@
         ruleForm1.value = res.data
         ruleForm1.value.applyUnit = res.data.applyUnit
         ruleForm1.value.equipmentNo = res.data.applyNo
-        ruleForm1.value.equipmentName = res.data.applyTypeName
+        ruleForm1.value.equipmentName = res.data.equipmentName
         ruleForm1.value.time = res.data.time
       })
     }
@@ -304,15 +305,34 @@
             type: 'warning',
           },
         ).then((res) => {
-          addStatus(ruleForm1.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('操作成功!')
-              $router.go(-1)
+          if (title.value == '编辑') {
+            ruleForm1.value.applyPerson = ruleForm1.value.id
+            ruleForm1.value.applyUnit = ruleForm1.value.id
+            if (ruleForm1.value.equipmentList && ruleForm1.value.equipmentList[0]) {
+              ruleForm1.value.equipmentId = ruleForm1.value.equipmentList[0].equipmentId
+              delete ruleForm1.value.equipmentList
             }
-            else {
-              ElMessage.warning(res.message)
-            }
-          })
+            updateStatus(ruleForm1.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('操作成功!')
+                $router.go(-1)
+              }
+              else {
+                ElMessage.warning(res.message)
+              }
+            })
+          }
+          else {
+            addStatus(ruleForm1.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('操作成功!')
+                $router.go(-1)
+              }
+              else {
+                ElMessage.warning(res.message)
+              }
+            })
+          }
         })
       }
     })
@@ -680,8 +700,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="18">
-            <el-form-item label="申请理由" prop="applyDesc">
-              <el-input v-model.trim="ruleForm1.applyDesc" :placeholder="title === '详情' ? '' : '申请理由'" :disabled="title === '详情'" />
+            <el-form-item label="申请理由" prop="remark">
+              <el-input v-model.trim="ruleForm1.remark" :placeholder="title === '详情' ? '' : '申请理由'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -760,7 +780,7 @@
           </el-table-column>
         </el-table>
       </detail-block>
-      <detail-block v-if="title !== '新建'" title="审批流程">
+      <!-- <detail-block v-if="title !== '新建'" title="审批流程">
         <el-timeline>
           <el-timeline-item timestamp="2018/4/12" placement="top">
             <el-card>
@@ -781,7 +801,7 @@
             </el-card>
           </el-timeline-item>
         </el-timeline>
-      </detail-block>
+      </detail-block> -->
     </div>
   </app-container>
 </template>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 1cc56b2..a2ff30f 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -1,14 +1,19 @@
 <!-- 状态管理公共列表组件 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-// import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import type { TableRow } from './status-interface'
-import { getStatusList } from '@/api/device/stateManage'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import {
+  cancelStatus,
+  deleteStatus,
+  getStatusList,
+  submitStatus,
+} from '@/api/device/stateManage'
 import { getDictByCode } from '@/api/system/dict'
 import { printJSON } from '@/utils/printUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { SCHEDULE } from '@/utils/scheduleDict'
-
+// 选中的按钮
 const props = defineProps({
   name: {
     type: String,
@@ -18,28 +23,53 @@
     type: String,
     default: '',
   },
-  type: { // 当前状态
+  type: {
+    // 当前状态
     type: String,
     default: '',
   },
-  applyType: { // 设备申请类型
+  applyType: {
+    // 设备申请类型
     type: String,
     default: '',
   },
-})
+}); const active = ref('0')// 审批状态字典
+const approvalStatusMap: { [key: string]: string } = {
+  1: '草稿箱',
+  2: '待审批',
+  3: '审批中',
+  4: '已通过',
+  5: '未通过',
+  6: '已取消',
+  7: '非草稿',
+  8: '未通过-驳回',
+}
+// 审批状态字典
+const approvalStatusReserveMap: { [key: string]: string } = {
+  '草稿箱': '1',
+  '待审批': '2',
+  '审批中': '3',
+  '已通过': '4',
+  '未通过': '5',
+  '已取消': '6',
+  '非草稿': '7',
+  '未通过-驳回': '8',
+}
+
 const formIdList = ref({
   设备闲置申请: 'DEVICE_UNUSED_APPROVAL',
   设备封存申请: 'DEVICE_SEALED_APPROVAL',
   设备启封申请: 'DEVICE_UNSEALED_APPROVAL',
   设备报废申请: 'DEVICE_SCRAPPED_ROVAL',
   设备处置申请: 'DEVICE_HANDLE_APPROVAL',
+  设备借用申请: 'DEVICE_BORROW_APPROVAL',
 })
 const $router = useRouter()
 const searchQuery = reactive({
   applyNo: '', // 申请编号
   applyStatus: '', // 申请状态
   applyUnit: '', // 申请单位
-  approvalStatus: '', // 审批状态
+  approvalStatus: '0', // 审批状态
   createUser: '', // 创建人
   equipmentName: '', // 设备名称
   equipmentNo: '', // 设备编号
@@ -49,6 +79,7 @@
   applyType: props.applyType, // 申请类型
   formId: SCHEDULE[formIdList.value[props.name]],
 }) // 查询参数
+
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref<TableColumn[]>([
@@ -104,28 +135,53 @@
   },
 ]) // 表格
 const list = ref([]) // 表格数据
+const managerStateList = ref([]) // 状态数据
 const approvalDialog = ref()
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+const { proxy } = getCurrentInstance() as any
+
+const clearSearch = () => {
+  searchQuery.equipmentName = ''
+  searchQuery.applyNo = ''
+  searchQuery.applyStatus = ''
+  searchQuery.applyUnit = ''
+  searchQuery.approvalStatus = ''
+  searchQuery.createUser = ''
+  searchQuery.equipmentNo = ''
+  searchQuery.ids = [] as string[]
+  searchQuery.limit = 20
+  searchQuery.offset = 1
+  searchQuery.applyType = props.applyType
+  searchQuery.formId = SCHEDULE[formIdList.value[props.name]]
+}
+
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  getDictByCode('managerState').then((response) => {
-    if (response.code === 200) {
-      console.log(response.data, 'response') // 状态
-
-      // 根据闲置，封存，启封等状态获取不同的列表
-      // 接口未写好
-      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
-  })
+  getDictByCode('managerState')
+    .then((response) => {
+      if (response.code === 200) {
+        console.log(response.data, 'response') // 状态
+        managerStateList.value = response.data
+        // searchQuery.approvalStatus = active.value
+        // 根据闲置，封存，启封等状态获取不同的列表
+        getStatusList(searchQuery).then((res) => {
+          if (res.code === 200) {
+            list.value = res.data.rows.map((item: TableRow) => {
+              return {
+                ...item,
+                approvalStatus: approvalStatusMap[item.approvalStatus],
+              }
+            })
+            total.value = res.data.total
+          }
+          loadingTable.value = false
+        })
+      }
+    })
+    .catch((_) => {
+      loadingTable.value = false
+    })
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -158,6 +214,7 @@
     name: 'stateManageDetail',
     params: {
       type: 'edit',
+      id: row.id,
     },
     query: {
       title: '编辑',
@@ -168,15 +225,22 @@
 }
 // 删除
 const remove = (row: TableRow) => {
-  ElMessageBox.confirm(
-    `确认删除${row.equipmentName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
+  const { id } = row
+  ElMessageBox.confirm(`确认删除${row.equipmentName}吗？`, '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    deleteStatus({ id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        getList()
+      }
+    })
+  })
 }
 // 同意
 const agree = (row: TableRow) => {
@@ -191,16 +255,45 @@
   approvalDialog.value.initDialog('refuse', row.taskId)
 }
 // 取消
-const cancel = (rowrow: TableRow) => {
-  ElMessageBox.confirm(
-    '确认取消吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
+const cancel = (row: TableRow) => {
+  // 流程id为空
+  const { processId } = row
+  ElMessageBox.confirm('确认取消吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    cancelStatus({ processInstanceId: processId }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        getList()
+      }
+    })
+  })
+}
+
+// 提交
+const submit = (row: TableRow) => {
+  // 流程id为空
+  const { id } = row
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitStatus({ id, formId: searchQuery.formId }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        getList()
+      }
+    })
+  })
 }
 // 搜索
 const search = () => {
@@ -208,16 +301,13 @@
 }
 // 重置
 const reset = () => {
+  clearSearch()
   getList()
 }
 // 模板下载
-const templateDownload = () => {
-
-}
+const templateDownload = () => {}
 // 标签识别
-const identify = () => {
-
-}
+const identify = () => {}
 // 新增
 const add = () => {
   $router.push({
@@ -251,7 +341,9 @@
     printJSON(list.value, properties, props.name)
   }
   else if (selectIds.length > 0) {
-    const printList = list.value.filter((item: TableRow) => selectIds.includes(item.id))
+    const printList = list.value.filter((item: TableRow) =>
+      selectIds.includes(item.id),
+    )
     printJSON(printList, properties, props.name)
   }
   else {
@@ -284,18 +376,22 @@
   getList()
   dialogVisible.value = false
 }
-watch(() => props.type, (newValue) => {
-  if (newValue === '0') {
-    searchQuery.approvalStatus = ''
-  }
-  else {
-    searchQuery.approvalStatus = newValue
-  }
-  getList()
-}, {
-  immediate: true,
-  deep: true,
-})
+watch(
+  () => props.type,
+  (newValue) => {
+    if (newValue === '0') {
+      searchQuery.approvalStatus = ''
+    }
+    else {
+      searchQuery.approvalStatus = newValue
+    }
+    getList()
+  },
+  {
+    immediate: true,
+    deep: true,
+  },
+)
 </script>
 
 <template>
@@ -307,68 +403,197 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input placeholder="申请编号" clearable class="w-50 m-2" />
+          <el-input
+            v-model="searchQuery.applyNo"
+            placeholder="申请编号"
+            clearable
+            class="w-50 m-2"
+          />
         </search-item>
         <search-item>
-          <el-input placeholder="设备编号" clearable class="w-50 m-2" />
+          <el-input
+            v-model="searchQuery.equipmentNo"
+            placeholder="设备编号"
+            clearable
+            class="w-50 m-2"
+          />
         </search-item>
         <search-item>
-          <el-input placeholder="设备名称" clearable class="w-50 m-2" />
+          <el-input
+            v-model="searchQuery.equipmentName"
+            placeholder="设备名称"
+            clearable
+            class="w-50 m-2"
+          />
         </search-item>
         <search-item>
-          <el-input placeholder="申请单位" clearable class="w-50 m-2" />
+          <el-input
+            v-model="searchQuery.applyUnit"
+            placeholder="申请单位"
+            clearable
+            class="w-50 m-2"
+          />
         </search-item>
         <search-item>
-          <el-select placeholder="申请状态" clearable />
+          <el-select
+            v-model="searchQuery.applyStatus"
+            placeholder="申请状态"
+            clearable
+          >
+            <el-option
+              v-for="manager of managerStateList"
+              :key="manager.id"
+              :label="manager.name"
+              :value="manager.value"
+            />
+          </el-select>
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <input
+            v-show="searchQuery.limit === 0"
+            ref="fileRef"
+            type="file"
+            multiple
+            @change="onFileChange"
+          >
           <icon-button icon="icon-add" title="新建" @click="add" />
-          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button
+            icon="icon-export"
+            title="导出"
+            @click="exportExcelBtn"
+          />
           <icon-button icon="icon-print" title="打印" @click="printList" />
         </template>
         <!-- 表格区域 -->
         <normal-table
           id="print"
-          :data="list" :total="total" :columns="columns"
+          :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"
+          @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 }}
+                {{
+                  (searchQuery.offset - 1) * searchQuery.limit
+                    + scope.$index
+                    + 1
+                }}
               </template>
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="230" fixed="right">
+            <el-table-column
+              label="操作"
+              align="center"
+              width="230"
+              fixed="right"
+            >
               <template #default="{ row }">
-                <!-- <el-button size="small" type="primary" link @click="update(row)">
-                  编辑
-                </el-button> -->
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="detail(row)"
+                >
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="agree(row)">
+                <el-button
+                  v-if="
+                    props.type !== '0' && props.type !== '3'
+                      && props.type !== '6' && props.type !== '2'
+                  "
+                  size="small"
+                  type="primary"
+                  link
+                  @click="update(row)"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  v-if="
+                    props.type !== '0' && props.type !== '3'
+                      && props.type !== '6' && props.type !== '2'
+                  "
+                  size="small"
+                  type="primary"
+                  link
+                  @click="submit(row)"
+                >
+                  提交
+                </el-button>
+                <el-button
+                  v-if="(props.type === '0' || props.type === '2')"
+                  size="small"
+                  type="primary"
+                  link
+                  :disabled="
+                    row.approvalStatus !== '待审批'
+                      && row.approvalStatus !== '审批中'
+                  "
+                  @click="agree(row)"
+                >
                   同意
                 </el-button>
-                <el-button size="small" type="primary" link @click="reject(row)">
+                <el-button
+                  v-if="(props.type === '0' || props.type === '2')"
+                  size="small"
+                  type="primary"
+                  link
+                  :disabled="
+                    row.approvalStatus !== '待审批'
+                      && row.approvalStatus !== '审批中'
+                  "
+                  @click="reject(row)"
+                >
                   驳回
                 </el-button>
-                <el-button size="small" type="primary" link @click="refuse(row)">
+                <el-button
+                  v-if="(props.type === '0' || props.type === '2')"
+                  size="small"
+                  type="danger"
+                  link
+                  :disabled="
+                    row.approvalStatus !== '待审批'
+                      && row.approvalStatus !== '审批中'
+                  "
+                  @click="refuse(row)"
+                >
                   拒绝
                 </el-button>
-                <el-button size="small" type="primary" link @click="cancel(row)">
+                <el-button
+                  v-if="
+                    props.type !== '1'
+                      && props.type !== '2'
+                  "
+                  size="small"
+                  type="text"
+                  link
+                  :disabled="row.approvalStatus !== '审批中'"
+                  @click="cancel(row)"
+                >
                   取消
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button
+                  v-if="
+                    props.type !== '4'
+                      && props.type !== '5'
+                  "
+                  :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
+                  size="small"
+                  type="danger"
+                  link
+                  @click="remove(row)"
+                >
                   删除
                 </el-button>
               </template>

diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 8771c29..17c5b36 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -16,6 +16,16 @@
     data,
   })
 }
+
+// 状态管理编辑
+export function updateStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/updateStateManageInfo',
+    method: 'post',
+    data,
+  })
+}
+
 // 状态管理删除
 export function deleteStatus(data: object) {
   return request({
@@ -24,6 +34,22 @@
     data,
   })
 }
+// 状态管理取消
+export function cancelStatus(data: object) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
+// 状态管理提交
+export function submitStatus(data: object) {
+  return request({
+    url: '/meter/stateManage/submitStandardEquipmentApply',
+    method: 'post',
+    data,
+  })
+}
 // 状态管理详情
 export function detailStatus(data: object) {
   return request({
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 7f8f5ce..f751201 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -5,12 +5,14 @@
   applyPerson: string // 	申请人
   applyUnit: string // 	申请单位
   approvalStatus?: string // 	审批状态
-  createUser: string // 	创建人
-  processResult: string // 	处置结果
+  createUser?: string // 	创建人
+  processResult?: string // 	处置结果
+  applyType: string // 申请类型
   time: string // 	申请日期
   limit?: number
   offset?: number
   ids?: string[]
+  formId?: string
 }
 // 借用设备类型
 export interface borrowDeviceType {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 470bad1..2f7a26f 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -35,7 +35,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :status="current" />
+    <component :is="currentComp" :status="current" apply-type="2" />
   </div>
 </template>
 
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 53046f0..1c13501 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -56,7 +56,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :name="current" :type="type" />
+    <component :is="currentComp" :name="current" :type="type" apply-type="2" />
   </div>
 </template>
 
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index e43c46a..1e8075c 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -7,11 +7,17 @@
 import { exportFile } from '@/utils/exportUtils'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
+import { SCHEDULE } from '@/utils/scheduleDict'
+
 const props = defineProps({
   type: {
     type: String,
     required: true,
   },
+  applyType: {
+    type: String,
+    required: true,
+  },
 })
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
@@ -21,13 +27,15 @@
   applyNo: '', // 申请编号
   applyPerson: '', // 	申请人
   applyUnit: '', // 	申请单位
-  approvalStatus: '', // 	审批状态
+  approvalStatus: '0', // 	审批状态
   createUser: '', // 	创建人
   processResult: '', // 	处置结果
+  applyType: props.applyType,
   time: '', // 	申请日期
   ids: [] as string[],
   limit: 20,
   offset: 1,
+  formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
 }) // 查询参数
 watch(() => time.value, (newVal) => {
   if (newVal) {
@@ -94,12 +102,12 @@
   },
   {
     text: '申请部门',
-    value: 'applyUnit',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'applyPerson',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index 7f3ea3e..293be0c 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,24 +1,37 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
+import { deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
+import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import { SCHEDULE } from '@/utils/scheduleDict'
 import { printJSON } from '@/utils/printUtils'
 const props = defineProps({
   status: {
     type: String,
     required: true,
   },
+  applyType: {
+    type: String,
+    required: true,
+  },
 })
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const time = ref()
-const searchQuery = reactive({
-  applyNo: '',
-  applyName: '',
-  applyUnit: '',
-  applyPerson: '',
-  limit: 10,
+const searchQuery = reactive<searchType>({
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 	申请人
+  applyUnit: '', // 	申请单位
+  approvalStatus: '0', // 	审批状态
+  createUser: '', // 	创建人
+  processResult: '', // 	处置结果
+  applyType: props.applyType,
+  time: '', // 	申请日期
+  ids: [] as string[],
+  limit: 20,
   offset: 1,
-  ids: [],
+  formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
 }) // 查询参数
 watch(() => time.value, (newVal) => {
   if (newVal) {
@@ -68,35 +81,16 @@
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
-  // loadingTable.value = true
-  // listPageApi(searchQuery).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  //   loadingTable.value = false
-  // }).catch((_) => {
-  //   loadingTable.value = false
-  // })
-  // list.value = [
-  //   {
-  //     applyName: '借用测试设备',
-  //     applyNo: '1433223',
-  //     applyUnit: '顶级',
-  //     applyPerson: '张三',
-  //     time: '2020-12-12 00:00:00',
-  //     approvalStatusName: '审批中',
-  //   },
-  //   {
-  //     applyName: '借用电脑',
-  //     applyNo: '1433223',
-  //     applyUnit: '徐州分中心',
-  //     applyPerson: '里斯',
-  //     time: '2020-12-12 00:00:00',
-  //     approvalStatusName: '已通过',
-  //   },
-  // ] as any
-  // total.value = 2
+  loadingTable.value = true
+  getApplyList(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -124,6 +118,7 @@
     query: {
       title: '详情',
       name: '设备借用处理',
+      // approvalStatusName: row.approvalStatusName,
     },
   })
 }
@@ -157,15 +152,15 @@
     },
   )
     .then(() => {
-      // assetsDeleteApi({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     getList()
-      //   }
-      // })
+      deleteApply({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
     })
 }
 // 搜索
@@ -174,7 +169,11 @@
 }
 // 重置
 const reset = () => {
-  // searchQuery.equipmentCategory = ''
+  searchQuery.applyName = ''
+  searchQuery.applyNo = ''
+  searchQuery.applyPerson = ''
+  searchQuery.applyUnit = ''
+  searchQuery.time = ''
   getList()
 }
 // 模板下载
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index ec522cf..0d33dfb 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -13,7 +13,7 @@
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
 import { addApply, deleteApply, detailApply, editApply } from '@/api/device/borrow'
-import { addStatus, detailStatus } from '@/api/device/stateManage'
+import { addStatus, detailStatus, updateStatus } from '@/api/device/stateManage'
 import type { borrowDeviceType } from '@/views/device/borrow/borrow-interface'
 import useUserStore from '@/store/modules/user'
 
@@ -30,7 +30,7 @@
 }
 const ruleForm1 = ref({
   applyType: $route.query.applyType, // 申请类型
-  applyDesc: '', // 申请说明
+  remark: '', // 申请说明
   time: '', // 时间
   fileList: [] as any[], //	说明书
   applyUnit: '', // 申请单位
@@ -41,6 +41,7 @@
   equipmentSpecifications: '', // 设备规格
   manufacturingNo: '', // 出厂编号
   manufacturer: '', // 生产厂家
+  equipmentId: '',
   equipmentList: [] as EquipmentListRow[],
   id: '',
 }) // 表单
@@ -212,7 +213,7 @@
         ruleForm1.value = res.data
         ruleForm1.value.applyUnit = res.data.applyUnit
         ruleForm1.value.equipmentNo = res.data.applyNo
-        ruleForm1.value.equipmentName = res.data.applyTypeName
+        ruleForm1.value.equipmentName = res.data.equipmentName
         ruleForm1.value.time = res.data.time
       })
     }
@@ -304,15 +305,34 @@
             type: 'warning',
           },
         ).then((res) => {
-          addStatus(ruleForm1.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('操作成功!')
-              $router.go(-1)
+          if (title.value == '编辑') {
+            ruleForm1.value.applyPerson = ruleForm1.value.id
+            ruleForm1.value.applyUnit = ruleForm1.value.id
+            if (ruleForm1.value.equipmentList && ruleForm1.value.equipmentList[0]) {
+              ruleForm1.value.equipmentId = ruleForm1.value.equipmentList[0].equipmentId
+              delete ruleForm1.value.equipmentList
             }
-            else {
-              ElMessage.warning(res.message)
-            }
-          })
+            updateStatus(ruleForm1.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('操作成功!')
+                $router.go(-1)
+              }
+              else {
+                ElMessage.warning(res.message)
+              }
+            })
+          }
+          else {
+            addStatus(ruleForm1.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('操作成功!')
+                $router.go(-1)
+              }
+              else {
+                ElMessage.warning(res.message)
+              }
+            })
+          }
         })
       }
     })
@@ -680,8 +700,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="18">
-            <el-form-item label="申请理由" prop="applyDesc">
-              <el-input v-model.trim="ruleForm1.applyDesc" :placeholder="title === '详情' ? '' : '申请理由'" :disabled="title === '详情'" />
+            <el-form-item label="申请理由" prop="remark">
+              <el-input v-model.trim="ruleForm1.remark" :placeholder="title === '详情' ? '' : '申请理由'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -760,7 +780,7 @@
           </el-table-column>
         </el-table>
       </detail-block>
-      <detail-block v-if="title !== '新建'" title="审批流程">
+      <!-- <detail-block v-if="title !== '新建'" title="审批流程">
         <el-timeline>
           <el-timeline-item timestamp="2018/4/12" placement="top">
             <el-card>
@@ -781,7 +801,7 @@
             </el-card>
           </el-timeline-item>
         </el-timeline>
-      </detail-block>
+      </detail-block> -->
     </div>
   </app-container>
 </template>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 1cc56b2..a2ff30f 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -1,14 +1,19 @@
 <!-- 状态管理公共列表组件 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-// import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import type { TableRow } from './status-interface'
-import { getStatusList } from '@/api/device/stateManage'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import {
+  cancelStatus,
+  deleteStatus,
+  getStatusList,
+  submitStatus,
+} from '@/api/device/stateManage'
 import { getDictByCode } from '@/api/system/dict'
 import { printJSON } from '@/utils/printUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { SCHEDULE } from '@/utils/scheduleDict'
-
+// 选中的按钮
 const props = defineProps({
   name: {
     type: String,
@@ -18,28 +23,53 @@
     type: String,
     default: '',
   },
-  type: { // 当前状态
+  type: {
+    // 当前状态
     type: String,
     default: '',
   },
-  applyType: { // 设备申请类型
+  applyType: {
+    // 设备申请类型
     type: String,
     default: '',
   },
-})
+}); const active = ref('0')// 审批状态字典
+const approvalStatusMap: { [key: string]: string } = {
+  1: '草稿箱',
+  2: '待审批',
+  3: '审批中',
+  4: '已通过',
+  5: '未通过',
+  6: '已取消',
+  7: '非草稿',
+  8: '未通过-驳回',
+}
+// 审批状态字典
+const approvalStatusReserveMap: { [key: string]: string } = {
+  '草稿箱': '1',
+  '待审批': '2',
+  '审批中': '3',
+  '已通过': '4',
+  '未通过': '5',
+  '已取消': '6',
+  '非草稿': '7',
+  '未通过-驳回': '8',
+}
+
 const formIdList = ref({
   设备闲置申请: 'DEVICE_UNUSED_APPROVAL',
   设备封存申请: 'DEVICE_SEALED_APPROVAL',
   设备启封申请: 'DEVICE_UNSEALED_APPROVAL',
   设备报废申请: 'DEVICE_SCRAPPED_ROVAL',
   设备处置申请: 'DEVICE_HANDLE_APPROVAL',
+  设备借用申请: 'DEVICE_BORROW_APPROVAL',
 })
 const $router = useRouter()
 const searchQuery = reactive({
   applyNo: '', // 申请编号
   applyStatus: '', // 申请状态
   applyUnit: '', // 申请单位
-  approvalStatus: '', // 审批状态
+  approvalStatus: '0', // 审批状态
   createUser: '', // 创建人
   equipmentName: '', // 设备名称
   equipmentNo: '', // 设备编号
@@ -49,6 +79,7 @@
   applyType: props.applyType, // 申请类型
   formId: SCHEDULE[formIdList.value[props.name]],
 }) // 查询参数
+
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref<TableColumn[]>([
@@ -104,28 +135,53 @@
   },
 ]) // 表格
 const list = ref([]) // 表格数据
+const managerStateList = ref([]) // 状态数据
 const approvalDialog = ref()
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+const { proxy } = getCurrentInstance() as any
+
+const clearSearch = () => {
+  searchQuery.equipmentName = ''
+  searchQuery.applyNo = ''
+  searchQuery.applyStatus = ''
+  searchQuery.applyUnit = ''
+  searchQuery.approvalStatus = ''
+  searchQuery.createUser = ''
+  searchQuery.equipmentNo = ''
+  searchQuery.ids = [] as string[]
+  searchQuery.limit = 20
+  searchQuery.offset = 1
+  searchQuery.applyType = props.applyType
+  searchQuery.formId = SCHEDULE[formIdList.value[props.name]]
+}
+
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  getDictByCode('managerState').then((response) => {
-    if (response.code === 200) {
-      console.log(response.data, 'response') // 状态
-
-      // 根据闲置，封存，启封等状态获取不同的列表
-      // 接口未写好
-      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
-  })
+  getDictByCode('managerState')
+    .then((response) => {
+      if (response.code === 200) {
+        console.log(response.data, 'response') // 状态
+        managerStateList.value = response.data
+        // searchQuery.approvalStatus = active.value
+        // 根据闲置，封存，启封等状态获取不同的列表
+        getStatusList(searchQuery).then((res) => {
+          if (res.code === 200) {
+            list.value = res.data.rows.map((item: TableRow) => {
+              return {
+                ...item,
+                approvalStatus: approvalStatusMap[item.approvalStatus],
+              }
+            })
+            total.value = res.data.total
+          }
+          loadingTable.value = false
+        })
+      }
+    })
+    .catch((_) => {
+      loadingTable.value = false
+    })
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -158,6 +214,7 @@
     name: 'stateManageDetail',
     params: {
       type: 'edit',
+      id: row.id,
     },
     query: {
       title: '编辑',
@@ -168,15 +225,22 @@
 }
 // 删除
 const remove = (row: TableRow) => {
-  ElMessageBox.confirm(
-    `确认删除${row.equipmentName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
+  const { id } = row
+  ElMessageBox.confirm(`确认删除${row.equipmentName}吗？`, '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    deleteStatus({ id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        getList()
+      }
+    })
+  })
 }
 // 同意
 const agree = (row: TableRow) => {
@@ -191,16 +255,45 @@
   approvalDialog.value.initDialog('refuse', row.taskId)
 }
 // 取消
-const cancel = (rowrow: TableRow) => {
-  ElMessageBox.confirm(
-    '确认取消吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
+const cancel = (row: TableRow) => {
+  // 流程id为空
+  const { processId } = row
+  ElMessageBox.confirm('确认取消吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    cancelStatus({ processInstanceId: processId }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        getList()
+      }
+    })
+  })
+}
+
+// 提交
+const submit = (row: TableRow) => {
+  // 流程id为空
+  const { id } = row
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitStatus({ id, formId: searchQuery.formId }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        getList()
+      }
+    })
+  })
 }
 // 搜索
 const search = () => {
@@ -208,16 +301,13 @@
 }
 // 重置
 const reset = () => {
+  clearSearch()
   getList()
 }
 // 模板下载
-const templateDownload = () => {
-
-}
+const templateDownload = () => {}
 // 标签识别
-const identify = () => {
-
-}
+const identify = () => {}
 // 新增
 const add = () => {
   $router.push({
@@ -251,7 +341,9 @@
     printJSON(list.value, properties, props.name)
   }
   else if (selectIds.length > 0) {
-    const printList = list.value.filter((item: TableRow) => selectIds.includes(item.id))
+    const printList = list.value.filter((item: TableRow) =>
+      selectIds.includes(item.id),
+    )
     printJSON(printList, properties, props.name)
   }
   else {
@@ -284,18 +376,22 @@
   getList()
   dialogVisible.value = false
 }
-watch(() => props.type, (newValue) => {
-  if (newValue === '0') {
-    searchQuery.approvalStatus = ''
-  }
-  else {
-    searchQuery.approvalStatus = newValue
-  }
-  getList()
-}, {
-  immediate: true,
-  deep: true,
-})
+watch(
+  () => props.type,
+  (newValue) => {
+    if (newValue === '0') {
+      searchQuery.approvalStatus = ''
+    }
+    else {
+      searchQuery.approvalStatus = newValue
+    }
+    getList()
+  },
+  {
+    immediate: true,
+    deep: true,
+  },
+)
 </script>
 
 <template>
@@ -307,68 +403,197 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input placeholder="申请编号" clearable class="w-50 m-2" />
+          <el-input
+            v-model="searchQuery.applyNo"
+            placeholder="申请编号"
+            clearable
+            class="w-50 m-2"
+          />
         </search-item>
         <search-item>
-          <el-input placeholder="设备编号" clearable class="w-50 m-2" />
+          <el-input
+            v-model="searchQuery.equipmentNo"
+            placeholder="设备编号"
+            clearable
+            class="w-50 m-2"
+          />
         </search-item>
         <search-item>
-          <el-input placeholder="设备名称" clearable class="w-50 m-2" />
+          <el-input
+            v-model="searchQuery.equipmentName"
+            placeholder="设备名称"
+            clearable
+            class="w-50 m-2"
+          />
         </search-item>
         <search-item>
-          <el-input placeholder="申请单位" clearable class="w-50 m-2" />
+          <el-input
+            v-model="searchQuery.applyUnit"
+            placeholder="申请单位"
+            clearable
+            class="w-50 m-2"
+          />
         </search-item>
         <search-item>
-          <el-select placeholder="申请状态" clearable />
+          <el-select
+            v-model="searchQuery.applyStatus"
+            placeholder="申请状态"
+            clearable
+          >
+            <el-option
+              v-for="manager of managerStateList"
+              :key="manager.id"
+              :label="manager.name"
+              :value="manager.value"
+            />
+          </el-select>
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <input
+            v-show="searchQuery.limit === 0"
+            ref="fileRef"
+            type="file"
+            multiple
+            @change="onFileChange"
+          >
           <icon-button icon="icon-add" title="新建" @click="add" />
-          <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+          <icon-button
+            icon="icon-export"
+            title="导出"
+            @click="exportExcelBtn"
+          />
           <icon-button icon="icon-print" title="打印" @click="printList" />
         </template>
         <!-- 表格区域 -->
         <normal-table
           id="print"
-          :data="list" :total="total" :columns="columns"
+          :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"
+          @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 }}
+                {{
+                  (searchQuery.offset - 1) * searchQuery.limit
+                    + scope.$index
+                    + 1
+                }}
               </template>
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="230" fixed="right">
+            <el-table-column
+              label="操作"
+              align="center"
+              width="230"
+              fixed="right"
+            >
               <template #default="{ row }">
-                <!-- <el-button size="small" type="primary" link @click="update(row)">
-                  编辑
-                </el-button> -->
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="detail(row)"
+                >
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="agree(row)">
+                <el-button
+                  v-if="
+                    props.type !== '0' && props.type !== '3'
+                      && props.type !== '6' && props.type !== '2'
+                  "
+                  size="small"
+                  type="primary"
+                  link
+                  @click="update(row)"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  v-if="
+                    props.type !== '0' && props.type !== '3'
+                      && props.type !== '6' && props.type !== '2'
+                  "
+                  size="small"
+                  type="primary"
+                  link
+                  @click="submit(row)"
+                >
+                  提交
+                </el-button>
+                <el-button
+                  v-if="(props.type === '0' || props.type === '2')"
+                  size="small"
+                  type="primary"
+                  link
+                  :disabled="
+                    row.approvalStatus !== '待审批'
+                      && row.approvalStatus !== '审批中'
+                  "
+                  @click="agree(row)"
+                >
                   同意
                 </el-button>
-                <el-button size="small" type="primary" link @click="reject(row)">
+                <el-button
+                  v-if="(props.type === '0' || props.type === '2')"
+                  size="small"
+                  type="primary"
+                  link
+                  :disabled="
+                    row.approvalStatus !== '待审批'
+                      && row.approvalStatus !== '审批中'
+                  "
+                  @click="reject(row)"
+                >
                   驳回
                 </el-button>
-                <el-button size="small" type="primary" link @click="refuse(row)">
+                <el-button
+                  v-if="(props.type === '0' || props.type === '2')"
+                  size="small"
+                  type="danger"
+                  link
+                  :disabled="
+                    row.approvalStatus !== '待审批'
+                      && row.approvalStatus !== '审批中'
+                  "
+                  @click="refuse(row)"
+                >
                   拒绝
                 </el-button>
-                <el-button size="small" type="primary" link @click="cancel(row)">
+                <el-button
+                  v-if="
+                    props.type !== '1'
+                      && props.type !== '2'
+                  "
+                  size="small"
+                  type="text"
+                  link
+                  :disabled="row.approvalStatus !== '审批中'"
+                  @click="cancel(row)"
+                >
                   取消
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button
+                  v-if="
+                    props.type !== '4'
+                      && props.type !== '5'
+                  "
+                  :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
+                  size="small"
+                  type="danger"
+                  link
+                  @click="remove(row)"
+                >
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 9b5c151..fd22bcd 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -53,16 +53,16 @@
 const list = ref([]) // 表格数据
 // 获取数据列表
 const getList = () => {
-  // loadingTable.value = true
-  // approvallistPageApi(searchQuery).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  //   loadingTable.value = false
-  // }).catch((_) => {
-  //   loadingTable.value = false
-  // })
+  loadingTable.value = true
+  approvallistPageApi(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
   list.value = [
     {
       approvalStatus: '1',