diff --git "a/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js" "b/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
index 4c9b127..633c7a9 100644
--- "a/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
+++ "b/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
@@ -11,6 +11,7 @@
       },
       "directorMaxLevel": 4,//审批主管最大层级
       "flowPermission": [],//发起人
+      "decisionItem": 1, //1同意驳回拒绝、2同意驳回、3拒绝
       "nodeConfig": {
           "nodeName": "发起人",//节点名称
           "type": 0,// 0 发起人 1审批 2抄送 3条件 4路由

diff --git "a/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js" "b/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
index 4c9b127..633c7a9 100644
--- "a/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
+++ "b/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
@@ -11,6 +11,7 @@
       },
       "directorMaxLevel": 4,//审批主管最大层级
       "flowPermission": [],//发起人
+      "decisionItem": 1, //1同意驳回拒绝、2同意驳回、3拒绝
       "nodeConfig": {
           "nodeName": "发起人",//节点名称
           "type": 0,// 0 发起人 1审批 2抄送 3条件 4路由
diff --git a/src/api/business/environmentRecord/environmentRecord.ts b/src/api/business/environmentRecord/environmentRecord.ts
deleted file mode 100644
index 1a575eb..0000000
--- a/src/api/business/environmentRecord/environmentRecord.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import request from '../../index'
-
-// 环境记录单列表查询-分页
-export function getenvironmentRecordList(data: { offset: number; limit: number }) {
-  return request({
-    url: `/business/environmentRecord/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 环境记录单删除
-export function getenvironmentRecordDelete(data: object) {
-  return request({
-    url: '/business/environmentRecord/delete',
-    method: 'post',
-    data,
-  })
-}
-
-// 新增环境记录单
-export function getenvironmentRecordAdd(data: object) {
-  return request({
-    url: '/business/environmentRecord/add',
-    method: 'post',
-    data,
-  })
-}
-
-// 环境监测记录单-详情
-export function getenvironmentRecordDetail(data: object) {
-  return request({
-    url: '/business/environmentRecord/detail',
-    method: 'post',
-    data,
-  })
-}
-
-// 环境监测记录单-编辑
-export function getenvironmentRecordUpdate(data: object) {
-  return request({
-    url: '/business/environmentRecord/update',
-    method: 'post',
-    data,
-  })
-}

diff --git "a/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js" "b/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
index 4c9b127..633c7a9 100644
--- "a/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
+++ "b/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
@@ -11,6 +11,7 @@
       },
       "directorMaxLevel": 4,//审批主管最大层级
       "flowPermission": [],//发起人
+      "decisionItem": 1, //1同意驳回拒绝、2同意驳回、3拒绝
       "nodeConfig": {
           "nodeName": "发起人",//节点名称
           "type": 0,// 0 发起人 1审批 2抄送 3条件 4路由
diff --git a/src/api/business/environmentRecord/environmentRecord.ts b/src/api/business/environmentRecord/environmentRecord.ts
deleted file mode 100644
index 1a575eb..0000000
--- a/src/api/business/environmentRecord/environmentRecord.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import request from '../../index'
-
-// 环境记录单列表查询-分页
-export function getenvironmentRecordList(data: { offset: number; limit: number }) {
-  return request({
-    url: `/business/environmentRecord/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 环境记录单删除
-export function getenvironmentRecordDelete(data: object) {
-  return request({
-    url: '/business/environmentRecord/delete',
-    method: 'post',
-    data,
-  })
-}
-
-// 新增环境记录单
-export function getenvironmentRecordAdd(data: object) {
-  return request({
-    url: '/business/environmentRecord/add',
-    method: 'post',
-    data,
-  })
-}
-
-// 环境监测记录单-详情
-export function getenvironmentRecordDetail(data: object) {
-  return request({
-    url: '/business/environmentRecord/detail',
-    method: 'post',
-    data,
-  })
-}
-
-// 环境监测记录单-编辑
-export function getenvironmentRecordUpdate(data: object) {
-  return request({
-    url: '/business/environmentRecord/update',
-    method: 'post',
-    data,
-  })
-}
diff --git a/src/api/business/lab/environmentRecord.ts b/src/api/business/lab/environmentRecord.ts
new file mode 100644
index 0000000..f76a9ce
--- /dev/null
+++ b/src/api/business/lab/environmentRecord.ts
@@ -0,0 +1,58 @@
+import request from '../../index'
+import type { IEnvironmentalDetail, IListQuery } from '@/views/business/lab/environmental/environmentalList_interface'
+const prefix = '/business/environmentRecord'
+
+// 环境记录单列表查询-分页
+export function getEnvironmentRecordList(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 环境记录单删除
+export function getEnvironmentRecordDelete(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新增环境记录单
+export function getEnvironmentRecordAdd(data: IEnvironmentalDetail) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 环境监测记录单-详情
+export function getEnvironmentRecordDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 环境监测记录单-编辑
+export function getEnvironmentRecordUpdate(data: IEnvironmentalDetail) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportEnvironmentRecord(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/export`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}

diff --git "a/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js" "b/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
index 4c9b127..633c7a9 100644
--- "a/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
+++ "b/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
@@ -11,6 +11,7 @@
       },
       "directorMaxLevel": 4,//审批主管最大层级
       "flowPermission": [],//发起人
+      "decisionItem": 1, //1同意驳回拒绝、2同意驳回、3拒绝
       "nodeConfig": {
           "nodeName": "发起人",//节点名称
           "type": 0,// 0 发起人 1审批 2抄送 3条件 4路由
diff --git a/src/api/business/environmentRecord/environmentRecord.ts b/src/api/business/environmentRecord/environmentRecord.ts
deleted file mode 100644
index 1a575eb..0000000
--- a/src/api/business/environmentRecord/environmentRecord.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import request from '../../index'
-
-// 环境记录单列表查询-分页
-export function getenvironmentRecordList(data: { offset: number; limit: number }) {
-  return request({
-    url: `/business/environmentRecord/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 环境记录单删除
-export function getenvironmentRecordDelete(data: object) {
-  return request({
-    url: '/business/environmentRecord/delete',
-    method: 'post',
-    data,
-  })
-}
-
-// 新增环境记录单
-export function getenvironmentRecordAdd(data: object) {
-  return request({
-    url: '/business/environmentRecord/add',
-    method: 'post',
-    data,
-  })
-}
-
-// 环境监测记录单-详情
-export function getenvironmentRecordDetail(data: object) {
-  return request({
-    url: '/business/environmentRecord/detail',
-    method: 'post',
-    data,
-  })
-}
-
-// 环境监测记录单-编辑
-export function getenvironmentRecordUpdate(data: object) {
-  return request({
-    url: '/business/environmentRecord/update',
-    method: 'post',
-    data,
-  })
-}
diff --git a/src/api/business/lab/environmentRecord.ts b/src/api/business/lab/environmentRecord.ts
new file mode 100644
index 0000000..f76a9ce
--- /dev/null
+++ b/src/api/business/lab/environmentRecord.ts
@@ -0,0 +1,58 @@
+import request from '../../index'
+import type { IEnvironmentalDetail, IListQuery } from '@/views/business/lab/environmental/environmentalList_interface'
+const prefix = '/business/environmentRecord'
+
+// 环境记录单列表查询-分页
+export function getEnvironmentRecordList(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 环境记录单删除
+export function getEnvironmentRecordDelete(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新增环境记录单
+export function getEnvironmentRecordAdd(data: IEnvironmentalDetail) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 环境监测记录单-详情
+export function getEnvironmentRecordDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 环境监测记录单-编辑
+export function getEnvironmentRecordUpdate(data: IEnvironmentalDetail) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportEnvironmentRecord(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/export`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index 47a713e..94a4246 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -17,6 +17,16 @@
     data,
   })
 }
+
+// 设备借用取消审批
+export function cancelApproval(data: { processInstanceId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
+
 // 设备借用申请详情
 export function detailApply(data: object) {
   return request({

diff --git "a/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js" "b/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
index 4c9b127..633c7a9 100644
--- "a/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
+++ "b/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
@@ -11,6 +11,7 @@
       },
       "directorMaxLevel": 4,//审批主管最大层级
       "flowPermission": [],//发起人
+      "decisionItem": 1, //1同意驳回拒绝、2同意驳回、3拒绝
       "nodeConfig": {
           "nodeName": "发起人",//节点名称
           "type": 0,// 0 发起人 1审批 2抄送 3条件 4路由
diff --git a/src/api/business/environmentRecord/environmentRecord.ts b/src/api/business/environmentRecord/environmentRecord.ts
deleted file mode 100644
index 1a575eb..0000000
--- a/src/api/business/environmentRecord/environmentRecord.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import request from '../../index'
-
-// 环境记录单列表查询-分页
-export function getenvironmentRecordList(data: { offset: number; limit: number }) {
-  return request({
-    url: `/business/environmentRecord/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 环境记录单删除
-export function getenvironmentRecordDelete(data: object) {
-  return request({
-    url: '/business/environmentRecord/delete',
-    method: 'post',
-    data,
-  })
-}
-
-// 新增环境记录单
-export function getenvironmentRecordAdd(data: object) {
-  return request({
-    url: '/business/environmentRecord/add',
-    method: 'post',
-    data,
-  })
-}
-
-// 环境监测记录单-详情
-export function getenvironmentRecordDetail(data: object) {
-  return request({
-    url: '/business/environmentRecord/detail',
-    method: 'post',
-    data,
-  })
-}
-
-// 环境监测记录单-编辑
-export function getenvironmentRecordUpdate(data: object) {
-  return request({
-    url: '/business/environmentRecord/update',
-    method: 'post',
-    data,
-  })
-}
diff --git a/src/api/business/lab/environmentRecord.ts b/src/api/business/lab/environmentRecord.ts
new file mode 100644
index 0000000..f76a9ce
--- /dev/null
+++ b/src/api/business/lab/environmentRecord.ts
@@ -0,0 +1,58 @@
+import request from '../../index'
+import type { IEnvironmentalDetail, IListQuery } from '@/views/business/lab/environmental/environmentalList_interface'
+const prefix = '/business/environmentRecord'
+
+// 环境记录单列表查询-分页
+export function getEnvironmentRecordList(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 环境记录单删除
+export function getEnvironmentRecordDelete(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新增环境记录单
+export function getEnvironmentRecordAdd(data: IEnvironmentalDetail) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 环境监测记录单-详情
+export function getEnvironmentRecordDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 环境监测记录单-编辑
+export function getEnvironmentRecordUpdate(data: IEnvironmentalDetail) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportEnvironmentRecord(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/export`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index 47a713e..94a4246 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -17,6 +17,16 @@
     data,
   })
 }
+
+// 设备借用取消审批
+export function cancelApproval(data: { processInstanceId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
+
 // 设备借用申请详情
 export function detailApply(data: object) {
   return request({
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 9887075..8fa5759 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -1,15 +1,16 @@
-<script lang="ts" setup name="PlanAdd">
+<!-- 环境记录单详情 -->
+<script lang="ts" setup name="EnvironmentalList">
 import type { FormInstance } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
-import type { selectionListItem } from './environmentalList_interface'
+import type { IEnvironmentalDetail, IRoomNumber } from './environmentalList_interface'
 import { getTypeSelect } from '@/api/system/price'
-import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
+import { getEnvironmentRecordAdd, getEnvironmentRecordDetail, getEnvironmentRecordUpdate } from '@/api/business/lab/environmentRecord'
 import useUserStore from '@/store/modules/user'
+const { proxy } = getCurrentInstance() as any
 const infoId = ref('') // id
-const { name, id } = useUserStore()
+const { name, id } = useUserStore() // 用户名、id
 const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
@@ -23,7 +24,8 @@
     infoId.value = $route.params.id as string
   }
 }
-const formInline = ref({
+// 表单
+const formInline = ref<IEnvironmentalDetail>({
   environmentCode: '', // 环境记录单编号
   roomNumber: '', // 房间编号
   recorder: name || '', // 用户名
@@ -38,10 +40,10 @@
   id: '', // 主键
   updateTime: '', // 更新时间
 })
-const ruleFormRef = ref<FormInstance>()
+const ruleFormRef = ref<FormInstance>() // 表单ref
 
 // 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([])
+const selectionList = ref<IRoomNumber[]>([])
 // 获取下拉框数据
 getTypeSelect('roomNumber').then((res) => {
   selectionList.value = res.data
@@ -73,39 +75,38 @@
   $router.back()
 }
 
+// 获取详情信息
 if (infoId.value && infoId.value !== '') {
-  getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
+  getEnvironmentRecordDetail({ id: infoId.value }).then((res) => {
     if (res.code === 200) {
       formInline.value = res.data
     }
   })
 }
 // 点击保存
-const preserve = async (formEl: FormInstance | undefined) => {
-  if (!formEl) {
-    return
-  }
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      ElMessageBox.confirm('确认提交吗？', '提示', {
+      ElMessageBox.confirm('确认保存吗？', '提示', {
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         type: 'warning',
       }).then(() => {
-        // 是否是新增
+        // 新增
         if (pageType.value === 'add') {
-          getenvironmentRecordAdd(formInline.value).then((res) => {
+          getEnvironmentRecordAdd(formInline.value).then((res) => {
             if (res.code === 200) {
-              ElMessage.success('提交成功!')
+              ElMessage.success('保存成功!')
               close()
             }
           })
         }
-        // 是否是编辑
-        else {
-          getenvironmentRecordUpdate(formInline.value).then((res) => {
+        // 编辑
+        else if (pageType.value === 'edit') {
+          getEnvironmentRecordUpdate(formInline.value).then((res) => {
             if (res.code === 200) {
-              ElMessage.success('提交成功!')
+              ElMessage.success('保存成功!')
               close()
             }
           })
@@ -117,8 +118,8 @@
 // 打印
 const printObj = ref({
   id: 'form', // 需要打印元素的id
-  popTitle: '环境记录单模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '环境记录单详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>环境记录单详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
@@ -130,15 +131,17 @@
     <detail-page :title="`环境记录单-${textMap[pageType]}`">
       <template #btns>
         <el-button
-          v-if="pageType !== 'detail'"
+          v-if="proxy.hasPerm('/lab/environmentalList/add') && pageType !== 'detail'"
           type="primary"
-          @click="
-            preserve(ruleFormRef)
-          "
+          @click="saveForm(ruleFormRef)"
         >
-          提交
+          保存
         </el-button>
-        <el-button v-else v-print="printObj" type="primary">
+        <el-button
+          v-if="proxy.hasPerm('/lab/environmentalList/add') && pageType === 'detail'"
+          v-print="printObj"
+          type="primary"
+        >
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -199,7 +202,7 @@
                 type="datetime"
                 :placeholder="pageType === 'detail' ? '无' : '请选择记录时间'"
                 format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                value-format="YYYY-MM-DD HH:mm:ss"
                 clearable
                 :disabled="pageType === 'detail'"
               />

diff --git "a/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js" "b/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
index 4c9b127..633c7a9 100644
--- "a/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
+++ "b/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
@@ -11,6 +11,7 @@
       },
       "directorMaxLevel": 4,//审批主管最大层级
       "flowPermission": [],//发起人
+      "decisionItem": 1, //1同意驳回拒绝、2同意驳回、3拒绝
       "nodeConfig": {
           "nodeName": "发起人",//节点名称
           "type": 0,// 0 发起人 1审批 2抄送 3条件 4路由
diff --git a/src/api/business/environmentRecord/environmentRecord.ts b/src/api/business/environmentRecord/environmentRecord.ts
deleted file mode 100644
index 1a575eb..0000000
--- a/src/api/business/environmentRecord/environmentRecord.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import request from '../../index'
-
-// 环境记录单列表查询-分页
-export function getenvironmentRecordList(data: { offset: number; limit: number }) {
-  return request({
-    url: `/business/environmentRecord/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 环境记录单删除
-export function getenvironmentRecordDelete(data: object) {
-  return request({
-    url: '/business/environmentRecord/delete',
-    method: 'post',
-    data,
-  })
-}
-
-// 新增环境记录单
-export function getenvironmentRecordAdd(data: object) {
-  return request({
-    url: '/business/environmentRecord/add',
-    method: 'post',
-    data,
-  })
-}
-
-// 环境监测记录单-详情
-export function getenvironmentRecordDetail(data: object) {
-  return request({
-    url: '/business/environmentRecord/detail',
-    method: 'post',
-    data,
-  })
-}
-
-// 环境监测记录单-编辑
-export function getenvironmentRecordUpdate(data: object) {
-  return request({
-    url: '/business/environmentRecord/update',
-    method: 'post',
-    data,
-  })
-}
diff --git a/src/api/business/lab/environmentRecord.ts b/src/api/business/lab/environmentRecord.ts
new file mode 100644
index 0000000..f76a9ce
--- /dev/null
+++ b/src/api/business/lab/environmentRecord.ts
@@ -0,0 +1,58 @@
+import request from '../../index'
+import type { IEnvironmentalDetail, IListQuery } from '@/views/business/lab/environmental/environmentalList_interface'
+const prefix = '/business/environmentRecord'
+
+// 环境记录单列表查询-分页
+export function getEnvironmentRecordList(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 环境记录单删除
+export function getEnvironmentRecordDelete(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新增环境记录单
+export function getEnvironmentRecordAdd(data: IEnvironmentalDetail) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 环境监测记录单-详情
+export function getEnvironmentRecordDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 环境监测记录单-编辑
+export function getEnvironmentRecordUpdate(data: IEnvironmentalDetail) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportEnvironmentRecord(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/export`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index 47a713e..94a4246 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -17,6 +17,16 @@
     data,
   })
 }
+
+// 设备借用取消审批
+export function cancelApproval(data: { processInstanceId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
+
 // 设备借用申请详情
 export function detailApply(data: object) {
   return request({
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 9887075..8fa5759 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -1,15 +1,16 @@
-<script lang="ts" setup name="PlanAdd">
+<!-- 环境记录单详情 -->
+<script lang="ts" setup name="EnvironmentalList">
 import type { FormInstance } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
-import type { selectionListItem } from './environmentalList_interface'
+import type { IEnvironmentalDetail, IRoomNumber } from './environmentalList_interface'
 import { getTypeSelect } from '@/api/system/price'
-import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
+import { getEnvironmentRecordAdd, getEnvironmentRecordDetail, getEnvironmentRecordUpdate } from '@/api/business/lab/environmentRecord'
 import useUserStore from '@/store/modules/user'
+const { proxy } = getCurrentInstance() as any
 const infoId = ref('') // id
-const { name, id } = useUserStore()
+const { name, id } = useUserStore() // 用户名、id
 const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
@@ -23,7 +24,8 @@
     infoId.value = $route.params.id as string
   }
 }
-const formInline = ref({
+// 表单
+const formInline = ref<IEnvironmentalDetail>({
   environmentCode: '', // 环境记录单编号
   roomNumber: '', // 房间编号
   recorder: name || '', // 用户名
@@ -38,10 +40,10 @@
   id: '', // 主键
   updateTime: '', // 更新时间
 })
-const ruleFormRef = ref<FormInstance>()
+const ruleFormRef = ref<FormInstance>() // 表单ref
 
 // 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([])
+const selectionList = ref<IRoomNumber[]>([])
 // 获取下拉框数据
 getTypeSelect('roomNumber').then((res) => {
   selectionList.value = res.data
@@ -73,39 +75,38 @@
   $router.back()
 }
 
+// 获取详情信息
 if (infoId.value && infoId.value !== '') {
-  getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
+  getEnvironmentRecordDetail({ id: infoId.value }).then((res) => {
     if (res.code === 200) {
       formInline.value = res.data
     }
   })
 }
 // 点击保存
-const preserve = async (formEl: FormInstance | undefined) => {
-  if (!formEl) {
-    return
-  }
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      ElMessageBox.confirm('确认提交吗？', '提示', {
+      ElMessageBox.confirm('确认保存吗？', '提示', {
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         type: 'warning',
       }).then(() => {
-        // 是否是新增
+        // 新增
         if (pageType.value === 'add') {
-          getenvironmentRecordAdd(formInline.value).then((res) => {
+          getEnvironmentRecordAdd(formInline.value).then((res) => {
             if (res.code === 200) {
-              ElMessage.success('提交成功!')
+              ElMessage.success('保存成功!')
               close()
             }
           })
         }
-        // 是否是编辑
-        else {
-          getenvironmentRecordUpdate(formInline.value).then((res) => {
+        // 编辑
+        else if (pageType.value === 'edit') {
+          getEnvironmentRecordUpdate(formInline.value).then((res) => {
             if (res.code === 200) {
-              ElMessage.success('提交成功!')
+              ElMessage.success('保存成功!')
               close()
             }
           })
@@ -117,8 +118,8 @@
 // 打印
 const printObj = ref({
   id: 'form', // 需要打印元素的id
-  popTitle: '环境记录单模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '环境记录单详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>环境记录单详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
@@ -130,15 +131,17 @@
     <detail-page :title="`环境记录单-${textMap[pageType]}`">
       <template #btns>
         <el-button
-          v-if="pageType !== 'detail'"
+          v-if="proxy.hasPerm('/lab/environmentalList/add') && pageType !== 'detail'"
           type="primary"
-          @click="
-            preserve(ruleFormRef)
-          "
+          @click="saveForm(ruleFormRef)"
         >
-          提交
+          保存
         </el-button>
-        <el-button v-else v-print="printObj" type="primary">
+        <el-button
+          v-if="proxy.hasPerm('/lab/environmentalList/add') && pageType === 'detail'"
+          v-print="printObj"
+          type="primary"
+        >
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -199,7 +202,7 @@
                 type="datetime"
                 :placeholder="pageType === 'detail' ? '无' : '请选择记录时间'"
                 format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                value-format="YYYY-MM-DD HH:mm:ss"
                 clearable
                 :disabled="pageType === 'detail'"
               />
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 90110ee..63a0849 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -1,13 +1,18 @@
+<!-- 环境记录单列表 -->
 <script lang="ts" setup name="EnvironmentalList">
-import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
+import type { IEnvironmental, IListQuery, IRoomNumber } from './environmentalList_interface'
 import { getTypeSelect } from '@/api/system/price'
-import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
+import { exportEnvironmentRecord, getEnvironmentRecordDelete, getEnvironmentRecordList } from '@/api/business/lab/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-const listQuery = ref({
+import { exportFile } from '@/utils/exportUtils'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+
+// 查询参数
+const listQuery = ref<IListQuery>({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
   beginTime: '', // 记录开始时间
@@ -15,17 +20,14 @@
   offset: 1, // 当前页
   limit: 20, // 多少条
 })
-const checkoutList = ref<string[]>([])
-const list = ref<IEnvironmental[]>([])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+const list = ref<IEnvironmental[]>([]) // 表格参数
 const total = ref(0)
-const show = ref(true)
+const loadingTable = ref(false) // 表格loading
+const trainTime = ref('') // 记录时间数组
+const roomNumberList = ref<IRoomNumber[]>([]) // 房间号
 
-const loadingTable = ref(false)
-// 初始化路由
-// 培训时间数组
-const trainTime = ref('')
-
-const $router = useRouter()
+// 查询列表
 const fetchData = (isNowPage: boolean) => {
   listQuery.value.beginTime = trainTime.value[0] || ''
   listQuery.value.endTime = trainTime.value[1] || ''
@@ -34,57 +36,23 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getenvironmentRecordList(listQuery.value).then((res) => {
+  getEnvironmentRecordList(listQuery.value).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
   })
   loadingTable.value = false
 }
 fetchData(true)
-const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref<TableColumn[]>([
-  {
-    text: '记录单号',
-    value: 'environmentCode',
-    align: 'center',
-  },
-  {
-    text: '房间号',
-    value: 'roomNumber',
-    align: 'center',
-  },
-  {
-    text: '记录人',
-    value: 'recorder',
-    align: 'center',
-  },
-  {
-    text: '记录时间',
-    value: 'recordTime',
-    width: '180',
-    align: 'center',
-  },
-  {
-    text: '温度(℃)',
-    value: 'temperature',
-    align: 'center',
-  },
-  {
-    text: '湿度(%)',
-    value: 'humidity',
-    align: 'center',
-  },
-  {
-    text: '输出电压(V)',
-    value: 'outputVoltage',
-    align: 'center',
-  },
-  {
-    text: '零地电压(V)',
-    value: 'zeroGroundVoltage',
-    align: 'center',
-  },
+  { text: '记录单号', value: 'environmentCode', align: 'center', width: '160' },
+  { text: '房间号', value: 'roomNumber', align: 'center' },
+  { text: '记录人', value: 'recorder', align: 'center' },
+  { text: '记录时间', value: 'recordTime', width: '180', align: 'center' },
+  { text: '温度(℃)', value: 'temperature', align: 'center' },
+  { text: '湿度(%)', value: 'humidity', align: 'center' },
+  { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
+  { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
 ])
 // 搜索
 const searchList = () => {
@@ -104,38 +72,44 @@
   trainTime.value = ''
   fetchData(true)
 }
+
 // 导出
-const exportExcelBtn = () => {
+const exportAll = () => {
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  // if (list.value.length > 0) {
-  // }
-  // else {
-  //   ElMessage.warning('无数据可导出数据')
-  // }
+  if (list.value.length > 0) {
+    const params = {
+      environmentCode: '', // 记录单编号
+      roomNumber: '', // 房间号
+      beginTime: '', // 记录开始时间
+      endTime: '', // 记录结束时间
+      offset: 1, // 当前页
+      limit: 20, // 多少条
+      ids: checkoutList.value,
+    }
+    exportEnvironmentRecord(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '环境记录单列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
   loading.close()
 }
-// 关闭编辑
-const close = () => {
-  show.value = true
-  fetchData(true)
-}
-// 点击编辑id和删除row类型
-interface rowReturn {
-  id: string
-  environmentCode: string
-}
+
 // 点击编辑/详情
-const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+const handleEdit = (row: IEnvironmental, pageType: 'edit' | 'detail') => {
   $router.push(`/lab/environmentalList/${pageType}/${row.id}`)
 }
+
 // 点击删除
-const handleDelete = (index: string, row: rowReturn) => {
+const handleDelete = (row: IEnvironmental) => {
   ElMessageBox.confirm(
-    `确认删除${row.environmentCode}吗？`,
+    `确认删除单号${row.environmentCode}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -144,12 +118,9 @@
     },
   )
     .then(() => {
-      getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
+      getEnvironmentRecordDelete({ id: row.id }).then((res) => {
         if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
+          ElMessage.success('已删除')
           fetchData(true)
         }
       })
@@ -160,14 +131,12 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
+
 // 点击新增
 const add = () => {
   $router.push('/lab/environmentalList/add')
 }
-// 点击导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -178,12 +147,12 @@
   }
   fetchData(true)
 }
-// 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([])
+
 // 获取下拉框数据
 getTypeSelect('roomNumber').then((res) => {
-  selectionList.value = res.data
+  roomNumberList.value = res.data
 })
+
 // 打印列表
 function printList() {
   // 打印列
@@ -225,7 +194,7 @@
           size="default"
         >
           <el-option
-            v-for="item in selectionList"
+            v-for="item in roomNumberList"
             :key="item.value"
             :label="item.name"
             :value="item.value"
@@ -238,7 +207,7 @@
           type="datetimerange"
           range-separator="到"
           format="YYYY-MM-DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="记录时间开始时间"
           end-placeholder="记录时间结束时间"
         />
@@ -247,21 +216,21 @@
     <table-container>
       <template #btns-right>
         <icon-button
-          v-if="proxy.hasPerm('/measure/train/plan/add')"
+          v-if="proxy.hasPerm('/lab/environmentalList/add')"
           icon="icon-add"
           title="新建"
           type="primary"
           @click="add"
         />
         <icon-button
-          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          v-if="proxy.hasPerm('/lab/environmentalList/export')"
           icon="icon-export"
           title="导出"
           type="primary"
           @click="exportAll"
         />
         <icon-button
-          v-if="proxy.hasPerm('/measure/train/plan/print')"
+          v-if="proxy.hasPerm('/lab/environmentalList/print')"
           icon="icon-print"
           title="打印"
           type="primary"
@@ -278,8 +247,15 @@
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="160">
+          <el-table-column label="操作" align="center" width="130" fixed="right">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/measure/train/plan/edit')"
@@ -303,7 +279,7 @@
                 size="small"
                 link
                 type="danger"
-                @click="handleDelete(row.$index, row)"
+                @click="handleDelete(row)"
               >
                 删除
               </el-button>

diff --git "a/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js" "b/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
index 4c9b127..633c7a9 100644
--- "a/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
+++ "b/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
@@ -11,6 +11,7 @@
       },
       "directorMaxLevel": 4,//审批主管最大层级
       "flowPermission": [],//发起人
+      "decisionItem": 1, //1同意驳回拒绝、2同意驳回、3拒绝
       "nodeConfig": {
           "nodeName": "发起人",//节点名称
           "type": 0,// 0 发起人 1审批 2抄送 3条件 4路由
diff --git a/src/api/business/environmentRecord/environmentRecord.ts b/src/api/business/environmentRecord/environmentRecord.ts
deleted file mode 100644
index 1a575eb..0000000
--- a/src/api/business/environmentRecord/environmentRecord.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import request from '../../index'
-
-// 环境记录单列表查询-分页
-export function getenvironmentRecordList(data: { offset: number; limit: number }) {
-  return request({
-    url: `/business/environmentRecord/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 环境记录单删除
-export function getenvironmentRecordDelete(data: object) {
-  return request({
-    url: '/business/environmentRecord/delete',
-    method: 'post',
-    data,
-  })
-}
-
-// 新增环境记录单
-export function getenvironmentRecordAdd(data: object) {
-  return request({
-    url: '/business/environmentRecord/add',
-    method: 'post',
-    data,
-  })
-}
-
-// 环境监测记录单-详情
-export function getenvironmentRecordDetail(data: object) {
-  return request({
-    url: '/business/environmentRecord/detail',
-    method: 'post',
-    data,
-  })
-}
-
-// 环境监测记录单-编辑
-export function getenvironmentRecordUpdate(data: object) {
-  return request({
-    url: '/business/environmentRecord/update',
-    method: 'post',
-    data,
-  })
-}
diff --git a/src/api/business/lab/environmentRecord.ts b/src/api/business/lab/environmentRecord.ts
new file mode 100644
index 0000000..f76a9ce
--- /dev/null
+++ b/src/api/business/lab/environmentRecord.ts
@@ -0,0 +1,58 @@
+import request from '../../index'
+import type { IEnvironmentalDetail, IListQuery } from '@/views/business/lab/environmental/environmentalList_interface'
+const prefix = '/business/environmentRecord'
+
+// 环境记录单列表查询-分页
+export function getEnvironmentRecordList(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 环境记录单删除
+export function getEnvironmentRecordDelete(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新增环境记录单
+export function getEnvironmentRecordAdd(data: IEnvironmentalDetail) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 环境监测记录单-详情
+export function getEnvironmentRecordDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 环境监测记录单-编辑
+export function getEnvironmentRecordUpdate(data: IEnvironmentalDetail) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportEnvironmentRecord(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/export`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index 47a713e..94a4246 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -17,6 +17,16 @@
     data,
   })
 }
+
+// 设备借用取消审批
+export function cancelApproval(data: { processInstanceId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
+
 // 设备借用申请详情
 export function detailApply(data: object) {
   return request({
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 9887075..8fa5759 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -1,15 +1,16 @@
-<script lang="ts" setup name="PlanAdd">
+<!-- 环境记录单详情 -->
+<script lang="ts" setup name="EnvironmentalList">
 import type { FormInstance } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
-import type { selectionListItem } from './environmentalList_interface'
+import type { IEnvironmentalDetail, IRoomNumber } from './environmentalList_interface'
 import { getTypeSelect } from '@/api/system/price'
-import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
+import { getEnvironmentRecordAdd, getEnvironmentRecordDetail, getEnvironmentRecordUpdate } from '@/api/business/lab/environmentRecord'
 import useUserStore from '@/store/modules/user'
+const { proxy } = getCurrentInstance() as any
 const infoId = ref('') // id
-const { name, id } = useUserStore()
+const { name, id } = useUserStore() // 用户名、id
 const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
@@ -23,7 +24,8 @@
     infoId.value = $route.params.id as string
   }
 }
-const formInline = ref({
+// 表单
+const formInline = ref<IEnvironmentalDetail>({
   environmentCode: '', // 环境记录单编号
   roomNumber: '', // 房间编号
   recorder: name || '', // 用户名
@@ -38,10 +40,10 @@
   id: '', // 主键
   updateTime: '', // 更新时间
 })
-const ruleFormRef = ref<FormInstance>()
+const ruleFormRef = ref<FormInstance>() // 表单ref
 
 // 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([])
+const selectionList = ref<IRoomNumber[]>([])
 // 获取下拉框数据
 getTypeSelect('roomNumber').then((res) => {
   selectionList.value = res.data
@@ -73,39 +75,38 @@
   $router.back()
 }
 
+// 获取详情信息
 if (infoId.value && infoId.value !== '') {
-  getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
+  getEnvironmentRecordDetail({ id: infoId.value }).then((res) => {
     if (res.code === 200) {
       formInline.value = res.data
     }
   })
 }
 // 点击保存
-const preserve = async (formEl: FormInstance | undefined) => {
-  if (!formEl) {
-    return
-  }
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      ElMessageBox.confirm('确认提交吗？', '提示', {
+      ElMessageBox.confirm('确认保存吗？', '提示', {
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         type: 'warning',
       }).then(() => {
-        // 是否是新增
+        // 新增
         if (pageType.value === 'add') {
-          getenvironmentRecordAdd(formInline.value).then((res) => {
+          getEnvironmentRecordAdd(formInline.value).then((res) => {
             if (res.code === 200) {
-              ElMessage.success('提交成功!')
+              ElMessage.success('保存成功!')
               close()
             }
           })
         }
-        // 是否是编辑
-        else {
-          getenvironmentRecordUpdate(formInline.value).then((res) => {
+        // 编辑
+        else if (pageType.value === 'edit') {
+          getEnvironmentRecordUpdate(formInline.value).then((res) => {
             if (res.code === 200) {
-              ElMessage.success('提交成功!')
+              ElMessage.success('保存成功!')
               close()
             }
           })
@@ -117,8 +118,8 @@
 // 打印
 const printObj = ref({
   id: 'form', // 需要打印元素的id
-  popTitle: '环境记录单模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '环境记录单详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>环境记录单详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
@@ -130,15 +131,17 @@
     <detail-page :title="`环境记录单-${textMap[pageType]}`">
       <template #btns>
         <el-button
-          v-if="pageType !== 'detail'"
+          v-if="proxy.hasPerm('/lab/environmentalList/add') && pageType !== 'detail'"
           type="primary"
-          @click="
-            preserve(ruleFormRef)
-          "
+          @click="saveForm(ruleFormRef)"
         >
-          提交
+          保存
         </el-button>
-        <el-button v-else v-print="printObj" type="primary">
+        <el-button
+          v-if="proxy.hasPerm('/lab/environmentalList/add') && pageType === 'detail'"
+          v-print="printObj"
+          type="primary"
+        >
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -199,7 +202,7 @@
                 type="datetime"
                 :placeholder="pageType === 'detail' ? '无' : '请选择记录时间'"
                 format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                value-format="YYYY-MM-DD HH:mm:ss"
                 clearable
                 :disabled="pageType === 'detail'"
               />
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 90110ee..63a0849 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -1,13 +1,18 @@
+<!-- 环境记录单列表 -->
 <script lang="ts" setup name="EnvironmentalList">
-import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
+import type { IEnvironmental, IListQuery, IRoomNumber } from './environmentalList_interface'
 import { getTypeSelect } from '@/api/system/price'
-import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
+import { exportEnvironmentRecord, getEnvironmentRecordDelete, getEnvironmentRecordList } from '@/api/business/lab/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-const listQuery = ref({
+import { exportFile } from '@/utils/exportUtils'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+
+// 查询参数
+const listQuery = ref<IListQuery>({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
   beginTime: '', // 记录开始时间
@@ -15,17 +20,14 @@
   offset: 1, // 当前页
   limit: 20, // 多少条
 })
-const checkoutList = ref<string[]>([])
-const list = ref<IEnvironmental[]>([])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+const list = ref<IEnvironmental[]>([]) // 表格参数
 const total = ref(0)
-const show = ref(true)
+const loadingTable = ref(false) // 表格loading
+const trainTime = ref('') // 记录时间数组
+const roomNumberList = ref<IRoomNumber[]>([]) // 房间号
 
-const loadingTable = ref(false)
-// 初始化路由
-// 培训时间数组
-const trainTime = ref('')
-
-const $router = useRouter()
+// 查询列表
 const fetchData = (isNowPage: boolean) => {
   listQuery.value.beginTime = trainTime.value[0] || ''
   listQuery.value.endTime = trainTime.value[1] || ''
@@ -34,57 +36,23 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getenvironmentRecordList(listQuery.value).then((res) => {
+  getEnvironmentRecordList(listQuery.value).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
   })
   loadingTable.value = false
 }
 fetchData(true)
-const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref<TableColumn[]>([
-  {
-    text: '记录单号',
-    value: 'environmentCode',
-    align: 'center',
-  },
-  {
-    text: '房间号',
-    value: 'roomNumber',
-    align: 'center',
-  },
-  {
-    text: '记录人',
-    value: 'recorder',
-    align: 'center',
-  },
-  {
-    text: '记录时间',
-    value: 'recordTime',
-    width: '180',
-    align: 'center',
-  },
-  {
-    text: '温度(℃)',
-    value: 'temperature',
-    align: 'center',
-  },
-  {
-    text: '湿度(%)',
-    value: 'humidity',
-    align: 'center',
-  },
-  {
-    text: '输出电压(V)',
-    value: 'outputVoltage',
-    align: 'center',
-  },
-  {
-    text: '零地电压(V)',
-    value: 'zeroGroundVoltage',
-    align: 'center',
-  },
+  { text: '记录单号', value: 'environmentCode', align: 'center', width: '160' },
+  { text: '房间号', value: 'roomNumber', align: 'center' },
+  { text: '记录人', value: 'recorder', align: 'center' },
+  { text: '记录时间', value: 'recordTime', width: '180', align: 'center' },
+  { text: '温度(℃)', value: 'temperature', align: 'center' },
+  { text: '湿度(%)', value: 'humidity', align: 'center' },
+  { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
+  { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
 ])
 // 搜索
 const searchList = () => {
@@ -104,38 +72,44 @@
   trainTime.value = ''
   fetchData(true)
 }
+
 // 导出
-const exportExcelBtn = () => {
+const exportAll = () => {
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  // if (list.value.length > 0) {
-  // }
-  // else {
-  //   ElMessage.warning('无数据可导出数据')
-  // }
+  if (list.value.length > 0) {
+    const params = {
+      environmentCode: '', // 记录单编号
+      roomNumber: '', // 房间号
+      beginTime: '', // 记录开始时间
+      endTime: '', // 记录结束时间
+      offset: 1, // 当前页
+      limit: 20, // 多少条
+      ids: checkoutList.value,
+    }
+    exportEnvironmentRecord(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '环境记录单列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
   loading.close()
 }
-// 关闭编辑
-const close = () => {
-  show.value = true
-  fetchData(true)
-}
-// 点击编辑id和删除row类型
-interface rowReturn {
-  id: string
-  environmentCode: string
-}
+
 // 点击编辑/详情
-const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+const handleEdit = (row: IEnvironmental, pageType: 'edit' | 'detail') => {
   $router.push(`/lab/environmentalList/${pageType}/${row.id}`)
 }
+
 // 点击删除
-const handleDelete = (index: string, row: rowReturn) => {
+const handleDelete = (row: IEnvironmental) => {
   ElMessageBox.confirm(
-    `确认删除${row.environmentCode}吗？`,
+    `确认删除单号${row.environmentCode}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -144,12 +118,9 @@
     },
   )
     .then(() => {
-      getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
+      getEnvironmentRecordDelete({ id: row.id }).then((res) => {
         if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
+          ElMessage.success('已删除')
           fetchData(true)
         }
       })
@@ -160,14 +131,12 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
+
 // 点击新增
 const add = () => {
   $router.push('/lab/environmentalList/add')
 }
-// 点击导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -178,12 +147,12 @@
   }
   fetchData(true)
 }
-// 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([])
+
 // 获取下拉框数据
 getTypeSelect('roomNumber').then((res) => {
-  selectionList.value = res.data
+  roomNumberList.value = res.data
 })
+
 // 打印列表
 function printList() {
   // 打印列
@@ -225,7 +194,7 @@
           size="default"
         >
           <el-option
-            v-for="item in selectionList"
+            v-for="item in roomNumberList"
             :key="item.value"
             :label="item.name"
             :value="item.value"
@@ -238,7 +207,7 @@
           type="datetimerange"
           range-separator="到"
           format="YYYY-MM-DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="记录时间开始时间"
           end-placeholder="记录时间结束时间"
         />
@@ -247,21 +216,21 @@
     <table-container>
       <template #btns-right>
         <icon-button
-          v-if="proxy.hasPerm('/measure/train/plan/add')"
+          v-if="proxy.hasPerm('/lab/environmentalList/add')"
           icon="icon-add"
           title="新建"
           type="primary"
           @click="add"
         />
         <icon-button
-          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          v-if="proxy.hasPerm('/lab/environmentalList/export')"
           icon="icon-export"
           title="导出"
           type="primary"
           @click="exportAll"
         />
         <icon-button
-          v-if="proxy.hasPerm('/measure/train/plan/print')"
+          v-if="proxy.hasPerm('/lab/environmentalList/print')"
           icon="icon-print"
           title="打印"
           type="primary"
@@ -278,8 +247,15 @@
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="160">
+          <el-table-column label="操作" align="center" width="130" fixed="right">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/measure/train/plan/edit')"
@@ -303,7 +279,7 @@
                 size="small"
                 link
                 type="danger"
-                @click="handleDelete(row.$index, row)"
+                @click="handleDelete(row)"
               >
                 删除
               </el-button>
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 955af81..e1dc2a2 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -1,3 +1,13 @@
+// 查询参数
+export interface IListQuery {
+  environmentCode: string // 记录单编号
+  roomNumber: string // 房间号
+  beginTime: string // 记录开始时间
+  endTime: string // 记录结束时间
+  offset: number // 当前页
+  limit: number // 多少条
+}
+
 // 环境记录单list类型
 export interface IEnvironmental {
   environmentCode: string // 记录单编号
@@ -12,9 +22,27 @@
   createUser: string // 创建人
   id: string // 主键id
 }
+
 // 房间号模拟下拉框数据类型
-export interface selectionListItem {
+export interface IRoomNumber {
   value: string // 值
   name: string // lable
   id: string
 }
+
+// 环境记录单详情表单
+export interface IEnvironmentalDetail {
+  environmentCode: string // 环境记录单编号
+  roomNumber: string // 房间编号
+  recorder: string // 用户名
+  temperature: string // 温度
+  humidity: string // 湿度
+  outputVoltage: string // 输出电压
+  zeroGroundVoltage: string // 零地电压
+  remark: string // 备注
+  recordTime: string // 记录时间
+  createUser: string // 记录人id
+  createTime: string // 创建时间
+  id: string // 主键
+  updateTime: string // 更新时间
+}

diff --git "a/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js" "b/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
index 4c9b127..633c7a9 100644
--- "a/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
+++ "b/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
@@ -11,6 +11,7 @@
       },
       "directorMaxLevel": 4,//审批主管最大层级
       "flowPermission": [],//发起人
+      "decisionItem": 1, //1同意驳回拒绝、2同意驳回、3拒绝
       "nodeConfig": {
           "nodeName": "发起人",//节点名称
           "type": 0,// 0 发起人 1审批 2抄送 3条件 4路由
diff --git a/src/api/business/environmentRecord/environmentRecord.ts b/src/api/business/environmentRecord/environmentRecord.ts
deleted file mode 100644
index 1a575eb..0000000
--- a/src/api/business/environmentRecord/environmentRecord.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import request from '../../index'
-
-// 环境记录单列表查询-分页
-export function getenvironmentRecordList(data: { offset: number; limit: number }) {
-  return request({
-    url: `/business/environmentRecord/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 环境记录单删除
-export function getenvironmentRecordDelete(data: object) {
-  return request({
-    url: '/business/environmentRecord/delete',
-    method: 'post',
-    data,
-  })
-}
-
-// 新增环境记录单
-export function getenvironmentRecordAdd(data: object) {
-  return request({
-    url: '/business/environmentRecord/add',
-    method: 'post',
-    data,
-  })
-}
-
-// 环境监测记录单-详情
-export function getenvironmentRecordDetail(data: object) {
-  return request({
-    url: '/business/environmentRecord/detail',
-    method: 'post',
-    data,
-  })
-}
-
-// 环境监测记录单-编辑
-export function getenvironmentRecordUpdate(data: object) {
-  return request({
-    url: '/business/environmentRecord/update',
-    method: 'post',
-    data,
-  })
-}
diff --git a/src/api/business/lab/environmentRecord.ts b/src/api/business/lab/environmentRecord.ts
new file mode 100644
index 0000000..f76a9ce
--- /dev/null
+++ b/src/api/business/lab/environmentRecord.ts
@@ -0,0 +1,58 @@
+import request from '../../index'
+import type { IEnvironmentalDetail, IListQuery } from '@/views/business/lab/environmental/environmentalList_interface'
+const prefix = '/business/environmentRecord'
+
+// 环境记录单列表查询-分页
+export function getEnvironmentRecordList(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 环境记录单删除
+export function getEnvironmentRecordDelete(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新增环境记录单
+export function getEnvironmentRecordAdd(data: IEnvironmentalDetail) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 环境监测记录单-详情
+export function getEnvironmentRecordDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 环境监测记录单-编辑
+export function getEnvironmentRecordUpdate(data: IEnvironmentalDetail) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportEnvironmentRecord(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/export`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index 47a713e..94a4246 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -17,6 +17,16 @@
     data,
   })
 }
+
+// 设备借用取消审批
+export function cancelApproval(data: { processInstanceId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
+
 // 设备借用申请详情
 export function detailApply(data: object) {
   return request({
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 9887075..8fa5759 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -1,15 +1,16 @@
-<script lang="ts" setup name="PlanAdd">
+<!-- 环境记录单详情 -->
+<script lang="ts" setup name="EnvironmentalList">
 import type { FormInstance } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
-import type { selectionListItem } from './environmentalList_interface'
+import type { IEnvironmentalDetail, IRoomNumber } from './environmentalList_interface'
 import { getTypeSelect } from '@/api/system/price'
-import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
+import { getEnvironmentRecordAdd, getEnvironmentRecordDetail, getEnvironmentRecordUpdate } from '@/api/business/lab/environmentRecord'
 import useUserStore from '@/store/modules/user'
+const { proxy } = getCurrentInstance() as any
 const infoId = ref('') // id
-const { name, id } = useUserStore()
+const { name, id } = useUserStore() // 用户名、id
 const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
@@ -23,7 +24,8 @@
     infoId.value = $route.params.id as string
   }
 }
-const formInline = ref({
+// 表单
+const formInline = ref<IEnvironmentalDetail>({
   environmentCode: '', // 环境记录单编号
   roomNumber: '', // 房间编号
   recorder: name || '', // 用户名
@@ -38,10 +40,10 @@
   id: '', // 主键
   updateTime: '', // 更新时间
 })
-const ruleFormRef = ref<FormInstance>()
+const ruleFormRef = ref<FormInstance>() // 表单ref
 
 // 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([])
+const selectionList = ref<IRoomNumber[]>([])
 // 获取下拉框数据
 getTypeSelect('roomNumber').then((res) => {
   selectionList.value = res.data
@@ -73,39 +75,38 @@
   $router.back()
 }
 
+// 获取详情信息
 if (infoId.value && infoId.value !== '') {
-  getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
+  getEnvironmentRecordDetail({ id: infoId.value }).then((res) => {
     if (res.code === 200) {
       formInline.value = res.data
     }
   })
 }
 // 点击保存
-const preserve = async (formEl: FormInstance | undefined) => {
-  if (!formEl) {
-    return
-  }
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      ElMessageBox.confirm('确认提交吗？', '提示', {
+      ElMessageBox.confirm('确认保存吗？', '提示', {
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         type: 'warning',
       }).then(() => {
-        // 是否是新增
+        // 新增
         if (pageType.value === 'add') {
-          getenvironmentRecordAdd(formInline.value).then((res) => {
+          getEnvironmentRecordAdd(formInline.value).then((res) => {
             if (res.code === 200) {
-              ElMessage.success('提交成功!')
+              ElMessage.success('保存成功!')
               close()
             }
           })
         }
-        // 是否是编辑
-        else {
-          getenvironmentRecordUpdate(formInline.value).then((res) => {
+        // 编辑
+        else if (pageType.value === 'edit') {
+          getEnvironmentRecordUpdate(formInline.value).then((res) => {
             if (res.code === 200) {
-              ElMessage.success('提交成功!')
+              ElMessage.success('保存成功!')
               close()
             }
           })
@@ -117,8 +118,8 @@
 // 打印
 const printObj = ref({
   id: 'form', // 需要打印元素的id
-  popTitle: '环境记录单模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '环境记录单详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>环境记录单详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
@@ -130,15 +131,17 @@
     <detail-page :title="`环境记录单-${textMap[pageType]}`">
       <template #btns>
         <el-button
-          v-if="pageType !== 'detail'"
+          v-if="proxy.hasPerm('/lab/environmentalList/add') && pageType !== 'detail'"
           type="primary"
-          @click="
-            preserve(ruleFormRef)
-          "
+          @click="saveForm(ruleFormRef)"
         >
-          提交
+          保存
         </el-button>
-        <el-button v-else v-print="printObj" type="primary">
+        <el-button
+          v-if="proxy.hasPerm('/lab/environmentalList/add') && pageType === 'detail'"
+          v-print="printObj"
+          type="primary"
+        >
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -199,7 +202,7 @@
                 type="datetime"
                 :placeholder="pageType === 'detail' ? '无' : '请选择记录时间'"
                 format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                value-format="YYYY-MM-DD HH:mm:ss"
                 clearable
                 :disabled="pageType === 'detail'"
               />
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 90110ee..63a0849 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -1,13 +1,18 @@
+<!-- 环境记录单列表 -->
 <script lang="ts" setup name="EnvironmentalList">
-import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
+import type { IEnvironmental, IListQuery, IRoomNumber } from './environmentalList_interface'
 import { getTypeSelect } from '@/api/system/price'
-import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
+import { exportEnvironmentRecord, getEnvironmentRecordDelete, getEnvironmentRecordList } from '@/api/business/lab/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-const listQuery = ref({
+import { exportFile } from '@/utils/exportUtils'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+
+// 查询参数
+const listQuery = ref<IListQuery>({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
   beginTime: '', // 记录开始时间
@@ -15,17 +20,14 @@
   offset: 1, // 当前页
   limit: 20, // 多少条
 })
-const checkoutList = ref<string[]>([])
-const list = ref<IEnvironmental[]>([])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+const list = ref<IEnvironmental[]>([]) // 表格参数
 const total = ref(0)
-const show = ref(true)
+const loadingTable = ref(false) // 表格loading
+const trainTime = ref('') // 记录时间数组
+const roomNumberList = ref<IRoomNumber[]>([]) // 房间号
 
-const loadingTable = ref(false)
-// 初始化路由
-// 培训时间数组
-const trainTime = ref('')
-
-const $router = useRouter()
+// 查询列表
 const fetchData = (isNowPage: boolean) => {
   listQuery.value.beginTime = trainTime.value[0] || ''
   listQuery.value.endTime = trainTime.value[1] || ''
@@ -34,57 +36,23 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getenvironmentRecordList(listQuery.value).then((res) => {
+  getEnvironmentRecordList(listQuery.value).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
   })
   loadingTable.value = false
 }
 fetchData(true)
-const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref<TableColumn[]>([
-  {
-    text: '记录单号',
-    value: 'environmentCode',
-    align: 'center',
-  },
-  {
-    text: '房间号',
-    value: 'roomNumber',
-    align: 'center',
-  },
-  {
-    text: '记录人',
-    value: 'recorder',
-    align: 'center',
-  },
-  {
-    text: '记录时间',
-    value: 'recordTime',
-    width: '180',
-    align: 'center',
-  },
-  {
-    text: '温度(℃)',
-    value: 'temperature',
-    align: 'center',
-  },
-  {
-    text: '湿度(%)',
-    value: 'humidity',
-    align: 'center',
-  },
-  {
-    text: '输出电压(V)',
-    value: 'outputVoltage',
-    align: 'center',
-  },
-  {
-    text: '零地电压(V)',
-    value: 'zeroGroundVoltage',
-    align: 'center',
-  },
+  { text: '记录单号', value: 'environmentCode', align: 'center', width: '160' },
+  { text: '房间号', value: 'roomNumber', align: 'center' },
+  { text: '记录人', value: 'recorder', align: 'center' },
+  { text: '记录时间', value: 'recordTime', width: '180', align: 'center' },
+  { text: '温度(℃)', value: 'temperature', align: 'center' },
+  { text: '湿度(%)', value: 'humidity', align: 'center' },
+  { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
+  { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
 ])
 // 搜索
 const searchList = () => {
@@ -104,38 +72,44 @@
   trainTime.value = ''
   fetchData(true)
 }
+
 // 导出
-const exportExcelBtn = () => {
+const exportAll = () => {
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  // if (list.value.length > 0) {
-  // }
-  // else {
-  //   ElMessage.warning('无数据可导出数据')
-  // }
+  if (list.value.length > 0) {
+    const params = {
+      environmentCode: '', // 记录单编号
+      roomNumber: '', // 房间号
+      beginTime: '', // 记录开始时间
+      endTime: '', // 记录结束时间
+      offset: 1, // 当前页
+      limit: 20, // 多少条
+      ids: checkoutList.value,
+    }
+    exportEnvironmentRecord(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '环境记录单列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
   loading.close()
 }
-// 关闭编辑
-const close = () => {
-  show.value = true
-  fetchData(true)
-}
-// 点击编辑id和删除row类型
-interface rowReturn {
-  id: string
-  environmentCode: string
-}
+
 // 点击编辑/详情
-const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+const handleEdit = (row: IEnvironmental, pageType: 'edit' | 'detail') => {
   $router.push(`/lab/environmentalList/${pageType}/${row.id}`)
 }
+
 // 点击删除
-const handleDelete = (index: string, row: rowReturn) => {
+const handleDelete = (row: IEnvironmental) => {
   ElMessageBox.confirm(
-    `确认删除${row.environmentCode}吗？`,
+    `确认删除单号${row.environmentCode}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -144,12 +118,9 @@
     },
   )
     .then(() => {
-      getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
+      getEnvironmentRecordDelete({ id: row.id }).then((res) => {
         if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
+          ElMessage.success('已删除')
           fetchData(true)
         }
       })
@@ -160,14 +131,12 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
+
 // 点击新增
 const add = () => {
   $router.push('/lab/environmentalList/add')
 }
-// 点击导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -178,12 +147,12 @@
   }
   fetchData(true)
 }
-// 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([])
+
 // 获取下拉框数据
 getTypeSelect('roomNumber').then((res) => {
-  selectionList.value = res.data
+  roomNumberList.value = res.data
 })
+
 // 打印列表
 function printList() {
   // 打印列
@@ -225,7 +194,7 @@
           size="default"
         >
           <el-option
-            v-for="item in selectionList"
+            v-for="item in roomNumberList"
             :key="item.value"
             :label="item.name"
             :value="item.value"
@@ -238,7 +207,7 @@
           type="datetimerange"
           range-separator="到"
           format="YYYY-MM-DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="记录时间开始时间"
           end-placeholder="记录时间结束时间"
         />
@@ -247,21 +216,21 @@
     <table-container>
       <template #btns-right>
         <icon-button
-          v-if="proxy.hasPerm('/measure/train/plan/add')"
+          v-if="proxy.hasPerm('/lab/environmentalList/add')"
           icon="icon-add"
           title="新建"
           type="primary"
           @click="add"
         />
         <icon-button
-          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          v-if="proxy.hasPerm('/lab/environmentalList/export')"
           icon="icon-export"
           title="导出"
           type="primary"
           @click="exportAll"
         />
         <icon-button
-          v-if="proxy.hasPerm('/measure/train/plan/print')"
+          v-if="proxy.hasPerm('/lab/environmentalList/print')"
           icon="icon-print"
           title="打印"
           type="primary"
@@ -278,8 +247,15 @@
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="160">
+          <el-table-column label="操作" align="center" width="130" fixed="right">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/measure/train/plan/edit')"
@@ -303,7 +279,7 @@
                 size="small"
                 link
                 type="danger"
-                @click="handleDelete(row.$index, row)"
+                @click="handleDelete(row)"
               >
                 删除
               </el-button>
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 955af81..e1dc2a2 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -1,3 +1,13 @@
+// 查询参数
+export interface IListQuery {
+  environmentCode: string // 记录单编号
+  roomNumber: string // 房间号
+  beginTime: string // 记录开始时间
+  endTime: string // 记录结束时间
+  offset: number // 当前页
+  limit: number // 多少条
+}
+
 // 环境记录单list类型
 export interface IEnvironmental {
   environmentCode: string // 记录单编号
@@ -12,9 +22,27 @@
   createUser: string // 创建人
   id: string // 主键id
 }
+
 // 房间号模拟下拉框数据类型
-export interface selectionListItem {
+export interface IRoomNumber {
   value: string // 值
   name: string // lable
   id: string
 }
+
+// 环境记录单详情表单
+export interface IEnvironmentalDetail {
+  environmentCode: string // 环境记录单编号
+  roomNumber: string // 房间编号
+  recorder: string // 用户名
+  temperature: string // 温度
+  humidity: string // 湿度
+  outputVoltage: string // 输出电压
+  zeroGroundVoltage: string // 零地电压
+  remark: string // 备注
+  recordTime: string // 记录时间
+  createUser: string // 记录人id
+  createTime: string // 创建时间
+  id: string // 主键
+  updateTime: string // 更新时间
+}
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 98c4257..5105a76 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -294,6 +294,13 @@
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
           <el-table-column label="操作" align="center" width="130" fixed="right">
             <template #default="{ row }">

diff --git "a/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js" "b/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
index 4c9b127..633c7a9 100644
--- "a/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
+++ "b/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
@@ -11,6 +11,7 @@
       },
       "directorMaxLevel": 4,//审批主管最大层级
       "flowPermission": [],//发起人
+      "decisionItem": 1, //1同意驳回拒绝、2同意驳回、3拒绝
       "nodeConfig": {
           "nodeName": "发起人",//节点名称
           "type": 0,// 0 发起人 1审批 2抄送 3条件 4路由
diff --git a/src/api/business/environmentRecord/environmentRecord.ts b/src/api/business/environmentRecord/environmentRecord.ts
deleted file mode 100644
index 1a575eb..0000000
--- a/src/api/business/environmentRecord/environmentRecord.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import request from '../../index'
-
-// 环境记录单列表查询-分页
-export function getenvironmentRecordList(data: { offset: number; limit: number }) {
-  return request({
-    url: `/business/environmentRecord/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 环境记录单删除
-export function getenvironmentRecordDelete(data: object) {
-  return request({
-    url: '/business/environmentRecord/delete',
-    method: 'post',
-    data,
-  })
-}
-
-// 新增环境记录单
-export function getenvironmentRecordAdd(data: object) {
-  return request({
-    url: '/business/environmentRecord/add',
-    method: 'post',
-    data,
-  })
-}
-
-// 环境监测记录单-详情
-export function getenvironmentRecordDetail(data: object) {
-  return request({
-    url: '/business/environmentRecord/detail',
-    method: 'post',
-    data,
-  })
-}
-
-// 环境监测记录单-编辑
-export function getenvironmentRecordUpdate(data: object) {
-  return request({
-    url: '/business/environmentRecord/update',
-    method: 'post',
-    data,
-  })
-}
diff --git a/src/api/business/lab/environmentRecord.ts b/src/api/business/lab/environmentRecord.ts
new file mode 100644
index 0000000..f76a9ce
--- /dev/null
+++ b/src/api/business/lab/environmentRecord.ts
@@ -0,0 +1,58 @@
+import request from '../../index'
+import type { IEnvironmentalDetail, IListQuery } from '@/views/business/lab/environmental/environmentalList_interface'
+const prefix = '/business/environmentRecord'
+
+// 环境记录单列表查询-分页
+export function getEnvironmentRecordList(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 环境记录单删除
+export function getEnvironmentRecordDelete(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新增环境记录单
+export function getEnvironmentRecordAdd(data: IEnvironmentalDetail) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 环境监测记录单-详情
+export function getEnvironmentRecordDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 环境监测记录单-编辑
+export function getEnvironmentRecordUpdate(data: IEnvironmentalDetail) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportEnvironmentRecord(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/export`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index 47a713e..94a4246 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -17,6 +17,16 @@
     data,
   })
 }
+
+// 设备借用取消审批
+export function cancelApproval(data: { processInstanceId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
+
 // 设备借用申请详情
 export function detailApply(data: object) {
   return request({
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 9887075..8fa5759 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -1,15 +1,16 @@
-<script lang="ts" setup name="PlanAdd">
+<!-- 环境记录单详情 -->
+<script lang="ts" setup name="EnvironmentalList">
 import type { FormInstance } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
-import type { selectionListItem } from './environmentalList_interface'
+import type { IEnvironmentalDetail, IRoomNumber } from './environmentalList_interface'
 import { getTypeSelect } from '@/api/system/price'
-import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
+import { getEnvironmentRecordAdd, getEnvironmentRecordDetail, getEnvironmentRecordUpdate } from '@/api/business/lab/environmentRecord'
 import useUserStore from '@/store/modules/user'
+const { proxy } = getCurrentInstance() as any
 const infoId = ref('') // id
-const { name, id } = useUserStore()
+const { name, id } = useUserStore() // 用户名、id
 const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
@@ -23,7 +24,8 @@
     infoId.value = $route.params.id as string
   }
 }
-const formInline = ref({
+// 表单
+const formInline = ref<IEnvironmentalDetail>({
   environmentCode: '', // 环境记录单编号
   roomNumber: '', // 房间编号
   recorder: name || '', // 用户名
@@ -38,10 +40,10 @@
   id: '', // 主键
   updateTime: '', // 更新时间
 })
-const ruleFormRef = ref<FormInstance>()
+const ruleFormRef = ref<FormInstance>() // 表单ref
 
 // 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([])
+const selectionList = ref<IRoomNumber[]>([])
 // 获取下拉框数据
 getTypeSelect('roomNumber').then((res) => {
   selectionList.value = res.data
@@ -73,39 +75,38 @@
   $router.back()
 }
 
+// 获取详情信息
 if (infoId.value && infoId.value !== '') {
-  getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
+  getEnvironmentRecordDetail({ id: infoId.value }).then((res) => {
     if (res.code === 200) {
       formInline.value = res.data
     }
   })
 }
 // 点击保存
-const preserve = async (formEl: FormInstance | undefined) => {
-  if (!formEl) {
-    return
-  }
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      ElMessageBox.confirm('确认提交吗？', '提示', {
+      ElMessageBox.confirm('确认保存吗？', '提示', {
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         type: 'warning',
       }).then(() => {
-        // 是否是新增
+        // 新增
         if (pageType.value === 'add') {
-          getenvironmentRecordAdd(formInline.value).then((res) => {
+          getEnvironmentRecordAdd(formInline.value).then((res) => {
             if (res.code === 200) {
-              ElMessage.success('提交成功!')
+              ElMessage.success('保存成功!')
               close()
             }
           })
         }
-        // 是否是编辑
-        else {
-          getenvironmentRecordUpdate(formInline.value).then((res) => {
+        // 编辑
+        else if (pageType.value === 'edit') {
+          getEnvironmentRecordUpdate(formInline.value).then((res) => {
             if (res.code === 200) {
-              ElMessage.success('提交成功!')
+              ElMessage.success('保存成功!')
               close()
             }
           })
@@ -117,8 +118,8 @@
 // 打印
 const printObj = ref({
   id: 'form', // 需要打印元素的id
-  popTitle: '环境记录单模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '环境记录单详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>环境记录单详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
@@ -130,15 +131,17 @@
     <detail-page :title="`环境记录单-${textMap[pageType]}`">
       <template #btns>
         <el-button
-          v-if="pageType !== 'detail'"
+          v-if="proxy.hasPerm('/lab/environmentalList/add') && pageType !== 'detail'"
           type="primary"
-          @click="
-            preserve(ruleFormRef)
-          "
+          @click="saveForm(ruleFormRef)"
         >
-          提交
+          保存
         </el-button>
-        <el-button v-else v-print="printObj" type="primary">
+        <el-button
+          v-if="proxy.hasPerm('/lab/environmentalList/add') && pageType === 'detail'"
+          v-print="printObj"
+          type="primary"
+        >
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -199,7 +202,7 @@
                 type="datetime"
                 :placeholder="pageType === 'detail' ? '无' : '请选择记录时间'"
                 format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                value-format="YYYY-MM-DD HH:mm:ss"
                 clearable
                 :disabled="pageType === 'detail'"
               />
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 90110ee..63a0849 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -1,13 +1,18 @@
+<!-- 环境记录单列表 -->
 <script lang="ts" setup name="EnvironmentalList">
-import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
+import type { IEnvironmental, IListQuery, IRoomNumber } from './environmentalList_interface'
 import { getTypeSelect } from '@/api/system/price'
-import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
+import { exportEnvironmentRecord, getEnvironmentRecordDelete, getEnvironmentRecordList } from '@/api/business/lab/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-const listQuery = ref({
+import { exportFile } from '@/utils/exportUtils'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+
+// 查询参数
+const listQuery = ref<IListQuery>({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
   beginTime: '', // 记录开始时间
@@ -15,17 +20,14 @@
   offset: 1, // 当前页
   limit: 20, // 多少条
 })
-const checkoutList = ref<string[]>([])
-const list = ref<IEnvironmental[]>([])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+const list = ref<IEnvironmental[]>([]) // 表格参数
 const total = ref(0)
-const show = ref(true)
+const loadingTable = ref(false) // 表格loading
+const trainTime = ref('') // 记录时间数组
+const roomNumberList = ref<IRoomNumber[]>([]) // 房间号
 
-const loadingTable = ref(false)
-// 初始化路由
-// 培训时间数组
-const trainTime = ref('')
-
-const $router = useRouter()
+// 查询列表
 const fetchData = (isNowPage: boolean) => {
   listQuery.value.beginTime = trainTime.value[0] || ''
   listQuery.value.endTime = trainTime.value[1] || ''
@@ -34,57 +36,23 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getenvironmentRecordList(listQuery.value).then((res) => {
+  getEnvironmentRecordList(listQuery.value).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
   })
   loadingTable.value = false
 }
 fetchData(true)
-const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref<TableColumn[]>([
-  {
-    text: '记录单号',
-    value: 'environmentCode',
-    align: 'center',
-  },
-  {
-    text: '房间号',
-    value: 'roomNumber',
-    align: 'center',
-  },
-  {
-    text: '记录人',
-    value: 'recorder',
-    align: 'center',
-  },
-  {
-    text: '记录时间',
-    value: 'recordTime',
-    width: '180',
-    align: 'center',
-  },
-  {
-    text: '温度(℃)',
-    value: 'temperature',
-    align: 'center',
-  },
-  {
-    text: '湿度(%)',
-    value: 'humidity',
-    align: 'center',
-  },
-  {
-    text: '输出电压(V)',
-    value: 'outputVoltage',
-    align: 'center',
-  },
-  {
-    text: '零地电压(V)',
-    value: 'zeroGroundVoltage',
-    align: 'center',
-  },
+  { text: '记录单号', value: 'environmentCode', align: 'center', width: '160' },
+  { text: '房间号', value: 'roomNumber', align: 'center' },
+  { text: '记录人', value: 'recorder', align: 'center' },
+  { text: '记录时间', value: 'recordTime', width: '180', align: 'center' },
+  { text: '温度(℃)', value: 'temperature', align: 'center' },
+  { text: '湿度(%)', value: 'humidity', align: 'center' },
+  { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
+  { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
 ])
 // 搜索
 const searchList = () => {
@@ -104,38 +72,44 @@
   trainTime.value = ''
   fetchData(true)
 }
+
 // 导出
-const exportExcelBtn = () => {
+const exportAll = () => {
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  // if (list.value.length > 0) {
-  // }
-  // else {
-  //   ElMessage.warning('无数据可导出数据')
-  // }
+  if (list.value.length > 0) {
+    const params = {
+      environmentCode: '', // 记录单编号
+      roomNumber: '', // 房间号
+      beginTime: '', // 记录开始时间
+      endTime: '', // 记录结束时间
+      offset: 1, // 当前页
+      limit: 20, // 多少条
+      ids: checkoutList.value,
+    }
+    exportEnvironmentRecord(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '环境记录单列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
   loading.close()
 }
-// 关闭编辑
-const close = () => {
-  show.value = true
-  fetchData(true)
-}
-// 点击编辑id和删除row类型
-interface rowReturn {
-  id: string
-  environmentCode: string
-}
+
 // 点击编辑/详情
-const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+const handleEdit = (row: IEnvironmental, pageType: 'edit' | 'detail') => {
   $router.push(`/lab/environmentalList/${pageType}/${row.id}`)
 }
+
 // 点击删除
-const handleDelete = (index: string, row: rowReturn) => {
+const handleDelete = (row: IEnvironmental) => {
   ElMessageBox.confirm(
-    `确认删除${row.environmentCode}吗？`,
+    `确认删除单号${row.environmentCode}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -144,12 +118,9 @@
     },
   )
     .then(() => {
-      getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
+      getEnvironmentRecordDelete({ id: row.id }).then((res) => {
         if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
+          ElMessage.success('已删除')
           fetchData(true)
         }
       })
@@ -160,14 +131,12 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
+
 // 点击新增
 const add = () => {
   $router.push('/lab/environmentalList/add')
 }
-// 点击导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -178,12 +147,12 @@
   }
   fetchData(true)
 }
-// 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([])
+
 // 获取下拉框数据
 getTypeSelect('roomNumber').then((res) => {
-  selectionList.value = res.data
+  roomNumberList.value = res.data
 })
+
 // 打印列表
 function printList() {
   // 打印列
@@ -225,7 +194,7 @@
           size="default"
         >
           <el-option
-            v-for="item in selectionList"
+            v-for="item in roomNumberList"
             :key="item.value"
             :label="item.name"
             :value="item.value"
@@ -238,7 +207,7 @@
           type="datetimerange"
           range-separator="到"
           format="YYYY-MM-DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="记录时间开始时间"
           end-placeholder="记录时间结束时间"
         />
@@ -247,21 +216,21 @@
     <table-container>
       <template #btns-right>
         <icon-button
-          v-if="proxy.hasPerm('/measure/train/plan/add')"
+          v-if="proxy.hasPerm('/lab/environmentalList/add')"
           icon="icon-add"
           title="新建"
           type="primary"
           @click="add"
         />
         <icon-button
-          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          v-if="proxy.hasPerm('/lab/environmentalList/export')"
           icon="icon-export"
           title="导出"
           type="primary"
           @click="exportAll"
         />
         <icon-button
-          v-if="proxy.hasPerm('/measure/train/plan/print')"
+          v-if="proxy.hasPerm('/lab/environmentalList/print')"
           icon="icon-print"
           title="打印"
           type="primary"
@@ -278,8 +247,15 @@
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="160">
+          <el-table-column label="操作" align="center" width="130" fixed="right">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/measure/train/plan/edit')"
@@ -303,7 +279,7 @@
                 size="small"
                 link
                 type="danger"
-                @click="handleDelete(row.$index, row)"
+                @click="handleDelete(row)"
               >
                 删除
               </el-button>
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 955af81..e1dc2a2 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -1,3 +1,13 @@
+// 查询参数
+export interface IListQuery {
+  environmentCode: string // 记录单编号
+  roomNumber: string // 房间号
+  beginTime: string // 记录开始时间
+  endTime: string // 记录结束时间
+  offset: number // 当前页
+  limit: number // 多少条
+}
+
 // 环境记录单list类型
 export interface IEnvironmental {
   environmentCode: string // 记录单编号
@@ -12,9 +22,27 @@
   createUser: string // 创建人
   id: string // 主键id
 }
+
 // 房间号模拟下拉框数据类型
-export interface selectionListItem {
+export interface IRoomNumber {
   value: string // 值
   name: string // lable
   id: string
 }
+
+// 环境记录单详情表单
+export interface IEnvironmentalDetail {
+  environmentCode: string // 环境记录单编号
+  roomNumber: string // 房间编号
+  recorder: string // 用户名
+  temperature: string // 温度
+  humidity: string // 湿度
+  outputVoltage: string // 输出电压
+  zeroGroundVoltage: string // 零地电压
+  remark: string // 备注
+  recordTime: string // 记录时间
+  createUser: string // 记录人id
+  createTime: string // 创建时间
+  id: string // 主键
+  updateTime: string // 更新时间
+}
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 98c4257..5105a76 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -294,6 +294,13 @@
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
           <el-table-column label="操作" align="center" width="130" fixed="right">
             <template #default="{ row }">
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index ae53f44..a0aee10 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -371,6 +371,13 @@
           :data="list" :total="total" :columns="columns" :query="listQuery"
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
         >
+          <template #preColumns>
+            <el-table-column label="序号" width="55" align="center">
+              <template #default="scope">
+                {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
           <template #columns>
             <el-table-column label="操作" align="center" :width="operationWidth">
               <template #default="{ row }">

diff --git "a/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js" "b/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
index 4c9b127..633c7a9 100644
--- "a/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
+++ "b/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
@@ -11,6 +11,7 @@
       },
       "directorMaxLevel": 4,//审批主管最大层级
       "flowPermission": [],//发起人
+      "decisionItem": 1, //1同意驳回拒绝、2同意驳回、3拒绝
       "nodeConfig": {
           "nodeName": "发起人",//节点名称
           "type": 0,// 0 发起人 1审批 2抄送 3条件 4路由
diff --git a/src/api/business/environmentRecord/environmentRecord.ts b/src/api/business/environmentRecord/environmentRecord.ts
deleted file mode 100644
index 1a575eb..0000000
--- a/src/api/business/environmentRecord/environmentRecord.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import request from '../../index'
-
-// 环境记录单列表查询-分页
-export function getenvironmentRecordList(data: { offset: number; limit: number }) {
-  return request({
-    url: `/business/environmentRecord/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 环境记录单删除
-export function getenvironmentRecordDelete(data: object) {
-  return request({
-    url: '/business/environmentRecord/delete',
-    method: 'post',
-    data,
-  })
-}
-
-// 新增环境记录单
-export function getenvironmentRecordAdd(data: object) {
-  return request({
-    url: '/business/environmentRecord/add',
-    method: 'post',
-    data,
-  })
-}
-
-// 环境监测记录单-详情
-export function getenvironmentRecordDetail(data: object) {
-  return request({
-    url: '/business/environmentRecord/detail',
-    method: 'post',
-    data,
-  })
-}
-
-// 环境监测记录单-编辑
-export function getenvironmentRecordUpdate(data: object) {
-  return request({
-    url: '/business/environmentRecord/update',
-    method: 'post',
-    data,
-  })
-}
diff --git a/src/api/business/lab/environmentRecord.ts b/src/api/business/lab/environmentRecord.ts
new file mode 100644
index 0000000..f76a9ce
--- /dev/null
+++ b/src/api/business/lab/environmentRecord.ts
@@ -0,0 +1,58 @@
+import request from '../../index'
+import type { IEnvironmentalDetail, IListQuery } from '@/views/business/lab/environmental/environmentalList_interface'
+const prefix = '/business/environmentRecord'
+
+// 环境记录单列表查询-分页
+export function getEnvironmentRecordList(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 环境记录单删除
+export function getEnvironmentRecordDelete(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新增环境记录单
+export function getEnvironmentRecordAdd(data: IEnvironmentalDetail) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 环境监测记录单-详情
+export function getEnvironmentRecordDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 环境监测记录单-编辑
+export function getEnvironmentRecordUpdate(data: IEnvironmentalDetail) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportEnvironmentRecord(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/export`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index 47a713e..94a4246 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -17,6 +17,16 @@
     data,
   })
 }
+
+// 设备借用取消审批
+export function cancelApproval(data: { processInstanceId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
+
 // 设备借用申请详情
 export function detailApply(data: object) {
   return request({
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 9887075..8fa5759 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -1,15 +1,16 @@
-<script lang="ts" setup name="PlanAdd">
+<!-- 环境记录单详情 -->
+<script lang="ts" setup name="EnvironmentalList">
 import type { FormInstance } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
-import type { selectionListItem } from './environmentalList_interface'
+import type { IEnvironmentalDetail, IRoomNumber } from './environmentalList_interface'
 import { getTypeSelect } from '@/api/system/price'
-import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
+import { getEnvironmentRecordAdd, getEnvironmentRecordDetail, getEnvironmentRecordUpdate } from '@/api/business/lab/environmentRecord'
 import useUserStore from '@/store/modules/user'
+const { proxy } = getCurrentInstance() as any
 const infoId = ref('') // id
-const { name, id } = useUserStore()
+const { name, id } = useUserStore() // 用户名、id
 const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
@@ -23,7 +24,8 @@
     infoId.value = $route.params.id as string
   }
 }
-const formInline = ref({
+// 表单
+const formInline = ref<IEnvironmentalDetail>({
   environmentCode: '', // 环境记录单编号
   roomNumber: '', // 房间编号
   recorder: name || '', // 用户名
@@ -38,10 +40,10 @@
   id: '', // 主键
   updateTime: '', // 更新时间
 })
-const ruleFormRef = ref<FormInstance>()
+const ruleFormRef = ref<FormInstance>() // 表单ref
 
 // 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([])
+const selectionList = ref<IRoomNumber[]>([])
 // 获取下拉框数据
 getTypeSelect('roomNumber').then((res) => {
   selectionList.value = res.data
@@ -73,39 +75,38 @@
   $router.back()
 }
 
+// 获取详情信息
 if (infoId.value && infoId.value !== '') {
-  getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
+  getEnvironmentRecordDetail({ id: infoId.value }).then((res) => {
     if (res.code === 200) {
       formInline.value = res.data
     }
   })
 }
 // 点击保存
-const preserve = async (formEl: FormInstance | undefined) => {
-  if (!formEl) {
-    return
-  }
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      ElMessageBox.confirm('确认提交吗？', '提示', {
+      ElMessageBox.confirm('确认保存吗？', '提示', {
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         type: 'warning',
       }).then(() => {
-        // 是否是新增
+        // 新增
         if (pageType.value === 'add') {
-          getenvironmentRecordAdd(formInline.value).then((res) => {
+          getEnvironmentRecordAdd(formInline.value).then((res) => {
             if (res.code === 200) {
-              ElMessage.success('提交成功!')
+              ElMessage.success('保存成功!')
               close()
             }
           })
         }
-        // 是否是编辑
-        else {
-          getenvironmentRecordUpdate(formInline.value).then((res) => {
+        // 编辑
+        else if (pageType.value === 'edit') {
+          getEnvironmentRecordUpdate(formInline.value).then((res) => {
             if (res.code === 200) {
-              ElMessage.success('提交成功!')
+              ElMessage.success('保存成功!')
               close()
             }
           })
@@ -117,8 +118,8 @@
 // 打印
 const printObj = ref({
   id: 'form', // 需要打印元素的id
-  popTitle: '环境记录单模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '环境记录单详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>环境记录单详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
@@ -130,15 +131,17 @@
     <detail-page :title="`环境记录单-${textMap[pageType]}`">
       <template #btns>
         <el-button
-          v-if="pageType !== 'detail'"
+          v-if="proxy.hasPerm('/lab/environmentalList/add') && pageType !== 'detail'"
           type="primary"
-          @click="
-            preserve(ruleFormRef)
-          "
+          @click="saveForm(ruleFormRef)"
         >
-          提交
+          保存
         </el-button>
-        <el-button v-else v-print="printObj" type="primary">
+        <el-button
+          v-if="proxy.hasPerm('/lab/environmentalList/add') && pageType === 'detail'"
+          v-print="printObj"
+          type="primary"
+        >
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -199,7 +202,7 @@
                 type="datetime"
                 :placeholder="pageType === 'detail' ? '无' : '请选择记录时间'"
                 format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                value-format="YYYY-MM-DD HH:mm:ss"
                 clearable
                 :disabled="pageType === 'detail'"
               />
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 90110ee..63a0849 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -1,13 +1,18 @@
+<!-- 环境记录单列表 -->
 <script lang="ts" setup name="EnvironmentalList">
-import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
+import type { IEnvironmental, IListQuery, IRoomNumber } from './environmentalList_interface'
 import { getTypeSelect } from '@/api/system/price'
-import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
+import { exportEnvironmentRecord, getEnvironmentRecordDelete, getEnvironmentRecordList } from '@/api/business/lab/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-const listQuery = ref({
+import { exportFile } from '@/utils/exportUtils'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+
+// 查询参数
+const listQuery = ref<IListQuery>({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
   beginTime: '', // 记录开始时间
@@ -15,17 +20,14 @@
   offset: 1, // 当前页
   limit: 20, // 多少条
 })
-const checkoutList = ref<string[]>([])
-const list = ref<IEnvironmental[]>([])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+const list = ref<IEnvironmental[]>([]) // 表格参数
 const total = ref(0)
-const show = ref(true)
+const loadingTable = ref(false) // 表格loading
+const trainTime = ref('') // 记录时间数组
+const roomNumberList = ref<IRoomNumber[]>([]) // 房间号
 
-const loadingTable = ref(false)
-// 初始化路由
-// 培训时间数组
-const trainTime = ref('')
-
-const $router = useRouter()
+// 查询列表
 const fetchData = (isNowPage: boolean) => {
   listQuery.value.beginTime = trainTime.value[0] || ''
   listQuery.value.endTime = trainTime.value[1] || ''
@@ -34,57 +36,23 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getenvironmentRecordList(listQuery.value).then((res) => {
+  getEnvironmentRecordList(listQuery.value).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
   })
   loadingTable.value = false
 }
 fetchData(true)
-const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref<TableColumn[]>([
-  {
-    text: '记录单号',
-    value: 'environmentCode',
-    align: 'center',
-  },
-  {
-    text: '房间号',
-    value: 'roomNumber',
-    align: 'center',
-  },
-  {
-    text: '记录人',
-    value: 'recorder',
-    align: 'center',
-  },
-  {
-    text: '记录时间',
-    value: 'recordTime',
-    width: '180',
-    align: 'center',
-  },
-  {
-    text: '温度(℃)',
-    value: 'temperature',
-    align: 'center',
-  },
-  {
-    text: '湿度(%)',
-    value: 'humidity',
-    align: 'center',
-  },
-  {
-    text: '输出电压(V)',
-    value: 'outputVoltage',
-    align: 'center',
-  },
-  {
-    text: '零地电压(V)',
-    value: 'zeroGroundVoltage',
-    align: 'center',
-  },
+  { text: '记录单号', value: 'environmentCode', align: 'center', width: '160' },
+  { text: '房间号', value: 'roomNumber', align: 'center' },
+  { text: '记录人', value: 'recorder', align: 'center' },
+  { text: '记录时间', value: 'recordTime', width: '180', align: 'center' },
+  { text: '温度(℃)', value: 'temperature', align: 'center' },
+  { text: '湿度(%)', value: 'humidity', align: 'center' },
+  { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
+  { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
 ])
 // 搜索
 const searchList = () => {
@@ -104,38 +72,44 @@
   trainTime.value = ''
   fetchData(true)
 }
+
 // 导出
-const exportExcelBtn = () => {
+const exportAll = () => {
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  // if (list.value.length > 0) {
-  // }
-  // else {
-  //   ElMessage.warning('无数据可导出数据')
-  // }
+  if (list.value.length > 0) {
+    const params = {
+      environmentCode: '', // 记录单编号
+      roomNumber: '', // 房间号
+      beginTime: '', // 记录开始时间
+      endTime: '', // 记录结束时间
+      offset: 1, // 当前页
+      limit: 20, // 多少条
+      ids: checkoutList.value,
+    }
+    exportEnvironmentRecord(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '环境记录单列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
   loading.close()
 }
-// 关闭编辑
-const close = () => {
-  show.value = true
-  fetchData(true)
-}
-// 点击编辑id和删除row类型
-interface rowReturn {
-  id: string
-  environmentCode: string
-}
+
 // 点击编辑/详情
-const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+const handleEdit = (row: IEnvironmental, pageType: 'edit' | 'detail') => {
   $router.push(`/lab/environmentalList/${pageType}/${row.id}`)
 }
+
 // 点击删除
-const handleDelete = (index: string, row: rowReturn) => {
+const handleDelete = (row: IEnvironmental) => {
   ElMessageBox.confirm(
-    `确认删除${row.environmentCode}吗？`,
+    `确认删除单号${row.environmentCode}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -144,12 +118,9 @@
     },
   )
     .then(() => {
-      getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
+      getEnvironmentRecordDelete({ id: row.id }).then((res) => {
         if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
+          ElMessage.success('已删除')
           fetchData(true)
         }
       })
@@ -160,14 +131,12 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
+
 // 点击新增
 const add = () => {
   $router.push('/lab/environmentalList/add')
 }
-// 点击导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -178,12 +147,12 @@
   }
   fetchData(true)
 }
-// 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([])
+
 // 获取下拉框数据
 getTypeSelect('roomNumber').then((res) => {
-  selectionList.value = res.data
+  roomNumberList.value = res.data
 })
+
 // 打印列表
 function printList() {
   // 打印列
@@ -225,7 +194,7 @@
           size="default"
         >
           <el-option
-            v-for="item in selectionList"
+            v-for="item in roomNumberList"
             :key="item.value"
             :label="item.name"
             :value="item.value"
@@ -238,7 +207,7 @@
           type="datetimerange"
           range-separator="到"
           format="YYYY-MM-DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="记录时间开始时间"
           end-placeholder="记录时间结束时间"
         />
@@ -247,21 +216,21 @@
     <table-container>
       <template #btns-right>
         <icon-button
-          v-if="proxy.hasPerm('/measure/train/plan/add')"
+          v-if="proxy.hasPerm('/lab/environmentalList/add')"
           icon="icon-add"
           title="新建"
           type="primary"
           @click="add"
         />
         <icon-button
-          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          v-if="proxy.hasPerm('/lab/environmentalList/export')"
           icon="icon-export"
           title="导出"
           type="primary"
           @click="exportAll"
         />
         <icon-button
-          v-if="proxy.hasPerm('/measure/train/plan/print')"
+          v-if="proxy.hasPerm('/lab/environmentalList/print')"
           icon="icon-print"
           title="打印"
           type="primary"
@@ -278,8 +247,15 @@
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="160">
+          <el-table-column label="操作" align="center" width="130" fixed="right">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/measure/train/plan/edit')"
@@ -303,7 +279,7 @@
                 size="small"
                 link
                 type="danger"
-                @click="handleDelete(row.$index, row)"
+                @click="handleDelete(row)"
               >
                 删除
               </el-button>
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 955af81..e1dc2a2 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -1,3 +1,13 @@
+// 查询参数
+export interface IListQuery {
+  environmentCode: string // 记录单编号
+  roomNumber: string // 房间号
+  beginTime: string // 记录开始时间
+  endTime: string // 记录结束时间
+  offset: number // 当前页
+  limit: number // 多少条
+}
+
 // 环境记录单list类型
 export interface IEnvironmental {
   environmentCode: string // 记录单编号
@@ -12,9 +22,27 @@
   createUser: string // 创建人
   id: string // 主键id
 }
+
 // 房间号模拟下拉框数据类型
-export interface selectionListItem {
+export interface IRoomNumber {
   value: string // 值
   name: string // lable
   id: string
 }
+
+// 环境记录单详情表单
+export interface IEnvironmentalDetail {
+  environmentCode: string // 环境记录单编号
+  roomNumber: string // 房间编号
+  recorder: string // 用户名
+  temperature: string // 温度
+  humidity: string // 湿度
+  outputVoltage: string // 输出电压
+  zeroGroundVoltage: string // 零地电压
+  remark: string // 备注
+  recordTime: string // 记录时间
+  createUser: string // 记录人id
+  createTime: string // 创建时间
+  id: string // 主键
+  updateTime: string // 更新时间
+}
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 98c4257..5105a76 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -294,6 +294,13 @@
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
           <el-table-column label="操作" align="center" width="130" fixed="right">
             <template #default="{ row }">
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index ae53f44..a0aee10 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -371,6 +371,13 @@
           :data="list" :total="total" :columns="columns" :query="listQuery"
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
         >
+          <template #preColumns>
+            <el-table-column label="序号" width="55" align="center">
+              <template #default="scope">
+                {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
           <template #columns>
             <el-table-column label="操作" align="center" :width="operationWidth">
               <template #default="{ row }">
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 21350ac..2ebcf8b 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -458,6 +458,13 @@
         :data="list" :total="total" :columns="currentMenu === '待收入' ? columnsTaking : columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
           <el-table-column
             label="操作" align="center" fixed="right" :width="currentMenu === '待收入' ? 270 : (currentMenu === '已收入' || currentMenu === '待归还') ? 210

diff --git "a/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js" "b/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
index 4c9b127..633c7a9 100644
--- "a/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
+++ "b/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
@@ -11,6 +11,7 @@
       },
       "directorMaxLevel": 4,//审批主管最大层级
       "flowPermission": [],//发起人
+      "decisionItem": 1, //1同意驳回拒绝、2同意驳回、3拒绝
       "nodeConfig": {
           "nodeName": "发起人",//节点名称
           "type": 0,// 0 发起人 1审批 2抄送 3条件 4路由
diff --git a/src/api/business/environmentRecord/environmentRecord.ts b/src/api/business/environmentRecord/environmentRecord.ts
deleted file mode 100644
index 1a575eb..0000000
--- a/src/api/business/environmentRecord/environmentRecord.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import request from '../../index'
-
-// 环境记录单列表查询-分页
-export function getenvironmentRecordList(data: { offset: number; limit: number }) {
-  return request({
-    url: `/business/environmentRecord/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 环境记录单删除
-export function getenvironmentRecordDelete(data: object) {
-  return request({
-    url: '/business/environmentRecord/delete',
-    method: 'post',
-    data,
-  })
-}
-
-// 新增环境记录单
-export function getenvironmentRecordAdd(data: object) {
-  return request({
-    url: '/business/environmentRecord/add',
-    method: 'post',
-    data,
-  })
-}
-
-// 环境监测记录单-详情
-export function getenvironmentRecordDetail(data: object) {
-  return request({
-    url: '/business/environmentRecord/detail',
-    method: 'post',
-    data,
-  })
-}
-
-// 环境监测记录单-编辑
-export function getenvironmentRecordUpdate(data: object) {
-  return request({
-    url: '/business/environmentRecord/update',
-    method: 'post',
-    data,
-  })
-}
diff --git a/src/api/business/lab/environmentRecord.ts b/src/api/business/lab/environmentRecord.ts
new file mode 100644
index 0000000..f76a9ce
--- /dev/null
+++ b/src/api/business/lab/environmentRecord.ts
@@ -0,0 +1,58 @@
+import request from '../../index'
+import type { IEnvironmentalDetail, IListQuery } from '@/views/business/lab/environmental/environmentalList_interface'
+const prefix = '/business/environmentRecord'
+
+// 环境记录单列表查询-分页
+export function getEnvironmentRecordList(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 环境记录单删除
+export function getEnvironmentRecordDelete(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新增环境记录单
+export function getEnvironmentRecordAdd(data: IEnvironmentalDetail) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 环境监测记录单-详情
+export function getEnvironmentRecordDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 环境监测记录单-编辑
+export function getEnvironmentRecordUpdate(data: IEnvironmentalDetail) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportEnvironmentRecord(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/export`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index 47a713e..94a4246 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -17,6 +17,16 @@
     data,
   })
 }
+
+// 设备借用取消审批
+export function cancelApproval(data: { processInstanceId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
+
 // 设备借用申请详情
 export function detailApply(data: object) {
   return request({
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 9887075..8fa5759 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -1,15 +1,16 @@
-<script lang="ts" setup name="PlanAdd">
+<!-- 环境记录单详情 -->
+<script lang="ts" setup name="EnvironmentalList">
 import type { FormInstance } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
-import type { selectionListItem } from './environmentalList_interface'
+import type { IEnvironmentalDetail, IRoomNumber } from './environmentalList_interface'
 import { getTypeSelect } from '@/api/system/price'
-import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
+import { getEnvironmentRecordAdd, getEnvironmentRecordDetail, getEnvironmentRecordUpdate } from '@/api/business/lab/environmentRecord'
 import useUserStore from '@/store/modules/user'
+const { proxy } = getCurrentInstance() as any
 const infoId = ref('') // id
-const { name, id } = useUserStore()
+const { name, id } = useUserStore() // 用户名、id
 const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
@@ -23,7 +24,8 @@
     infoId.value = $route.params.id as string
   }
 }
-const formInline = ref({
+// 表单
+const formInline = ref<IEnvironmentalDetail>({
   environmentCode: '', // 环境记录单编号
   roomNumber: '', // 房间编号
   recorder: name || '', // 用户名
@@ -38,10 +40,10 @@
   id: '', // 主键
   updateTime: '', // 更新时间
 })
-const ruleFormRef = ref<FormInstance>()
+const ruleFormRef = ref<FormInstance>() // 表单ref
 
 // 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([])
+const selectionList = ref<IRoomNumber[]>([])
 // 获取下拉框数据
 getTypeSelect('roomNumber').then((res) => {
   selectionList.value = res.data
@@ -73,39 +75,38 @@
   $router.back()
 }
 
+// 获取详情信息
 if (infoId.value && infoId.value !== '') {
-  getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
+  getEnvironmentRecordDetail({ id: infoId.value }).then((res) => {
     if (res.code === 200) {
       formInline.value = res.data
     }
   })
 }
 // 点击保存
-const preserve = async (formEl: FormInstance | undefined) => {
-  if (!formEl) {
-    return
-  }
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      ElMessageBox.confirm('确认提交吗？', '提示', {
+      ElMessageBox.confirm('确认保存吗？', '提示', {
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         type: 'warning',
       }).then(() => {
-        // 是否是新增
+        // 新增
         if (pageType.value === 'add') {
-          getenvironmentRecordAdd(formInline.value).then((res) => {
+          getEnvironmentRecordAdd(formInline.value).then((res) => {
             if (res.code === 200) {
-              ElMessage.success('提交成功!')
+              ElMessage.success('保存成功!')
               close()
             }
           })
         }
-        // 是否是编辑
-        else {
-          getenvironmentRecordUpdate(formInline.value).then((res) => {
+        // 编辑
+        else if (pageType.value === 'edit') {
+          getEnvironmentRecordUpdate(formInline.value).then((res) => {
             if (res.code === 200) {
-              ElMessage.success('提交成功!')
+              ElMessage.success('保存成功!')
               close()
             }
           })
@@ -117,8 +118,8 @@
 // 打印
 const printObj = ref({
   id: 'form', // 需要打印元素的id
-  popTitle: '环境记录单模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '环境记录单详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>环境记录单详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
@@ -130,15 +131,17 @@
     <detail-page :title="`环境记录单-${textMap[pageType]}`">
       <template #btns>
         <el-button
-          v-if="pageType !== 'detail'"
+          v-if="proxy.hasPerm('/lab/environmentalList/add') && pageType !== 'detail'"
           type="primary"
-          @click="
-            preserve(ruleFormRef)
-          "
+          @click="saveForm(ruleFormRef)"
         >
-          提交
+          保存
         </el-button>
-        <el-button v-else v-print="printObj" type="primary">
+        <el-button
+          v-if="proxy.hasPerm('/lab/environmentalList/add') && pageType === 'detail'"
+          v-print="printObj"
+          type="primary"
+        >
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -199,7 +202,7 @@
                 type="datetime"
                 :placeholder="pageType === 'detail' ? '无' : '请选择记录时间'"
                 format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                value-format="YYYY-MM-DD HH:mm:ss"
                 clearable
                 :disabled="pageType === 'detail'"
               />
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 90110ee..63a0849 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -1,13 +1,18 @@
+<!-- 环境记录单列表 -->
 <script lang="ts" setup name="EnvironmentalList">
-import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
+import type { IEnvironmental, IListQuery, IRoomNumber } from './environmentalList_interface'
 import { getTypeSelect } from '@/api/system/price'
-import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
+import { exportEnvironmentRecord, getEnvironmentRecordDelete, getEnvironmentRecordList } from '@/api/business/lab/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-const listQuery = ref({
+import { exportFile } from '@/utils/exportUtils'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+
+// 查询参数
+const listQuery = ref<IListQuery>({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
   beginTime: '', // 记录开始时间
@@ -15,17 +20,14 @@
   offset: 1, // 当前页
   limit: 20, // 多少条
 })
-const checkoutList = ref<string[]>([])
-const list = ref<IEnvironmental[]>([])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+const list = ref<IEnvironmental[]>([]) // 表格参数
 const total = ref(0)
-const show = ref(true)
+const loadingTable = ref(false) // 表格loading
+const trainTime = ref('') // 记录时间数组
+const roomNumberList = ref<IRoomNumber[]>([]) // 房间号
 
-const loadingTable = ref(false)
-// 初始化路由
-// 培训时间数组
-const trainTime = ref('')
-
-const $router = useRouter()
+// 查询列表
 const fetchData = (isNowPage: boolean) => {
   listQuery.value.beginTime = trainTime.value[0] || ''
   listQuery.value.endTime = trainTime.value[1] || ''
@@ -34,57 +36,23 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getenvironmentRecordList(listQuery.value).then((res) => {
+  getEnvironmentRecordList(listQuery.value).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
   })
   loadingTable.value = false
 }
 fetchData(true)
-const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref<TableColumn[]>([
-  {
-    text: '记录单号',
-    value: 'environmentCode',
-    align: 'center',
-  },
-  {
-    text: '房间号',
-    value: 'roomNumber',
-    align: 'center',
-  },
-  {
-    text: '记录人',
-    value: 'recorder',
-    align: 'center',
-  },
-  {
-    text: '记录时间',
-    value: 'recordTime',
-    width: '180',
-    align: 'center',
-  },
-  {
-    text: '温度(℃)',
-    value: 'temperature',
-    align: 'center',
-  },
-  {
-    text: '湿度(%)',
-    value: 'humidity',
-    align: 'center',
-  },
-  {
-    text: '输出电压(V)',
-    value: 'outputVoltage',
-    align: 'center',
-  },
-  {
-    text: '零地电压(V)',
-    value: 'zeroGroundVoltage',
-    align: 'center',
-  },
+  { text: '记录单号', value: 'environmentCode', align: 'center', width: '160' },
+  { text: '房间号', value: 'roomNumber', align: 'center' },
+  { text: '记录人', value: 'recorder', align: 'center' },
+  { text: '记录时间', value: 'recordTime', width: '180', align: 'center' },
+  { text: '温度(℃)', value: 'temperature', align: 'center' },
+  { text: '湿度(%)', value: 'humidity', align: 'center' },
+  { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
+  { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
 ])
 // 搜索
 const searchList = () => {
@@ -104,38 +72,44 @@
   trainTime.value = ''
   fetchData(true)
 }
+
 // 导出
-const exportExcelBtn = () => {
+const exportAll = () => {
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  // if (list.value.length > 0) {
-  // }
-  // else {
-  //   ElMessage.warning('无数据可导出数据')
-  // }
+  if (list.value.length > 0) {
+    const params = {
+      environmentCode: '', // 记录单编号
+      roomNumber: '', // 房间号
+      beginTime: '', // 记录开始时间
+      endTime: '', // 记录结束时间
+      offset: 1, // 当前页
+      limit: 20, // 多少条
+      ids: checkoutList.value,
+    }
+    exportEnvironmentRecord(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '环境记录单列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
   loading.close()
 }
-// 关闭编辑
-const close = () => {
-  show.value = true
-  fetchData(true)
-}
-// 点击编辑id和删除row类型
-interface rowReturn {
-  id: string
-  environmentCode: string
-}
+
 // 点击编辑/详情
-const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+const handleEdit = (row: IEnvironmental, pageType: 'edit' | 'detail') => {
   $router.push(`/lab/environmentalList/${pageType}/${row.id}`)
 }
+
 // 点击删除
-const handleDelete = (index: string, row: rowReturn) => {
+const handleDelete = (row: IEnvironmental) => {
   ElMessageBox.confirm(
-    `确认删除${row.environmentCode}吗？`,
+    `确认删除单号${row.environmentCode}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -144,12 +118,9 @@
     },
   )
     .then(() => {
-      getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
+      getEnvironmentRecordDelete({ id: row.id }).then((res) => {
         if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
+          ElMessage.success('已删除')
           fetchData(true)
         }
       })
@@ -160,14 +131,12 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
+
 // 点击新增
 const add = () => {
   $router.push('/lab/environmentalList/add')
 }
-// 点击导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -178,12 +147,12 @@
   }
   fetchData(true)
 }
-// 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([])
+
 // 获取下拉框数据
 getTypeSelect('roomNumber').then((res) => {
-  selectionList.value = res.data
+  roomNumberList.value = res.data
 })
+
 // 打印列表
 function printList() {
   // 打印列
@@ -225,7 +194,7 @@
           size="default"
         >
           <el-option
-            v-for="item in selectionList"
+            v-for="item in roomNumberList"
             :key="item.value"
             :label="item.name"
             :value="item.value"
@@ -238,7 +207,7 @@
           type="datetimerange"
           range-separator="到"
           format="YYYY-MM-DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="记录时间开始时间"
           end-placeholder="记录时间结束时间"
         />
@@ -247,21 +216,21 @@
     <table-container>
       <template #btns-right>
         <icon-button
-          v-if="proxy.hasPerm('/measure/train/plan/add')"
+          v-if="proxy.hasPerm('/lab/environmentalList/add')"
           icon="icon-add"
           title="新建"
           type="primary"
           @click="add"
         />
         <icon-button
-          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          v-if="proxy.hasPerm('/lab/environmentalList/export')"
           icon="icon-export"
           title="导出"
           type="primary"
           @click="exportAll"
         />
         <icon-button
-          v-if="proxy.hasPerm('/measure/train/plan/print')"
+          v-if="proxy.hasPerm('/lab/environmentalList/print')"
           icon="icon-print"
           title="打印"
           type="primary"
@@ -278,8 +247,15 @@
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="160">
+          <el-table-column label="操作" align="center" width="130" fixed="right">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/measure/train/plan/edit')"
@@ -303,7 +279,7 @@
                 size="small"
                 link
                 type="danger"
-                @click="handleDelete(row.$index, row)"
+                @click="handleDelete(row)"
               >
                 删除
               </el-button>
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 955af81..e1dc2a2 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -1,3 +1,13 @@
+// 查询参数
+export interface IListQuery {
+  environmentCode: string // 记录单编号
+  roomNumber: string // 房间号
+  beginTime: string // 记录开始时间
+  endTime: string // 记录结束时间
+  offset: number // 当前页
+  limit: number // 多少条
+}
+
 // 环境记录单list类型
 export interface IEnvironmental {
   environmentCode: string // 记录单编号
@@ -12,9 +22,27 @@
   createUser: string // 创建人
   id: string // 主键id
 }
+
 // 房间号模拟下拉框数据类型
-export interface selectionListItem {
+export interface IRoomNumber {
   value: string // 值
   name: string // lable
   id: string
 }
+
+// 环境记录单详情表单
+export interface IEnvironmentalDetail {
+  environmentCode: string // 环境记录单编号
+  roomNumber: string // 房间编号
+  recorder: string // 用户名
+  temperature: string // 温度
+  humidity: string // 湿度
+  outputVoltage: string // 输出电压
+  zeroGroundVoltage: string // 零地电压
+  remark: string // 备注
+  recordTime: string // 记录时间
+  createUser: string // 记录人id
+  createTime: string // 创建时间
+  id: string // 主键
+  updateTime: string // 更新时间
+}
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 98c4257..5105a76 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -294,6 +294,13 @@
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
           <el-table-column label="操作" align="center" width="130" fixed="right">
             <template #default="{ row }">
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index ae53f44..a0aee10 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -371,6 +371,13 @@
           :data="list" :total="total" :columns="columns" :query="listQuery"
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
         >
+          <template #preColumns>
+            <el-table-column label="序号" width="55" align="center">
+              <template #default="scope">
+                {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
           <template #columns>
             <el-table-column label="操作" align="center" :width="operationWidth">
               <template #default="{ row }">
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 21350ac..2ebcf8b 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -458,6 +458,13 @@
         :data="list" :total="total" :columns="currentMenu === '待收入' ? columnsTaking : columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
           <el-table-column
             label="操作" align="center" fixed="right" :width="currentMenu === '待收入' ? 270 : (currentMenu === '已收入' || currentMenu === '待归还') ? 210
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index ed11f7e..026fd77 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -87,7 +87,7 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
   { text: '外观', value: 'appearance', align: 'center' },
-  { text: '检定要求', value: 'measureRequire', align: 'center' },
+  { text: '检定要求', value: 'specialRequire', align: 'center' },
 ])
 
 // 签章查询数据
@@ -238,6 +238,10 @@
 // ------------------------样品-----------------------------
 // 点击批量增加
 const multiAdd = () => {
+  if (!dataForm.value.customerNo) {
+    ElMessage.warning('请先选择委托方')
+    return
+  }
   sampleVisible.value = true
 }
 // 修改委托方对话框显隐
@@ -318,6 +322,11 @@
   getAutographList()
 }
 
+// 表格双击行
+const rowDblclick = (row: ISampleList) => {
+  row.isEdit = true
+}
+
 onMounted(async () => {
   if (pageType.value === 'add') {
     dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
@@ -592,7 +601,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="24" class="marg">
+            <!-- <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="样品外观:">
                   <el-input
@@ -605,7 +614,7 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
+            </el-row> -->
             <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="依据文件:">
@@ -642,6 +651,7 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
+          @row-dblclick="rowDblclick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -653,7 +663,17 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          />
+          >
+            <template v-if="item.value === 'specialRequire' && (pageType === 'add' || pageType === 'edit')" #default="scope">
+              <el-input
+                v-if="scope.row.isEdit"
+                v-model="scope.row.specialRequire"
+                placeholder="请输入检定要求"
+                class="input"
+              />
+              <span v-else>{{ scope.row.specialRequire }}</span>
+            </template>
+          </el-table-column>
         </el-table>
       </detail-block>
       <!-- 签章部分 -->

diff --git "a/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js" "b/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
index 4c9b127..633c7a9 100644
--- "a/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
+++ "b/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
@@ -11,6 +11,7 @@
       },
       "directorMaxLevel": 4,//审批主管最大层级
       "flowPermission": [],//发起人
+      "decisionItem": 1, //1同意驳回拒绝、2同意驳回、3拒绝
       "nodeConfig": {
           "nodeName": "发起人",//节点名称
           "type": 0,// 0 发起人 1审批 2抄送 3条件 4路由
diff --git a/src/api/business/environmentRecord/environmentRecord.ts b/src/api/business/environmentRecord/environmentRecord.ts
deleted file mode 100644
index 1a575eb..0000000
--- a/src/api/business/environmentRecord/environmentRecord.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import request from '../../index'
-
-// 环境记录单列表查询-分页
-export function getenvironmentRecordList(data: { offset: number; limit: number }) {
-  return request({
-    url: `/business/environmentRecord/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 环境记录单删除
-export function getenvironmentRecordDelete(data: object) {
-  return request({
-    url: '/business/environmentRecord/delete',
-    method: 'post',
-    data,
-  })
-}
-
-// 新增环境记录单
-export function getenvironmentRecordAdd(data: object) {
-  return request({
-    url: '/business/environmentRecord/add',
-    method: 'post',
-    data,
-  })
-}
-
-// 环境监测记录单-详情
-export function getenvironmentRecordDetail(data: object) {
-  return request({
-    url: '/business/environmentRecord/detail',
-    method: 'post',
-    data,
-  })
-}
-
-// 环境监测记录单-编辑
-export function getenvironmentRecordUpdate(data: object) {
-  return request({
-    url: '/business/environmentRecord/update',
-    method: 'post',
-    data,
-  })
-}
diff --git a/src/api/business/lab/environmentRecord.ts b/src/api/business/lab/environmentRecord.ts
new file mode 100644
index 0000000..f76a9ce
--- /dev/null
+++ b/src/api/business/lab/environmentRecord.ts
@@ -0,0 +1,58 @@
+import request from '../../index'
+import type { IEnvironmentalDetail, IListQuery } from '@/views/business/lab/environmental/environmentalList_interface'
+const prefix = '/business/environmentRecord'
+
+// 环境记录单列表查询-分页
+export function getEnvironmentRecordList(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 环境记录单删除
+export function getEnvironmentRecordDelete(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新增环境记录单
+export function getEnvironmentRecordAdd(data: IEnvironmentalDetail) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 环境监测记录单-详情
+export function getEnvironmentRecordDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 环境监测记录单-编辑
+export function getEnvironmentRecordUpdate(data: IEnvironmentalDetail) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportEnvironmentRecord(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/export`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index 47a713e..94a4246 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -17,6 +17,16 @@
     data,
   })
 }
+
+// 设备借用取消审批
+export function cancelApproval(data: { processInstanceId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
+
 // 设备借用申请详情
 export function detailApply(data: object) {
   return request({
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 9887075..8fa5759 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -1,15 +1,16 @@
-<script lang="ts" setup name="PlanAdd">
+<!-- 环境记录单详情 -->
+<script lang="ts" setup name="EnvironmentalList">
 import type { FormInstance } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
-import type { selectionListItem } from './environmentalList_interface'
+import type { IEnvironmentalDetail, IRoomNumber } from './environmentalList_interface'
 import { getTypeSelect } from '@/api/system/price'
-import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
+import { getEnvironmentRecordAdd, getEnvironmentRecordDetail, getEnvironmentRecordUpdate } from '@/api/business/lab/environmentRecord'
 import useUserStore from '@/store/modules/user'
+const { proxy } = getCurrentInstance() as any
 const infoId = ref('') // id
-const { name, id } = useUserStore()
+const { name, id } = useUserStore() // 用户名、id
 const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
@@ -23,7 +24,8 @@
     infoId.value = $route.params.id as string
   }
 }
-const formInline = ref({
+// 表单
+const formInline = ref<IEnvironmentalDetail>({
   environmentCode: '', // 环境记录单编号
   roomNumber: '', // 房间编号
   recorder: name || '', // 用户名
@@ -38,10 +40,10 @@
   id: '', // 主键
   updateTime: '', // 更新时间
 })
-const ruleFormRef = ref<FormInstance>()
+const ruleFormRef = ref<FormInstance>() // 表单ref
 
 // 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([])
+const selectionList = ref<IRoomNumber[]>([])
 // 获取下拉框数据
 getTypeSelect('roomNumber').then((res) => {
   selectionList.value = res.data
@@ -73,39 +75,38 @@
   $router.back()
 }
 
+// 获取详情信息
 if (infoId.value && infoId.value !== '') {
-  getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
+  getEnvironmentRecordDetail({ id: infoId.value }).then((res) => {
     if (res.code === 200) {
       formInline.value = res.data
     }
   })
 }
 // 点击保存
-const preserve = async (formEl: FormInstance | undefined) => {
-  if (!formEl) {
-    return
-  }
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      ElMessageBox.confirm('确认提交吗？', '提示', {
+      ElMessageBox.confirm('确认保存吗？', '提示', {
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         type: 'warning',
       }).then(() => {
-        // 是否是新增
+        // 新增
         if (pageType.value === 'add') {
-          getenvironmentRecordAdd(formInline.value).then((res) => {
+          getEnvironmentRecordAdd(formInline.value).then((res) => {
             if (res.code === 200) {
-              ElMessage.success('提交成功!')
+              ElMessage.success('保存成功!')
               close()
             }
           })
         }
-        // 是否是编辑
-        else {
-          getenvironmentRecordUpdate(formInline.value).then((res) => {
+        // 编辑
+        else if (pageType.value === 'edit') {
+          getEnvironmentRecordUpdate(formInline.value).then((res) => {
             if (res.code === 200) {
-              ElMessage.success('提交成功!')
+              ElMessage.success('保存成功!')
               close()
             }
           })
@@ -117,8 +118,8 @@
 // 打印
 const printObj = ref({
   id: 'form', // 需要打印元素的id
-  popTitle: '环境记录单模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '环境记录单详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>环境记录单详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
@@ -130,15 +131,17 @@
     <detail-page :title="`环境记录单-${textMap[pageType]}`">
       <template #btns>
         <el-button
-          v-if="pageType !== 'detail'"
+          v-if="proxy.hasPerm('/lab/environmentalList/add') && pageType !== 'detail'"
           type="primary"
-          @click="
-            preserve(ruleFormRef)
-          "
+          @click="saveForm(ruleFormRef)"
         >
-          提交
+          保存
         </el-button>
-        <el-button v-else v-print="printObj" type="primary">
+        <el-button
+          v-if="proxy.hasPerm('/lab/environmentalList/add') && pageType === 'detail'"
+          v-print="printObj"
+          type="primary"
+        >
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -199,7 +202,7 @@
                 type="datetime"
                 :placeholder="pageType === 'detail' ? '无' : '请选择记录时间'"
                 format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                value-format="YYYY-MM-DD HH:mm:ss"
                 clearable
                 :disabled="pageType === 'detail'"
               />
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 90110ee..63a0849 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -1,13 +1,18 @@
+<!-- 环境记录单列表 -->
 <script lang="ts" setup name="EnvironmentalList">
-import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
+import type { IEnvironmental, IListQuery, IRoomNumber } from './environmentalList_interface'
 import { getTypeSelect } from '@/api/system/price'
-import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
+import { exportEnvironmentRecord, getEnvironmentRecordDelete, getEnvironmentRecordList } from '@/api/business/lab/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-const listQuery = ref({
+import { exportFile } from '@/utils/exportUtils'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+
+// 查询参数
+const listQuery = ref<IListQuery>({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
   beginTime: '', // 记录开始时间
@@ -15,17 +20,14 @@
   offset: 1, // 当前页
   limit: 20, // 多少条
 })
-const checkoutList = ref<string[]>([])
-const list = ref<IEnvironmental[]>([])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+const list = ref<IEnvironmental[]>([]) // 表格参数
 const total = ref(0)
-const show = ref(true)
+const loadingTable = ref(false) // 表格loading
+const trainTime = ref('') // 记录时间数组
+const roomNumberList = ref<IRoomNumber[]>([]) // 房间号
 
-const loadingTable = ref(false)
-// 初始化路由
-// 培训时间数组
-const trainTime = ref('')
-
-const $router = useRouter()
+// 查询列表
 const fetchData = (isNowPage: boolean) => {
   listQuery.value.beginTime = trainTime.value[0] || ''
   listQuery.value.endTime = trainTime.value[1] || ''
@@ -34,57 +36,23 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getenvironmentRecordList(listQuery.value).then((res) => {
+  getEnvironmentRecordList(listQuery.value).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
   })
   loadingTable.value = false
 }
 fetchData(true)
-const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref<TableColumn[]>([
-  {
-    text: '记录单号',
-    value: 'environmentCode',
-    align: 'center',
-  },
-  {
-    text: '房间号',
-    value: 'roomNumber',
-    align: 'center',
-  },
-  {
-    text: '记录人',
-    value: 'recorder',
-    align: 'center',
-  },
-  {
-    text: '记录时间',
-    value: 'recordTime',
-    width: '180',
-    align: 'center',
-  },
-  {
-    text: '温度(℃)',
-    value: 'temperature',
-    align: 'center',
-  },
-  {
-    text: '湿度(%)',
-    value: 'humidity',
-    align: 'center',
-  },
-  {
-    text: '输出电压(V)',
-    value: 'outputVoltage',
-    align: 'center',
-  },
-  {
-    text: '零地电压(V)',
-    value: 'zeroGroundVoltage',
-    align: 'center',
-  },
+  { text: '记录单号', value: 'environmentCode', align: 'center', width: '160' },
+  { text: '房间号', value: 'roomNumber', align: 'center' },
+  { text: '记录人', value: 'recorder', align: 'center' },
+  { text: '记录时间', value: 'recordTime', width: '180', align: 'center' },
+  { text: '温度(℃)', value: 'temperature', align: 'center' },
+  { text: '湿度(%)', value: 'humidity', align: 'center' },
+  { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
+  { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
 ])
 // 搜索
 const searchList = () => {
@@ -104,38 +72,44 @@
   trainTime.value = ''
   fetchData(true)
 }
+
 // 导出
-const exportExcelBtn = () => {
+const exportAll = () => {
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  // if (list.value.length > 0) {
-  // }
-  // else {
-  //   ElMessage.warning('无数据可导出数据')
-  // }
+  if (list.value.length > 0) {
+    const params = {
+      environmentCode: '', // 记录单编号
+      roomNumber: '', // 房间号
+      beginTime: '', // 记录开始时间
+      endTime: '', // 记录结束时间
+      offset: 1, // 当前页
+      limit: 20, // 多少条
+      ids: checkoutList.value,
+    }
+    exportEnvironmentRecord(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '环境记录单列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
   loading.close()
 }
-// 关闭编辑
-const close = () => {
-  show.value = true
-  fetchData(true)
-}
-// 点击编辑id和删除row类型
-interface rowReturn {
-  id: string
-  environmentCode: string
-}
+
 // 点击编辑/详情
-const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+const handleEdit = (row: IEnvironmental, pageType: 'edit' | 'detail') => {
   $router.push(`/lab/environmentalList/${pageType}/${row.id}`)
 }
+
 // 点击删除
-const handleDelete = (index: string, row: rowReturn) => {
+const handleDelete = (row: IEnvironmental) => {
   ElMessageBox.confirm(
-    `确认删除${row.environmentCode}吗？`,
+    `确认删除单号${row.environmentCode}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -144,12 +118,9 @@
     },
   )
     .then(() => {
-      getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
+      getEnvironmentRecordDelete({ id: row.id }).then((res) => {
         if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
+          ElMessage.success('已删除')
           fetchData(true)
         }
       })
@@ -160,14 +131,12 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
+
 // 点击新增
 const add = () => {
   $router.push('/lab/environmentalList/add')
 }
-// 点击导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -178,12 +147,12 @@
   }
   fetchData(true)
 }
-// 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([])
+
 // 获取下拉框数据
 getTypeSelect('roomNumber').then((res) => {
-  selectionList.value = res.data
+  roomNumberList.value = res.data
 })
+
 // 打印列表
 function printList() {
   // 打印列
@@ -225,7 +194,7 @@
           size="default"
         >
           <el-option
-            v-for="item in selectionList"
+            v-for="item in roomNumberList"
             :key="item.value"
             :label="item.name"
             :value="item.value"
@@ -238,7 +207,7 @@
           type="datetimerange"
           range-separator="到"
           format="YYYY-MM-DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="记录时间开始时间"
           end-placeholder="记录时间结束时间"
         />
@@ -247,21 +216,21 @@
     <table-container>
       <template #btns-right>
         <icon-button
-          v-if="proxy.hasPerm('/measure/train/plan/add')"
+          v-if="proxy.hasPerm('/lab/environmentalList/add')"
           icon="icon-add"
           title="新建"
           type="primary"
           @click="add"
         />
         <icon-button
-          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          v-if="proxy.hasPerm('/lab/environmentalList/export')"
           icon="icon-export"
           title="导出"
           type="primary"
           @click="exportAll"
         />
         <icon-button
-          v-if="proxy.hasPerm('/measure/train/plan/print')"
+          v-if="proxy.hasPerm('/lab/environmentalList/print')"
           icon="icon-print"
           title="打印"
           type="primary"
@@ -278,8 +247,15 @@
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="160">
+          <el-table-column label="操作" align="center" width="130" fixed="right">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/measure/train/plan/edit')"
@@ -303,7 +279,7 @@
                 size="small"
                 link
                 type="danger"
-                @click="handleDelete(row.$index, row)"
+                @click="handleDelete(row)"
               >
                 删除
               </el-button>
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 955af81..e1dc2a2 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -1,3 +1,13 @@
+// 查询参数
+export interface IListQuery {
+  environmentCode: string // 记录单编号
+  roomNumber: string // 房间号
+  beginTime: string // 记录开始时间
+  endTime: string // 记录结束时间
+  offset: number // 当前页
+  limit: number // 多少条
+}
+
 // 环境记录单list类型
 export interface IEnvironmental {
   environmentCode: string // 记录单编号
@@ -12,9 +22,27 @@
   createUser: string // 创建人
   id: string // 主键id
 }
+
 // 房间号模拟下拉框数据类型
-export interface selectionListItem {
+export interface IRoomNumber {
   value: string // 值
   name: string // lable
   id: string
 }
+
+// 环境记录单详情表单
+export interface IEnvironmentalDetail {
+  environmentCode: string // 环境记录单编号
+  roomNumber: string // 房间编号
+  recorder: string // 用户名
+  temperature: string // 温度
+  humidity: string // 湿度
+  outputVoltage: string // 输出电压
+  zeroGroundVoltage: string // 零地电压
+  remark: string // 备注
+  recordTime: string // 记录时间
+  createUser: string // 记录人id
+  createTime: string // 创建时间
+  id: string // 主键
+  updateTime: string // 更新时间
+}
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 98c4257..5105a76 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -294,6 +294,13 @@
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
           <el-table-column label="操作" align="center" width="130" fixed="right">
             <template #default="{ row }">
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index ae53f44..a0aee10 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -371,6 +371,13 @@
           :data="list" :total="total" :columns="columns" :query="listQuery"
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
         >
+          <template #preColumns>
+            <el-table-column label="序号" width="55" align="center">
+              <template #default="scope">
+                {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
           <template #columns>
             <el-table-column label="操作" align="center" :width="operationWidth">
               <template #default="{ row }">
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 21350ac..2ebcf8b 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -458,6 +458,13 @@
         :data="list" :total="total" :columns="currentMenu === '待收入' ? columnsTaking : columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
           <el-table-column
             label="操作" align="center" fixed="right" :width="currentMenu === '待收入' ? 270 : (currentMenu === '已收入' || currentMenu === '待归还') ? 210
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index ed11f7e..026fd77 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -87,7 +87,7 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
   { text: '外观', value: 'appearance', align: 'center' },
-  { text: '检定要求', value: 'measureRequire', align: 'center' },
+  { text: '检定要求', value: 'specialRequire', align: 'center' },
 ])
 
 // 签章查询数据
@@ -238,6 +238,10 @@
 // ------------------------样品-----------------------------
 // 点击批量增加
 const multiAdd = () => {
+  if (!dataForm.value.customerNo) {
+    ElMessage.warning('请先选择委托方')
+    return
+  }
   sampleVisible.value = true
 }
 // 修改委托方对话框显隐
@@ -318,6 +322,11 @@
   getAutographList()
 }
 
+// 表格双击行
+const rowDblclick = (row: ISampleList) => {
+  row.isEdit = true
+}
+
 onMounted(async () => {
   if (pageType.value === 'add') {
     dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
@@ -592,7 +601,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="24" class="marg">
+            <!-- <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="样品外观:">
                   <el-input
@@ -605,7 +614,7 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
+            </el-row> -->
             <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="依据文件:">
@@ -642,6 +651,7 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
+          @row-dblclick="rowDblclick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -653,7 +663,17 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          />
+          >
+            <template v-if="item.value === 'specialRequire' && (pageType === 'add' || pageType === 'edit')" #default="scope">
+              <el-input
+                v-if="scope.row.isEdit"
+                v-model="scope.row.specialRequire"
+                placeholder="请输入检定要求"
+                class="input"
+              />
+              <span v-else>{{ scope.row.specialRequire }}</span>
+            </template>
+          </el-table-column>
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index 3decec5..2d1c1ff 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -60,6 +60,7 @@
   appendixDescn: string // 附件说明
   appearance: string // 外观
   measureRequire: string // 检定要求
+  isEdit?: boolean // 是否可编辑
 }
 
 // 字典

diff --git "a/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js" "b/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
index 4c9b127..633c7a9 100644
--- "a/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
+++ "b/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
@@ -11,6 +11,7 @@
       },
       "directorMaxLevel": 4,//审批主管最大层级
       "flowPermission": [],//发起人
+      "decisionItem": 1, //1同意驳回拒绝、2同意驳回、3拒绝
       "nodeConfig": {
           "nodeName": "发起人",//节点名称
           "type": 0,// 0 发起人 1审批 2抄送 3条件 4路由
diff --git a/src/api/business/environmentRecord/environmentRecord.ts b/src/api/business/environmentRecord/environmentRecord.ts
deleted file mode 100644
index 1a575eb..0000000
--- a/src/api/business/environmentRecord/environmentRecord.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import request from '../../index'
-
-// 环境记录单列表查询-分页
-export function getenvironmentRecordList(data: { offset: number; limit: number }) {
-  return request({
-    url: `/business/environmentRecord/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 环境记录单删除
-export function getenvironmentRecordDelete(data: object) {
-  return request({
-    url: '/business/environmentRecord/delete',
-    method: 'post',
-    data,
-  })
-}
-
-// 新增环境记录单
-export function getenvironmentRecordAdd(data: object) {
-  return request({
-    url: '/business/environmentRecord/add',
-    method: 'post',
-    data,
-  })
-}
-
-// 环境监测记录单-详情
-export function getenvironmentRecordDetail(data: object) {
-  return request({
-    url: '/business/environmentRecord/detail',
-    method: 'post',
-    data,
-  })
-}
-
-// 环境监测记录单-编辑
-export function getenvironmentRecordUpdate(data: object) {
-  return request({
-    url: '/business/environmentRecord/update',
-    method: 'post',
-    data,
-  })
-}
diff --git a/src/api/business/lab/environmentRecord.ts b/src/api/business/lab/environmentRecord.ts
new file mode 100644
index 0000000..f76a9ce
--- /dev/null
+++ b/src/api/business/lab/environmentRecord.ts
@@ -0,0 +1,58 @@
+import request from '../../index'
+import type { IEnvironmentalDetail, IListQuery } from '@/views/business/lab/environmental/environmentalList_interface'
+const prefix = '/business/environmentRecord'
+
+// 环境记录单列表查询-分页
+export function getEnvironmentRecordList(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 环境记录单删除
+export function getEnvironmentRecordDelete(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新增环境记录单
+export function getEnvironmentRecordAdd(data: IEnvironmentalDetail) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 环境监测记录单-详情
+export function getEnvironmentRecordDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 环境监测记录单-编辑
+export function getEnvironmentRecordUpdate(data: IEnvironmentalDetail) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportEnvironmentRecord(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/export`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index 47a713e..94a4246 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -17,6 +17,16 @@
     data,
   })
 }
+
+// 设备借用取消审批
+export function cancelApproval(data: { processInstanceId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
+
 // 设备借用申请详情
 export function detailApply(data: object) {
   return request({
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 9887075..8fa5759 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -1,15 +1,16 @@
-<script lang="ts" setup name="PlanAdd">
+<!-- 环境记录单详情 -->
+<script lang="ts" setup name="EnvironmentalList">
 import type { FormInstance } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
-import type { selectionListItem } from './environmentalList_interface'
+import type { IEnvironmentalDetail, IRoomNumber } from './environmentalList_interface'
 import { getTypeSelect } from '@/api/system/price'
-import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
+import { getEnvironmentRecordAdd, getEnvironmentRecordDetail, getEnvironmentRecordUpdate } from '@/api/business/lab/environmentRecord'
 import useUserStore from '@/store/modules/user'
+const { proxy } = getCurrentInstance() as any
 const infoId = ref('') // id
-const { name, id } = useUserStore()
+const { name, id } = useUserStore() // 用户名、id
 const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
@@ -23,7 +24,8 @@
     infoId.value = $route.params.id as string
   }
 }
-const formInline = ref({
+// 表单
+const formInline = ref<IEnvironmentalDetail>({
   environmentCode: '', // 环境记录单编号
   roomNumber: '', // 房间编号
   recorder: name || '', // 用户名
@@ -38,10 +40,10 @@
   id: '', // 主键
   updateTime: '', // 更新时间
 })
-const ruleFormRef = ref<FormInstance>()
+const ruleFormRef = ref<FormInstance>() // 表单ref
 
 // 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([])
+const selectionList = ref<IRoomNumber[]>([])
 // 获取下拉框数据
 getTypeSelect('roomNumber').then((res) => {
   selectionList.value = res.data
@@ -73,39 +75,38 @@
   $router.back()
 }
 
+// 获取详情信息
 if (infoId.value && infoId.value !== '') {
-  getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
+  getEnvironmentRecordDetail({ id: infoId.value }).then((res) => {
     if (res.code === 200) {
       formInline.value = res.data
     }
   })
 }
 // 点击保存
-const preserve = async (formEl: FormInstance | undefined) => {
-  if (!formEl) {
-    return
-  }
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      ElMessageBox.confirm('确认提交吗？', '提示', {
+      ElMessageBox.confirm('确认保存吗？', '提示', {
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         type: 'warning',
       }).then(() => {
-        // 是否是新增
+        // 新增
         if (pageType.value === 'add') {
-          getenvironmentRecordAdd(formInline.value).then((res) => {
+          getEnvironmentRecordAdd(formInline.value).then((res) => {
             if (res.code === 200) {
-              ElMessage.success('提交成功!')
+              ElMessage.success('保存成功!')
               close()
             }
           })
         }
-        // 是否是编辑
-        else {
-          getenvironmentRecordUpdate(formInline.value).then((res) => {
+        // 编辑
+        else if (pageType.value === 'edit') {
+          getEnvironmentRecordUpdate(formInline.value).then((res) => {
             if (res.code === 200) {
-              ElMessage.success('提交成功!')
+              ElMessage.success('保存成功!')
               close()
             }
           })
@@ -117,8 +118,8 @@
 // 打印
 const printObj = ref({
   id: 'form', // 需要打印元素的id
-  popTitle: '环境记录单模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '环境记录单详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>环境记录单详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
@@ -130,15 +131,17 @@
     <detail-page :title="`环境记录单-${textMap[pageType]}`">
       <template #btns>
         <el-button
-          v-if="pageType !== 'detail'"
+          v-if="proxy.hasPerm('/lab/environmentalList/add') && pageType !== 'detail'"
           type="primary"
-          @click="
-            preserve(ruleFormRef)
-          "
+          @click="saveForm(ruleFormRef)"
         >
-          提交
+          保存
         </el-button>
-        <el-button v-else v-print="printObj" type="primary">
+        <el-button
+          v-if="proxy.hasPerm('/lab/environmentalList/add') && pageType === 'detail'"
+          v-print="printObj"
+          type="primary"
+        >
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -199,7 +202,7 @@
                 type="datetime"
                 :placeholder="pageType === 'detail' ? '无' : '请选择记录时间'"
                 format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                value-format="YYYY-MM-DD HH:mm:ss"
                 clearable
                 :disabled="pageType === 'detail'"
               />
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 90110ee..63a0849 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -1,13 +1,18 @@
+<!-- 环境记录单列表 -->
 <script lang="ts" setup name="EnvironmentalList">
-import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
+import type { IEnvironmental, IListQuery, IRoomNumber } from './environmentalList_interface'
 import { getTypeSelect } from '@/api/system/price'
-import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
+import { exportEnvironmentRecord, getEnvironmentRecordDelete, getEnvironmentRecordList } from '@/api/business/lab/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-const listQuery = ref({
+import { exportFile } from '@/utils/exportUtils'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+
+// 查询参数
+const listQuery = ref<IListQuery>({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
   beginTime: '', // 记录开始时间
@@ -15,17 +20,14 @@
   offset: 1, // 当前页
   limit: 20, // 多少条
 })
-const checkoutList = ref<string[]>([])
-const list = ref<IEnvironmental[]>([])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+const list = ref<IEnvironmental[]>([]) // 表格参数
 const total = ref(0)
-const show = ref(true)
+const loadingTable = ref(false) // 表格loading
+const trainTime = ref('') // 记录时间数组
+const roomNumberList = ref<IRoomNumber[]>([]) // 房间号
 
-const loadingTable = ref(false)
-// 初始化路由
-// 培训时间数组
-const trainTime = ref('')
-
-const $router = useRouter()
+// 查询列表
 const fetchData = (isNowPage: boolean) => {
   listQuery.value.beginTime = trainTime.value[0] || ''
   listQuery.value.endTime = trainTime.value[1] || ''
@@ -34,57 +36,23 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getenvironmentRecordList(listQuery.value).then((res) => {
+  getEnvironmentRecordList(listQuery.value).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
   })
   loadingTable.value = false
 }
 fetchData(true)
-const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref<TableColumn[]>([
-  {
-    text: '记录单号',
-    value: 'environmentCode',
-    align: 'center',
-  },
-  {
-    text: '房间号',
-    value: 'roomNumber',
-    align: 'center',
-  },
-  {
-    text: '记录人',
-    value: 'recorder',
-    align: 'center',
-  },
-  {
-    text: '记录时间',
-    value: 'recordTime',
-    width: '180',
-    align: 'center',
-  },
-  {
-    text: '温度(℃)',
-    value: 'temperature',
-    align: 'center',
-  },
-  {
-    text: '湿度(%)',
-    value: 'humidity',
-    align: 'center',
-  },
-  {
-    text: '输出电压(V)',
-    value: 'outputVoltage',
-    align: 'center',
-  },
-  {
-    text: '零地电压(V)',
-    value: 'zeroGroundVoltage',
-    align: 'center',
-  },
+  { text: '记录单号', value: 'environmentCode', align: 'center', width: '160' },
+  { text: '房间号', value: 'roomNumber', align: 'center' },
+  { text: '记录人', value: 'recorder', align: 'center' },
+  { text: '记录时间', value: 'recordTime', width: '180', align: 'center' },
+  { text: '温度(℃)', value: 'temperature', align: 'center' },
+  { text: '湿度(%)', value: 'humidity', align: 'center' },
+  { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
+  { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
 ])
 // 搜索
 const searchList = () => {
@@ -104,38 +72,44 @@
   trainTime.value = ''
   fetchData(true)
 }
+
 // 导出
-const exportExcelBtn = () => {
+const exportAll = () => {
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  // if (list.value.length > 0) {
-  // }
-  // else {
-  //   ElMessage.warning('无数据可导出数据')
-  // }
+  if (list.value.length > 0) {
+    const params = {
+      environmentCode: '', // 记录单编号
+      roomNumber: '', // 房间号
+      beginTime: '', // 记录开始时间
+      endTime: '', // 记录结束时间
+      offset: 1, // 当前页
+      limit: 20, // 多少条
+      ids: checkoutList.value,
+    }
+    exportEnvironmentRecord(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '环境记录单列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
   loading.close()
 }
-// 关闭编辑
-const close = () => {
-  show.value = true
-  fetchData(true)
-}
-// 点击编辑id和删除row类型
-interface rowReturn {
-  id: string
-  environmentCode: string
-}
+
 // 点击编辑/详情
-const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+const handleEdit = (row: IEnvironmental, pageType: 'edit' | 'detail') => {
   $router.push(`/lab/environmentalList/${pageType}/${row.id}`)
 }
+
 // 点击删除
-const handleDelete = (index: string, row: rowReturn) => {
+const handleDelete = (row: IEnvironmental) => {
   ElMessageBox.confirm(
-    `确认删除${row.environmentCode}吗？`,
+    `确认删除单号${row.environmentCode}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -144,12 +118,9 @@
     },
   )
     .then(() => {
-      getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
+      getEnvironmentRecordDelete({ id: row.id }).then((res) => {
         if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
+          ElMessage.success('已删除')
           fetchData(true)
         }
       })
@@ -160,14 +131,12 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
+
 // 点击新增
 const add = () => {
   $router.push('/lab/environmentalList/add')
 }
-// 点击导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -178,12 +147,12 @@
   }
   fetchData(true)
 }
-// 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([])
+
 // 获取下拉框数据
 getTypeSelect('roomNumber').then((res) => {
-  selectionList.value = res.data
+  roomNumberList.value = res.data
 })
+
 // 打印列表
 function printList() {
   // 打印列
@@ -225,7 +194,7 @@
           size="default"
         >
           <el-option
-            v-for="item in selectionList"
+            v-for="item in roomNumberList"
             :key="item.value"
             :label="item.name"
             :value="item.value"
@@ -238,7 +207,7 @@
           type="datetimerange"
           range-separator="到"
           format="YYYY-MM-DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="记录时间开始时间"
           end-placeholder="记录时间结束时间"
         />
@@ -247,21 +216,21 @@
     <table-container>
       <template #btns-right>
         <icon-button
-          v-if="proxy.hasPerm('/measure/train/plan/add')"
+          v-if="proxy.hasPerm('/lab/environmentalList/add')"
           icon="icon-add"
           title="新建"
           type="primary"
           @click="add"
         />
         <icon-button
-          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          v-if="proxy.hasPerm('/lab/environmentalList/export')"
           icon="icon-export"
           title="导出"
           type="primary"
           @click="exportAll"
         />
         <icon-button
-          v-if="proxy.hasPerm('/measure/train/plan/print')"
+          v-if="proxy.hasPerm('/lab/environmentalList/print')"
           icon="icon-print"
           title="打印"
           type="primary"
@@ -278,8 +247,15 @@
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="160">
+          <el-table-column label="操作" align="center" width="130" fixed="right">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/measure/train/plan/edit')"
@@ -303,7 +279,7 @@
                 size="small"
                 link
                 type="danger"
-                @click="handleDelete(row.$index, row)"
+                @click="handleDelete(row)"
               >
                 删除
               </el-button>
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 955af81..e1dc2a2 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -1,3 +1,13 @@
+// 查询参数
+export interface IListQuery {
+  environmentCode: string // 记录单编号
+  roomNumber: string // 房间号
+  beginTime: string // 记录开始时间
+  endTime: string // 记录结束时间
+  offset: number // 当前页
+  limit: number // 多少条
+}
+
 // 环境记录单list类型
 export interface IEnvironmental {
   environmentCode: string // 记录单编号
@@ -12,9 +22,27 @@
   createUser: string // 创建人
   id: string // 主键id
 }
+
 // 房间号模拟下拉框数据类型
-export interface selectionListItem {
+export interface IRoomNumber {
   value: string // 值
   name: string // lable
   id: string
 }
+
+// 环境记录单详情表单
+export interface IEnvironmentalDetail {
+  environmentCode: string // 环境记录单编号
+  roomNumber: string // 房间编号
+  recorder: string // 用户名
+  temperature: string // 温度
+  humidity: string // 湿度
+  outputVoltage: string // 输出电压
+  zeroGroundVoltage: string // 零地电压
+  remark: string // 备注
+  recordTime: string // 记录时间
+  createUser: string // 记录人id
+  createTime: string // 创建时间
+  id: string // 主键
+  updateTime: string // 更新时间
+}
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 98c4257..5105a76 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -294,6 +294,13 @@
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
           <el-table-column label="操作" align="center" width="130" fixed="right">
             <template #default="{ row }">
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index ae53f44..a0aee10 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -371,6 +371,13 @@
           :data="list" :total="total" :columns="columns" :query="listQuery"
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
         >
+          <template #preColumns>
+            <el-table-column label="序号" width="55" align="center">
+              <template #default="scope">
+                {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
           <template #columns>
             <el-table-column label="操作" align="center" :width="operationWidth">
               <template #default="{ row }">
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 21350ac..2ebcf8b 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -458,6 +458,13 @@
         :data="list" :total="total" :columns="currentMenu === '待收入' ? columnsTaking : columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
           <el-table-column
             label="操作" align="center" fixed="right" :width="currentMenu === '待收入' ? 270 : (currentMenu === '已收入' || currentMenu === '待归还') ? 210
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index ed11f7e..026fd77 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -87,7 +87,7 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
   { text: '外观', value: 'appearance', align: 'center' },
-  { text: '检定要求', value: 'measureRequire', align: 'center' },
+  { text: '检定要求', value: 'specialRequire', align: 'center' },
 ])
 
 // 签章查询数据
@@ -238,6 +238,10 @@
 // ------------------------样品-----------------------------
 // 点击批量增加
 const multiAdd = () => {
+  if (!dataForm.value.customerNo) {
+    ElMessage.warning('请先选择委托方')
+    return
+  }
   sampleVisible.value = true
 }
 // 修改委托方对话框显隐
@@ -318,6 +322,11 @@
   getAutographList()
 }
 
+// 表格双击行
+const rowDblclick = (row: ISampleList) => {
+  row.isEdit = true
+}
+
 onMounted(async () => {
   if (pageType.value === 'add') {
     dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
@@ -592,7 +601,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="24" class="marg">
+            <!-- <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="样品外观:">
                   <el-input
@@ -605,7 +614,7 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
+            </el-row> -->
             <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="依据文件:">
@@ -642,6 +651,7 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
+          @row-dblclick="rowDblclick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -653,7 +663,17 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          />
+          >
+            <template v-if="item.value === 'specialRequire' && (pageType === 'add' || pageType === 'edit')" #default="scope">
+              <el-input
+                v-if="scope.row.isEdit"
+                v-model="scope.row.specialRequire"
+                placeholder="请输入检定要求"
+                class="input"
+              />
+              <span v-else>{{ scope.row.specialRequire }}</span>
+            </template>
+          </el-table-column>
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index 3decec5..2d1c1ff 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -60,6 +60,7 @@
   appendixDescn: string // 附件说明
   appearance: string // 外观
   measureRequire: string // 检定要求
+  isEdit?: boolean // 是否可编辑
 }
 
 // 字典
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index b090632..7622ab0 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -326,6 +326,13 @@
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
           <el-table-column label="操作" align="center" fixed="right" width="170">
             <template #default="{ row }">

diff --git "a/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js" "b/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
index 4c9b127..633c7a9 100644
--- "a/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
+++ "b/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
@@ -11,6 +11,7 @@
       },
       "directorMaxLevel": 4,//审批主管最大层级
       "flowPermission": [],//发起人
+      "decisionItem": 1, //1同意驳回拒绝、2同意驳回、3拒绝
       "nodeConfig": {
           "nodeName": "发起人",//节点名称
           "type": 0,// 0 发起人 1审批 2抄送 3条件 4路由
diff --git a/src/api/business/environmentRecord/environmentRecord.ts b/src/api/business/environmentRecord/environmentRecord.ts
deleted file mode 100644
index 1a575eb..0000000
--- a/src/api/business/environmentRecord/environmentRecord.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import request from '../../index'
-
-// 环境记录单列表查询-分页
-export function getenvironmentRecordList(data: { offset: number; limit: number }) {
-  return request({
-    url: `/business/environmentRecord/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 环境记录单删除
-export function getenvironmentRecordDelete(data: object) {
-  return request({
-    url: '/business/environmentRecord/delete',
-    method: 'post',
-    data,
-  })
-}
-
-// 新增环境记录单
-export function getenvironmentRecordAdd(data: object) {
-  return request({
-    url: '/business/environmentRecord/add',
-    method: 'post',
-    data,
-  })
-}
-
-// 环境监测记录单-详情
-export function getenvironmentRecordDetail(data: object) {
-  return request({
-    url: '/business/environmentRecord/detail',
-    method: 'post',
-    data,
-  })
-}
-
-// 环境监测记录单-编辑
-export function getenvironmentRecordUpdate(data: object) {
-  return request({
-    url: '/business/environmentRecord/update',
-    method: 'post',
-    data,
-  })
-}
diff --git a/src/api/business/lab/environmentRecord.ts b/src/api/business/lab/environmentRecord.ts
new file mode 100644
index 0000000..f76a9ce
--- /dev/null
+++ b/src/api/business/lab/environmentRecord.ts
@@ -0,0 +1,58 @@
+import request from '../../index'
+import type { IEnvironmentalDetail, IListQuery } from '@/views/business/lab/environmental/environmentalList_interface'
+const prefix = '/business/environmentRecord'
+
+// 环境记录单列表查询-分页
+export function getEnvironmentRecordList(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 环境记录单删除
+export function getEnvironmentRecordDelete(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新增环境记录单
+export function getEnvironmentRecordAdd(data: IEnvironmentalDetail) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 环境监测记录单-详情
+export function getEnvironmentRecordDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 环境监测记录单-编辑
+export function getEnvironmentRecordUpdate(data: IEnvironmentalDetail) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportEnvironmentRecord(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/export`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index 47a713e..94a4246 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -17,6 +17,16 @@
     data,
   })
 }
+
+// 设备借用取消审批
+export function cancelApproval(data: { processInstanceId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
+
 // 设备借用申请详情
 export function detailApply(data: object) {
   return request({
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 9887075..8fa5759 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -1,15 +1,16 @@
-<script lang="ts" setup name="PlanAdd">
+<!-- 环境记录单详情 -->
+<script lang="ts" setup name="EnvironmentalList">
 import type { FormInstance } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
-import type { selectionListItem } from './environmentalList_interface'
+import type { IEnvironmentalDetail, IRoomNumber } from './environmentalList_interface'
 import { getTypeSelect } from '@/api/system/price'
-import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
+import { getEnvironmentRecordAdd, getEnvironmentRecordDetail, getEnvironmentRecordUpdate } from '@/api/business/lab/environmentRecord'
 import useUserStore from '@/store/modules/user'
+const { proxy } = getCurrentInstance() as any
 const infoId = ref('') // id
-const { name, id } = useUserStore()
+const { name, id } = useUserStore() // 用户名、id
 const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
@@ -23,7 +24,8 @@
     infoId.value = $route.params.id as string
   }
 }
-const formInline = ref({
+// 表单
+const formInline = ref<IEnvironmentalDetail>({
   environmentCode: '', // 环境记录单编号
   roomNumber: '', // 房间编号
   recorder: name || '', // 用户名
@@ -38,10 +40,10 @@
   id: '', // 主键
   updateTime: '', // 更新时间
 })
-const ruleFormRef = ref<FormInstance>()
+const ruleFormRef = ref<FormInstance>() // 表单ref
 
 // 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([])
+const selectionList = ref<IRoomNumber[]>([])
 // 获取下拉框数据
 getTypeSelect('roomNumber').then((res) => {
   selectionList.value = res.data
@@ -73,39 +75,38 @@
   $router.back()
 }
 
+// 获取详情信息
 if (infoId.value && infoId.value !== '') {
-  getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
+  getEnvironmentRecordDetail({ id: infoId.value }).then((res) => {
     if (res.code === 200) {
       formInline.value = res.data
     }
   })
 }
 // 点击保存
-const preserve = async (formEl: FormInstance | undefined) => {
-  if (!formEl) {
-    return
-  }
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      ElMessageBox.confirm('确认提交吗？', '提示', {
+      ElMessageBox.confirm('确认保存吗？', '提示', {
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         type: 'warning',
       }).then(() => {
-        // 是否是新增
+        // 新增
         if (pageType.value === 'add') {
-          getenvironmentRecordAdd(formInline.value).then((res) => {
+          getEnvironmentRecordAdd(formInline.value).then((res) => {
             if (res.code === 200) {
-              ElMessage.success('提交成功!')
+              ElMessage.success('保存成功!')
               close()
             }
           })
         }
-        // 是否是编辑
-        else {
-          getenvironmentRecordUpdate(formInline.value).then((res) => {
+        // 编辑
+        else if (pageType.value === 'edit') {
+          getEnvironmentRecordUpdate(formInline.value).then((res) => {
             if (res.code === 200) {
-              ElMessage.success('提交成功!')
+              ElMessage.success('保存成功!')
               close()
             }
           })
@@ -117,8 +118,8 @@
 // 打印
 const printObj = ref({
   id: 'form', // 需要打印元素的id
-  popTitle: '环境记录单模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '环境记录单详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>环境记录单详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
@@ -130,15 +131,17 @@
     <detail-page :title="`环境记录单-${textMap[pageType]}`">
       <template #btns>
         <el-button
-          v-if="pageType !== 'detail'"
+          v-if="proxy.hasPerm('/lab/environmentalList/add') && pageType !== 'detail'"
           type="primary"
-          @click="
-            preserve(ruleFormRef)
-          "
+          @click="saveForm(ruleFormRef)"
         >
-          提交
+          保存
         </el-button>
-        <el-button v-else v-print="printObj" type="primary">
+        <el-button
+          v-if="proxy.hasPerm('/lab/environmentalList/add') && pageType === 'detail'"
+          v-print="printObj"
+          type="primary"
+        >
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -199,7 +202,7 @@
                 type="datetime"
                 :placeholder="pageType === 'detail' ? '无' : '请选择记录时间'"
                 format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                value-format="YYYY-MM-DD HH:mm:ss"
                 clearable
                 :disabled="pageType === 'detail'"
               />
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 90110ee..63a0849 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -1,13 +1,18 @@
+<!-- 环境记录单列表 -->
 <script lang="ts" setup name="EnvironmentalList">
-import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
+import type { IEnvironmental, IListQuery, IRoomNumber } from './environmentalList_interface'
 import { getTypeSelect } from '@/api/system/price'
-import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
+import { exportEnvironmentRecord, getEnvironmentRecordDelete, getEnvironmentRecordList } from '@/api/business/lab/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-const listQuery = ref({
+import { exportFile } from '@/utils/exportUtils'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+
+// 查询参数
+const listQuery = ref<IListQuery>({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
   beginTime: '', // 记录开始时间
@@ -15,17 +20,14 @@
   offset: 1, // 当前页
   limit: 20, // 多少条
 })
-const checkoutList = ref<string[]>([])
-const list = ref<IEnvironmental[]>([])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+const list = ref<IEnvironmental[]>([]) // 表格参数
 const total = ref(0)
-const show = ref(true)
+const loadingTable = ref(false) // 表格loading
+const trainTime = ref('') // 记录时间数组
+const roomNumberList = ref<IRoomNumber[]>([]) // 房间号
 
-const loadingTable = ref(false)
-// 初始化路由
-// 培训时间数组
-const trainTime = ref('')
-
-const $router = useRouter()
+// 查询列表
 const fetchData = (isNowPage: boolean) => {
   listQuery.value.beginTime = trainTime.value[0] || ''
   listQuery.value.endTime = trainTime.value[1] || ''
@@ -34,57 +36,23 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getenvironmentRecordList(listQuery.value).then((res) => {
+  getEnvironmentRecordList(listQuery.value).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
   })
   loadingTable.value = false
 }
 fetchData(true)
-const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref<TableColumn[]>([
-  {
-    text: '记录单号',
-    value: 'environmentCode',
-    align: 'center',
-  },
-  {
-    text: '房间号',
-    value: 'roomNumber',
-    align: 'center',
-  },
-  {
-    text: '记录人',
-    value: 'recorder',
-    align: 'center',
-  },
-  {
-    text: '记录时间',
-    value: 'recordTime',
-    width: '180',
-    align: 'center',
-  },
-  {
-    text: '温度(℃)',
-    value: 'temperature',
-    align: 'center',
-  },
-  {
-    text: '湿度(%)',
-    value: 'humidity',
-    align: 'center',
-  },
-  {
-    text: '输出电压(V)',
-    value: 'outputVoltage',
-    align: 'center',
-  },
-  {
-    text: '零地电压(V)',
-    value: 'zeroGroundVoltage',
-    align: 'center',
-  },
+  { text: '记录单号', value: 'environmentCode', align: 'center', width: '160' },
+  { text: '房间号', value: 'roomNumber', align: 'center' },
+  { text: '记录人', value: 'recorder', align: 'center' },
+  { text: '记录时间', value: 'recordTime', width: '180', align: 'center' },
+  { text: '温度(℃)', value: 'temperature', align: 'center' },
+  { text: '湿度(%)', value: 'humidity', align: 'center' },
+  { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
+  { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
 ])
 // 搜索
 const searchList = () => {
@@ -104,38 +72,44 @@
   trainTime.value = ''
   fetchData(true)
 }
+
 // 导出
-const exportExcelBtn = () => {
+const exportAll = () => {
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  // if (list.value.length > 0) {
-  // }
-  // else {
-  //   ElMessage.warning('无数据可导出数据')
-  // }
+  if (list.value.length > 0) {
+    const params = {
+      environmentCode: '', // 记录单编号
+      roomNumber: '', // 房间号
+      beginTime: '', // 记录开始时间
+      endTime: '', // 记录结束时间
+      offset: 1, // 当前页
+      limit: 20, // 多少条
+      ids: checkoutList.value,
+    }
+    exportEnvironmentRecord(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '环境记录单列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
   loading.close()
 }
-// 关闭编辑
-const close = () => {
-  show.value = true
-  fetchData(true)
-}
-// 点击编辑id和删除row类型
-interface rowReturn {
-  id: string
-  environmentCode: string
-}
+
 // 点击编辑/详情
-const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+const handleEdit = (row: IEnvironmental, pageType: 'edit' | 'detail') => {
   $router.push(`/lab/environmentalList/${pageType}/${row.id}`)
 }
+
 // 点击删除
-const handleDelete = (index: string, row: rowReturn) => {
+const handleDelete = (row: IEnvironmental) => {
   ElMessageBox.confirm(
-    `确认删除${row.environmentCode}吗？`,
+    `确认删除单号${row.environmentCode}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -144,12 +118,9 @@
     },
   )
     .then(() => {
-      getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
+      getEnvironmentRecordDelete({ id: row.id }).then((res) => {
         if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
+          ElMessage.success('已删除')
           fetchData(true)
         }
       })
@@ -160,14 +131,12 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
+
 // 点击新增
 const add = () => {
   $router.push('/lab/environmentalList/add')
 }
-// 点击导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -178,12 +147,12 @@
   }
   fetchData(true)
 }
-// 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([])
+
 // 获取下拉框数据
 getTypeSelect('roomNumber').then((res) => {
-  selectionList.value = res.data
+  roomNumberList.value = res.data
 })
+
 // 打印列表
 function printList() {
   // 打印列
@@ -225,7 +194,7 @@
           size="default"
         >
           <el-option
-            v-for="item in selectionList"
+            v-for="item in roomNumberList"
             :key="item.value"
             :label="item.name"
             :value="item.value"
@@ -238,7 +207,7 @@
           type="datetimerange"
           range-separator="到"
           format="YYYY-MM-DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="记录时间开始时间"
           end-placeholder="记录时间结束时间"
         />
@@ -247,21 +216,21 @@
     <table-container>
       <template #btns-right>
         <icon-button
-          v-if="proxy.hasPerm('/measure/train/plan/add')"
+          v-if="proxy.hasPerm('/lab/environmentalList/add')"
           icon="icon-add"
           title="新建"
           type="primary"
           @click="add"
         />
         <icon-button
-          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          v-if="proxy.hasPerm('/lab/environmentalList/export')"
           icon="icon-export"
           title="导出"
           type="primary"
           @click="exportAll"
         />
         <icon-button
-          v-if="proxy.hasPerm('/measure/train/plan/print')"
+          v-if="proxy.hasPerm('/lab/environmentalList/print')"
           icon="icon-print"
           title="打印"
           type="primary"
@@ -278,8 +247,15 @@
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="160">
+          <el-table-column label="操作" align="center" width="130" fixed="right">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/measure/train/plan/edit')"
@@ -303,7 +279,7 @@
                 size="small"
                 link
                 type="danger"
-                @click="handleDelete(row.$index, row)"
+                @click="handleDelete(row)"
               >
                 删除
               </el-button>
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 955af81..e1dc2a2 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -1,3 +1,13 @@
+// 查询参数
+export interface IListQuery {
+  environmentCode: string // 记录单编号
+  roomNumber: string // 房间号
+  beginTime: string // 记录开始时间
+  endTime: string // 记录结束时间
+  offset: number // 当前页
+  limit: number // 多少条
+}
+
 // 环境记录单list类型
 export interface IEnvironmental {
   environmentCode: string // 记录单编号
@@ -12,9 +22,27 @@
   createUser: string // 创建人
   id: string // 主键id
 }
+
 // 房间号模拟下拉框数据类型
-export interface selectionListItem {
+export interface IRoomNumber {
   value: string // 值
   name: string // lable
   id: string
 }
+
+// 环境记录单详情表单
+export interface IEnvironmentalDetail {
+  environmentCode: string // 环境记录单编号
+  roomNumber: string // 房间编号
+  recorder: string // 用户名
+  temperature: string // 温度
+  humidity: string // 湿度
+  outputVoltage: string // 输出电压
+  zeroGroundVoltage: string // 零地电压
+  remark: string // 备注
+  recordTime: string // 记录时间
+  createUser: string // 记录人id
+  createTime: string // 创建时间
+  id: string // 主键
+  updateTime: string // 更新时间
+}
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 98c4257..5105a76 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -294,6 +294,13 @@
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
           <el-table-column label="操作" align="center" width="130" fixed="right">
             <template #default="{ row }">
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index ae53f44..a0aee10 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -371,6 +371,13 @@
           :data="list" :total="total" :columns="columns" :query="listQuery"
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
         >
+          <template #preColumns>
+            <el-table-column label="序号" width="55" align="center">
+              <template #default="scope">
+                {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
           <template #columns>
             <el-table-column label="操作" align="center" :width="operationWidth">
               <template #default="{ row }">
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 21350ac..2ebcf8b 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -458,6 +458,13 @@
         :data="list" :total="total" :columns="currentMenu === '待收入' ? columnsTaking : columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
           <el-table-column
             label="操作" align="center" fixed="right" :width="currentMenu === '待收入' ? 270 : (currentMenu === '已收入' || currentMenu === '待归还') ? 210
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index ed11f7e..026fd77 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -87,7 +87,7 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
   { text: '外观', value: 'appearance', align: 'center' },
-  { text: '检定要求', value: 'measureRequire', align: 'center' },
+  { text: '检定要求', value: 'specialRequire', align: 'center' },
 ])
 
 // 签章查询数据
@@ -238,6 +238,10 @@
 // ------------------------样品-----------------------------
 // 点击批量增加
 const multiAdd = () => {
+  if (!dataForm.value.customerNo) {
+    ElMessage.warning('请先选择委托方')
+    return
+  }
   sampleVisible.value = true
 }
 // 修改委托方对话框显隐
@@ -318,6 +322,11 @@
   getAutographList()
 }
 
+// 表格双击行
+const rowDblclick = (row: ISampleList) => {
+  row.isEdit = true
+}
+
 onMounted(async () => {
   if (pageType.value === 'add') {
     dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
@@ -592,7 +601,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="24" class="marg">
+            <!-- <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="样品外观:">
                   <el-input
@@ -605,7 +614,7 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
+            </el-row> -->
             <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="依据文件:">
@@ -642,6 +651,7 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
+          @row-dblclick="rowDblclick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -653,7 +663,17 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          />
+          >
+            <template v-if="item.value === 'specialRequire' && (pageType === 'add' || pageType === 'edit')" #default="scope">
+              <el-input
+                v-if="scope.row.isEdit"
+                v-model="scope.row.specialRequire"
+                placeholder="请输入检定要求"
+                class="input"
+              />
+              <span v-else>{{ scope.row.specialRequire }}</span>
+            </template>
+          </el-table-column>
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index 3decec5..2d1c1ff 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -60,6 +60,7 @@
   appendixDescn: string // 附件说明
   appearance: string // 外观
   measureRequire: string // 检定要求
+  isEdit?: boolean // 是否可编辑
 }
 
 // 字典
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index b090632..7622ab0 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -326,6 +326,13 @@
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
           <el-table-column label="操作" align="center" fixed="right" width="170">
             <template #default="{ row }">
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 6dc9628..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" apply-type="1" />
+    <component :is="currentComp" :name="current" :type="type" apply-type="2" />
   </div>
 </template>
 

diff --git "a/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js" "b/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
index 4c9b127..633c7a9 100644
--- "a/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
+++ "b/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
@@ -11,6 +11,7 @@
       },
       "directorMaxLevel": 4,//审批主管最大层级
       "flowPermission": [],//发起人
+      "decisionItem": 1, //1同意驳回拒绝、2同意驳回、3拒绝
       "nodeConfig": {
           "nodeName": "发起人",//节点名称
           "type": 0,// 0 发起人 1审批 2抄送 3条件 4路由
diff --git a/src/api/business/environmentRecord/environmentRecord.ts b/src/api/business/environmentRecord/environmentRecord.ts
deleted file mode 100644
index 1a575eb..0000000
--- a/src/api/business/environmentRecord/environmentRecord.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import request from '../../index'
-
-// 环境记录单列表查询-分页
-export function getenvironmentRecordList(data: { offset: number; limit: number }) {
-  return request({
-    url: `/business/environmentRecord/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 环境记录单删除
-export function getenvironmentRecordDelete(data: object) {
-  return request({
-    url: '/business/environmentRecord/delete',
-    method: 'post',
-    data,
-  })
-}
-
-// 新增环境记录单
-export function getenvironmentRecordAdd(data: object) {
-  return request({
-    url: '/business/environmentRecord/add',
-    method: 'post',
-    data,
-  })
-}
-
-// 环境监测记录单-详情
-export function getenvironmentRecordDetail(data: object) {
-  return request({
-    url: '/business/environmentRecord/detail',
-    method: 'post',
-    data,
-  })
-}
-
-// 环境监测记录单-编辑
-export function getenvironmentRecordUpdate(data: object) {
-  return request({
-    url: '/business/environmentRecord/update',
-    method: 'post',
-    data,
-  })
-}
diff --git a/src/api/business/lab/environmentRecord.ts b/src/api/business/lab/environmentRecord.ts
new file mode 100644
index 0000000..f76a9ce
--- /dev/null
+++ b/src/api/business/lab/environmentRecord.ts
@@ -0,0 +1,58 @@
+import request from '../../index'
+import type { IEnvironmentalDetail, IListQuery } from '@/views/business/lab/environmental/environmentalList_interface'
+const prefix = '/business/environmentRecord'
+
+// 环境记录单列表查询-分页
+export function getEnvironmentRecordList(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 环境记录单删除
+export function getEnvironmentRecordDelete(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新增环境记录单
+export function getEnvironmentRecordAdd(data: IEnvironmentalDetail) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 环境监测记录单-详情
+export function getEnvironmentRecordDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 环境监测记录单-编辑
+export function getEnvironmentRecordUpdate(data: IEnvironmentalDetail) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportEnvironmentRecord(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/export`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index 47a713e..94a4246 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -17,6 +17,16 @@
     data,
   })
 }
+
+// 设备借用取消审批
+export function cancelApproval(data: { processInstanceId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
+
 // 设备借用申请详情
 export function detailApply(data: object) {
   return request({
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 9887075..8fa5759 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -1,15 +1,16 @@
-<script lang="ts" setup name="PlanAdd">
+<!-- 环境记录单详情 -->
+<script lang="ts" setup name="EnvironmentalList">
 import type { FormInstance } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
-import type { selectionListItem } from './environmentalList_interface'
+import type { IEnvironmentalDetail, IRoomNumber } from './environmentalList_interface'
 import { getTypeSelect } from '@/api/system/price'
-import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
+import { getEnvironmentRecordAdd, getEnvironmentRecordDetail, getEnvironmentRecordUpdate } from '@/api/business/lab/environmentRecord'
 import useUserStore from '@/store/modules/user'
+const { proxy } = getCurrentInstance() as any
 const infoId = ref('') // id
-const { name, id } = useUserStore()
+const { name, id } = useUserStore() // 用户名、id
 const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
@@ -23,7 +24,8 @@
     infoId.value = $route.params.id as string
   }
 }
-const formInline = ref({
+// 表单
+const formInline = ref<IEnvironmentalDetail>({
   environmentCode: '', // 环境记录单编号
   roomNumber: '', // 房间编号
   recorder: name || '', // 用户名
@@ -38,10 +40,10 @@
   id: '', // 主键
   updateTime: '', // 更新时间
 })
-const ruleFormRef = ref<FormInstance>()
+const ruleFormRef = ref<FormInstance>() // 表单ref
 
 // 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([])
+const selectionList = ref<IRoomNumber[]>([])
 // 获取下拉框数据
 getTypeSelect('roomNumber').then((res) => {
   selectionList.value = res.data
@@ -73,39 +75,38 @@
   $router.back()
 }
 
+// 获取详情信息
 if (infoId.value && infoId.value !== '') {
-  getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
+  getEnvironmentRecordDetail({ id: infoId.value }).then((res) => {
     if (res.code === 200) {
       formInline.value = res.data
     }
   })
 }
 // 点击保存
-const preserve = async (formEl: FormInstance | undefined) => {
-  if (!formEl) {
-    return
-  }
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      ElMessageBox.confirm('确认提交吗？', '提示', {
+      ElMessageBox.confirm('确认保存吗？', '提示', {
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         type: 'warning',
       }).then(() => {
-        // 是否是新增
+        // 新增
         if (pageType.value === 'add') {
-          getenvironmentRecordAdd(formInline.value).then((res) => {
+          getEnvironmentRecordAdd(formInline.value).then((res) => {
             if (res.code === 200) {
-              ElMessage.success('提交成功!')
+              ElMessage.success('保存成功!')
               close()
             }
           })
         }
-        // 是否是编辑
-        else {
-          getenvironmentRecordUpdate(formInline.value).then((res) => {
+        // 编辑
+        else if (pageType.value === 'edit') {
+          getEnvironmentRecordUpdate(formInline.value).then((res) => {
             if (res.code === 200) {
-              ElMessage.success('提交成功!')
+              ElMessage.success('保存成功!')
               close()
             }
           })
@@ -117,8 +118,8 @@
 // 打印
 const printObj = ref({
   id: 'form', // 需要打印元素的id
-  popTitle: '环境记录单模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '环境记录单详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>环境记录单详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
@@ -130,15 +131,17 @@
     <detail-page :title="`环境记录单-${textMap[pageType]}`">
       <template #btns>
         <el-button
-          v-if="pageType !== 'detail'"
+          v-if="proxy.hasPerm('/lab/environmentalList/add') && pageType !== 'detail'"
           type="primary"
-          @click="
-            preserve(ruleFormRef)
-          "
+          @click="saveForm(ruleFormRef)"
         >
-          提交
+          保存
         </el-button>
-        <el-button v-else v-print="printObj" type="primary">
+        <el-button
+          v-if="proxy.hasPerm('/lab/environmentalList/add') && pageType === 'detail'"
+          v-print="printObj"
+          type="primary"
+        >
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -199,7 +202,7 @@
                 type="datetime"
                 :placeholder="pageType === 'detail' ? '无' : '请选择记录时间'"
                 format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                value-format="YYYY-MM-DD HH:mm:ss"
                 clearable
                 :disabled="pageType === 'detail'"
               />
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 90110ee..63a0849 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -1,13 +1,18 @@
+<!-- 环境记录单列表 -->
 <script lang="ts" setup name="EnvironmentalList">
-import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
+import type { IEnvironmental, IListQuery, IRoomNumber } from './environmentalList_interface'
 import { getTypeSelect } from '@/api/system/price'
-import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
+import { exportEnvironmentRecord, getEnvironmentRecordDelete, getEnvironmentRecordList } from '@/api/business/lab/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-const listQuery = ref({
+import { exportFile } from '@/utils/exportUtils'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+
+// 查询参数
+const listQuery = ref<IListQuery>({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
   beginTime: '', // 记录开始时间
@@ -15,17 +20,14 @@
   offset: 1, // 当前页
   limit: 20, // 多少条
 })
-const checkoutList = ref<string[]>([])
-const list = ref<IEnvironmental[]>([])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+const list = ref<IEnvironmental[]>([]) // 表格参数
 const total = ref(0)
-const show = ref(true)
+const loadingTable = ref(false) // 表格loading
+const trainTime = ref('') // 记录时间数组
+const roomNumberList = ref<IRoomNumber[]>([]) // 房间号
 
-const loadingTable = ref(false)
-// 初始化路由
-// 培训时间数组
-const trainTime = ref('')
-
-const $router = useRouter()
+// 查询列表
 const fetchData = (isNowPage: boolean) => {
   listQuery.value.beginTime = trainTime.value[0] || ''
   listQuery.value.endTime = trainTime.value[1] || ''
@@ -34,57 +36,23 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getenvironmentRecordList(listQuery.value).then((res) => {
+  getEnvironmentRecordList(listQuery.value).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
   })
   loadingTable.value = false
 }
 fetchData(true)
-const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref<TableColumn[]>([
-  {
-    text: '记录单号',
-    value: 'environmentCode',
-    align: 'center',
-  },
-  {
-    text: '房间号',
-    value: 'roomNumber',
-    align: 'center',
-  },
-  {
-    text: '记录人',
-    value: 'recorder',
-    align: 'center',
-  },
-  {
-    text: '记录时间',
-    value: 'recordTime',
-    width: '180',
-    align: 'center',
-  },
-  {
-    text: '温度(℃)',
-    value: 'temperature',
-    align: 'center',
-  },
-  {
-    text: '湿度(%)',
-    value: 'humidity',
-    align: 'center',
-  },
-  {
-    text: '输出电压(V)',
-    value: 'outputVoltage',
-    align: 'center',
-  },
-  {
-    text: '零地电压(V)',
-    value: 'zeroGroundVoltage',
-    align: 'center',
-  },
+  { text: '记录单号', value: 'environmentCode', align: 'center', width: '160' },
+  { text: '房间号', value: 'roomNumber', align: 'center' },
+  { text: '记录人', value: 'recorder', align: 'center' },
+  { text: '记录时间', value: 'recordTime', width: '180', align: 'center' },
+  { text: '温度(℃)', value: 'temperature', align: 'center' },
+  { text: '湿度(%)', value: 'humidity', align: 'center' },
+  { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
+  { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
 ])
 // 搜索
 const searchList = () => {
@@ -104,38 +72,44 @@
   trainTime.value = ''
   fetchData(true)
 }
+
 // 导出
-const exportExcelBtn = () => {
+const exportAll = () => {
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  // if (list.value.length > 0) {
-  // }
-  // else {
-  //   ElMessage.warning('无数据可导出数据')
-  // }
+  if (list.value.length > 0) {
+    const params = {
+      environmentCode: '', // 记录单编号
+      roomNumber: '', // 房间号
+      beginTime: '', // 记录开始时间
+      endTime: '', // 记录结束时间
+      offset: 1, // 当前页
+      limit: 20, // 多少条
+      ids: checkoutList.value,
+    }
+    exportEnvironmentRecord(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '环境记录单列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
   loading.close()
 }
-// 关闭编辑
-const close = () => {
-  show.value = true
-  fetchData(true)
-}
-// 点击编辑id和删除row类型
-interface rowReturn {
-  id: string
-  environmentCode: string
-}
+
 // 点击编辑/详情
-const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+const handleEdit = (row: IEnvironmental, pageType: 'edit' | 'detail') => {
   $router.push(`/lab/environmentalList/${pageType}/${row.id}`)
 }
+
 // 点击删除
-const handleDelete = (index: string, row: rowReturn) => {
+const handleDelete = (row: IEnvironmental) => {
   ElMessageBox.confirm(
-    `确认删除${row.environmentCode}吗？`,
+    `确认删除单号${row.environmentCode}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -144,12 +118,9 @@
     },
   )
     .then(() => {
-      getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
+      getEnvironmentRecordDelete({ id: row.id }).then((res) => {
         if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
+          ElMessage.success('已删除')
           fetchData(true)
         }
       })
@@ -160,14 +131,12 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
+
 // 点击新增
 const add = () => {
   $router.push('/lab/environmentalList/add')
 }
-// 点击导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -178,12 +147,12 @@
   }
   fetchData(true)
 }
-// 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([])
+
 // 获取下拉框数据
 getTypeSelect('roomNumber').then((res) => {
-  selectionList.value = res.data
+  roomNumberList.value = res.data
 })
+
 // 打印列表
 function printList() {
   // 打印列
@@ -225,7 +194,7 @@
           size="default"
         >
           <el-option
-            v-for="item in selectionList"
+            v-for="item in roomNumberList"
             :key="item.value"
             :label="item.name"
             :value="item.value"
@@ -238,7 +207,7 @@
           type="datetimerange"
           range-separator="到"
           format="YYYY-MM-DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="记录时间开始时间"
           end-placeholder="记录时间结束时间"
         />
@@ -247,21 +216,21 @@
     <table-container>
       <template #btns-right>
         <icon-button
-          v-if="proxy.hasPerm('/measure/train/plan/add')"
+          v-if="proxy.hasPerm('/lab/environmentalList/add')"
           icon="icon-add"
           title="新建"
           type="primary"
           @click="add"
         />
         <icon-button
-          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          v-if="proxy.hasPerm('/lab/environmentalList/export')"
           icon="icon-export"
           title="导出"
           type="primary"
           @click="exportAll"
         />
         <icon-button
-          v-if="proxy.hasPerm('/measure/train/plan/print')"
+          v-if="proxy.hasPerm('/lab/environmentalList/print')"
           icon="icon-print"
           title="打印"
           type="primary"
@@ -278,8 +247,15 @@
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="160">
+          <el-table-column label="操作" align="center" width="130" fixed="right">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/measure/train/plan/edit')"
@@ -303,7 +279,7 @@
                 size="small"
                 link
                 type="danger"
-                @click="handleDelete(row.$index, row)"
+                @click="handleDelete(row)"
               >
                 删除
               </el-button>
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 955af81..e1dc2a2 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -1,3 +1,13 @@
+// 查询参数
+export interface IListQuery {
+  environmentCode: string // 记录单编号
+  roomNumber: string // 房间号
+  beginTime: string // 记录开始时间
+  endTime: string // 记录结束时间
+  offset: number // 当前页
+  limit: number // 多少条
+}
+
 // 环境记录单list类型
 export interface IEnvironmental {
   environmentCode: string // 记录单编号
@@ -12,9 +22,27 @@
   createUser: string // 创建人
   id: string // 主键id
 }
+
 // 房间号模拟下拉框数据类型
-export interface selectionListItem {
+export interface IRoomNumber {
   value: string // 值
   name: string // lable
   id: string
 }
+
+// 环境记录单详情表单
+export interface IEnvironmentalDetail {
+  environmentCode: string // 环境记录单编号
+  roomNumber: string // 房间编号
+  recorder: string // 用户名
+  temperature: string // 温度
+  humidity: string // 湿度
+  outputVoltage: string // 输出电压
+  zeroGroundVoltage: string // 零地电压
+  remark: string // 备注
+  recordTime: string // 记录时间
+  createUser: string // 记录人id
+  createTime: string // 创建时间
+  id: string // 主键
+  updateTime: string // 更新时间
+}
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 98c4257..5105a76 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -294,6 +294,13 @@
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
           <el-table-column label="操作" align="center" width="130" fixed="right">
             <template #default="{ row }">
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index ae53f44..a0aee10 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -371,6 +371,13 @@
           :data="list" :total="total" :columns="columns" :query="listQuery"
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
         >
+          <template #preColumns>
+            <el-table-column label="序号" width="55" align="center">
+              <template #default="scope">
+                {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
           <template #columns>
             <el-table-column label="操作" align="center" :width="operationWidth">
               <template #default="{ row }">
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 21350ac..2ebcf8b 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -458,6 +458,13 @@
         :data="list" :total="total" :columns="currentMenu === '待收入' ? columnsTaking : columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
           <el-table-column
             label="操作" align="center" fixed="right" :width="currentMenu === '待收入' ? 270 : (currentMenu === '已收入' || currentMenu === '待归还') ? 210
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index ed11f7e..026fd77 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -87,7 +87,7 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
   { text: '外观', value: 'appearance', align: 'center' },
-  { text: '检定要求', value: 'measureRequire', align: 'center' },
+  { text: '检定要求', value: 'specialRequire', align: 'center' },
 ])
 
 // 签章查询数据
@@ -238,6 +238,10 @@
 // ------------------------样品-----------------------------
 // 点击批量增加
 const multiAdd = () => {
+  if (!dataForm.value.customerNo) {
+    ElMessage.warning('请先选择委托方')
+    return
+  }
   sampleVisible.value = true
 }
 // 修改委托方对话框显隐
@@ -318,6 +322,11 @@
   getAutographList()
 }
 
+// 表格双击行
+const rowDblclick = (row: ISampleList) => {
+  row.isEdit = true
+}
+
 onMounted(async () => {
   if (pageType.value === 'add') {
     dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
@@ -592,7 +601,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="24" class="marg">
+            <!-- <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="样品外观:">
                   <el-input
@@ -605,7 +614,7 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
+            </el-row> -->
             <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="依据文件:">
@@ -642,6 +651,7 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
+          @row-dblclick="rowDblclick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -653,7 +663,17 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          />
+          >
+            <template v-if="item.value === 'specialRequire' && (pageType === 'add' || pageType === 'edit')" #default="scope">
+              <el-input
+                v-if="scope.row.isEdit"
+                v-model="scope.row.specialRequire"
+                placeholder="请输入检定要求"
+                class="input"
+              />
+              <span v-else>{{ scope.row.specialRequire }}</span>
+            </template>
+          </el-table-column>
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index 3decec5..2d1c1ff 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -60,6 +60,7 @@
   appendixDescn: string // 附件说明
   appearance: string // 外观
   measureRequire: string // 检定要求
+  isEdit?: boolean // 是否可编辑
 }
 
 // 字典
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index b090632..7622ab0 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -326,6 +326,13 @@
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
           <el-table-column label="操作" align="center" fixed="right" width="170">
             <template #default="{ row }">
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 6dc9628..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" apply-type="1" />
+    <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 b863728..c17034c 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -2,7 +2,10 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { borrowDeviceType } from '../borrow-interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import { deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
+import { cancelApproval, deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
+import {
+  submitReceiveApplyList,
+} from '@/api/device/receive'
 import type{ searchType } from '@/views/device/borrow/borrow-interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
@@ -36,7 +39,7 @@
   ids: [] as string[],
   limit: 20,
   offset: 1,
-  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+  formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
 }) // 查询参数
 watch(() => time.value, (newVal) => {
   if (newVal) {
@@ -252,6 +255,7 @@
     query: {
       title: '新建',
       name: '设备借用申请',
+      applyType: props.applyType,
     },
   })
 }
@@ -277,7 +281,6 @@
   exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '设备借用申请')
     loading.close()
-    // searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -333,7 +336,17 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
+  ).then((res) => {
+    cancelApproval({ processInstanceId: row.processId, comments: '' }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        getList()
+      }
+    })
+  })
 }
 // 提交
 const submit = (row: any) => {
@@ -346,11 +359,11 @@
       type: 'warning',
     },
   ).then((res) => {
-    submitApply({ id: row.id }).then((res) => {
+    submitReceiveApplyList({ formId: SCHEDULE.DEVICE_BORROW_APPROVAL, id: row.id }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
-          message: '提交',
+          message: '提交成功',
         })
         getList()
       }
@@ -468,7 +481,7 @@
                     拒绝
                   </el-button>
                 </temaplte>
-                <el-button size="small" type="primary" link @click="cancel(row)">
+                <el-button size="small" type="primary" link :disabled="!['2', '3'].includes(row.approvalStatus)" @click="cancel(row)">
                   取消
                 </el-button>
                 <el-button size="small" type="danger" link @click="remove(row)">

diff --git "a/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js" "b/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
index 4c9b127..633c7a9 100644
--- "a/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
+++ "b/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
@@ -11,6 +11,7 @@
       },
       "directorMaxLevel": 4,//审批主管最大层级
       "flowPermission": [],//发起人
+      "decisionItem": 1, //1同意驳回拒绝、2同意驳回、3拒绝
       "nodeConfig": {
           "nodeName": "发起人",//节点名称
           "type": 0,// 0 发起人 1审批 2抄送 3条件 4路由
diff --git a/src/api/business/environmentRecord/environmentRecord.ts b/src/api/business/environmentRecord/environmentRecord.ts
deleted file mode 100644
index 1a575eb..0000000
--- a/src/api/business/environmentRecord/environmentRecord.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import request from '../../index'
-
-// 环境记录单列表查询-分页
-export function getenvironmentRecordList(data: { offset: number; limit: number }) {
-  return request({
-    url: `/business/environmentRecord/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 环境记录单删除
-export function getenvironmentRecordDelete(data: object) {
-  return request({
-    url: '/business/environmentRecord/delete',
-    method: 'post',
-    data,
-  })
-}
-
-// 新增环境记录单
-export function getenvironmentRecordAdd(data: object) {
-  return request({
-    url: '/business/environmentRecord/add',
-    method: 'post',
-    data,
-  })
-}
-
-// 环境监测记录单-详情
-export function getenvironmentRecordDetail(data: object) {
-  return request({
-    url: '/business/environmentRecord/detail',
-    method: 'post',
-    data,
-  })
-}
-
-// 环境监测记录单-编辑
-export function getenvironmentRecordUpdate(data: object) {
-  return request({
-    url: '/business/environmentRecord/update',
-    method: 'post',
-    data,
-  })
-}
diff --git a/src/api/business/lab/environmentRecord.ts b/src/api/business/lab/environmentRecord.ts
new file mode 100644
index 0000000..f76a9ce
--- /dev/null
+++ b/src/api/business/lab/environmentRecord.ts
@@ -0,0 +1,58 @@
+import request from '../../index'
+import type { IEnvironmentalDetail, IListQuery } from '@/views/business/lab/environmental/environmentalList_interface'
+const prefix = '/business/environmentRecord'
+
+// 环境记录单列表查询-分页
+export function getEnvironmentRecordList(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 环境记录单删除
+export function getEnvironmentRecordDelete(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新增环境记录单
+export function getEnvironmentRecordAdd(data: IEnvironmentalDetail) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 环境监测记录单-详情
+export function getEnvironmentRecordDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 环境监测记录单-编辑
+export function getEnvironmentRecordUpdate(data: IEnvironmentalDetail) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportEnvironmentRecord(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/export`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index 47a713e..94a4246 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -17,6 +17,16 @@
     data,
   })
 }
+
+// 设备借用取消审批
+export function cancelApproval(data: { processInstanceId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
+
 // 设备借用申请详情
 export function detailApply(data: object) {
   return request({
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 9887075..8fa5759 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -1,15 +1,16 @@
-<script lang="ts" setup name="PlanAdd">
+<!-- 环境记录单详情 -->
+<script lang="ts" setup name="EnvironmentalList">
 import type { FormInstance } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
-import type { selectionListItem } from './environmentalList_interface'
+import type { IEnvironmentalDetail, IRoomNumber } from './environmentalList_interface'
 import { getTypeSelect } from '@/api/system/price'
-import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
+import { getEnvironmentRecordAdd, getEnvironmentRecordDetail, getEnvironmentRecordUpdate } from '@/api/business/lab/environmentRecord'
 import useUserStore from '@/store/modules/user'
+const { proxy } = getCurrentInstance() as any
 const infoId = ref('') // id
-const { name, id } = useUserStore()
+const { name, id } = useUserStore() // 用户名、id
 const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
@@ -23,7 +24,8 @@
     infoId.value = $route.params.id as string
   }
 }
-const formInline = ref({
+// 表单
+const formInline = ref<IEnvironmentalDetail>({
   environmentCode: '', // 环境记录单编号
   roomNumber: '', // 房间编号
   recorder: name || '', // 用户名
@@ -38,10 +40,10 @@
   id: '', // 主键
   updateTime: '', // 更新时间
 })
-const ruleFormRef = ref<FormInstance>()
+const ruleFormRef = ref<FormInstance>() // 表单ref
 
 // 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([])
+const selectionList = ref<IRoomNumber[]>([])
 // 获取下拉框数据
 getTypeSelect('roomNumber').then((res) => {
   selectionList.value = res.data
@@ -73,39 +75,38 @@
   $router.back()
 }
 
+// 获取详情信息
 if (infoId.value && infoId.value !== '') {
-  getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
+  getEnvironmentRecordDetail({ id: infoId.value }).then((res) => {
     if (res.code === 200) {
       formInline.value = res.data
     }
   })
 }
 // 点击保存
-const preserve = async (formEl: FormInstance | undefined) => {
-  if (!formEl) {
-    return
-  }
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      ElMessageBox.confirm('确认提交吗？', '提示', {
+      ElMessageBox.confirm('确认保存吗？', '提示', {
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         type: 'warning',
       }).then(() => {
-        // 是否是新增
+        // 新增
         if (pageType.value === 'add') {
-          getenvironmentRecordAdd(formInline.value).then((res) => {
+          getEnvironmentRecordAdd(formInline.value).then((res) => {
             if (res.code === 200) {
-              ElMessage.success('提交成功!')
+              ElMessage.success('保存成功!')
               close()
             }
           })
         }
-        // 是否是编辑
-        else {
-          getenvironmentRecordUpdate(formInline.value).then((res) => {
+        // 编辑
+        else if (pageType.value === 'edit') {
+          getEnvironmentRecordUpdate(formInline.value).then((res) => {
             if (res.code === 200) {
-              ElMessage.success('提交成功!')
+              ElMessage.success('保存成功!')
               close()
             }
           })
@@ -117,8 +118,8 @@
 // 打印
 const printObj = ref({
   id: 'form', // 需要打印元素的id
-  popTitle: '环境记录单模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '环境记录单详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>环境记录单详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
@@ -130,15 +131,17 @@
     <detail-page :title="`环境记录单-${textMap[pageType]}`">
       <template #btns>
         <el-button
-          v-if="pageType !== 'detail'"
+          v-if="proxy.hasPerm('/lab/environmentalList/add') && pageType !== 'detail'"
           type="primary"
-          @click="
-            preserve(ruleFormRef)
-          "
+          @click="saveForm(ruleFormRef)"
         >
-          提交
+          保存
         </el-button>
-        <el-button v-else v-print="printObj" type="primary">
+        <el-button
+          v-if="proxy.hasPerm('/lab/environmentalList/add') && pageType === 'detail'"
+          v-print="printObj"
+          type="primary"
+        >
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -199,7 +202,7 @@
                 type="datetime"
                 :placeholder="pageType === 'detail' ? '无' : '请选择记录时间'"
                 format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                value-format="YYYY-MM-DD HH:mm:ss"
                 clearable
                 :disabled="pageType === 'detail'"
               />
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 90110ee..63a0849 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -1,13 +1,18 @@
+<!-- 环境记录单列表 -->
 <script lang="ts" setup name="EnvironmentalList">
-import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
+import type { IEnvironmental, IListQuery, IRoomNumber } from './environmentalList_interface'
 import { getTypeSelect } from '@/api/system/price'
-import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
+import { exportEnvironmentRecord, getEnvironmentRecordDelete, getEnvironmentRecordList } from '@/api/business/lab/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-const listQuery = ref({
+import { exportFile } from '@/utils/exportUtils'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+
+// 查询参数
+const listQuery = ref<IListQuery>({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
   beginTime: '', // 记录开始时间
@@ -15,17 +20,14 @@
   offset: 1, // 当前页
   limit: 20, // 多少条
 })
-const checkoutList = ref<string[]>([])
-const list = ref<IEnvironmental[]>([])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+const list = ref<IEnvironmental[]>([]) // 表格参数
 const total = ref(0)
-const show = ref(true)
+const loadingTable = ref(false) // 表格loading
+const trainTime = ref('') // 记录时间数组
+const roomNumberList = ref<IRoomNumber[]>([]) // 房间号
 
-const loadingTable = ref(false)
-// 初始化路由
-// 培训时间数组
-const trainTime = ref('')
-
-const $router = useRouter()
+// 查询列表
 const fetchData = (isNowPage: boolean) => {
   listQuery.value.beginTime = trainTime.value[0] || ''
   listQuery.value.endTime = trainTime.value[1] || ''
@@ -34,57 +36,23 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getenvironmentRecordList(listQuery.value).then((res) => {
+  getEnvironmentRecordList(listQuery.value).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
   })
   loadingTable.value = false
 }
 fetchData(true)
-const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref<TableColumn[]>([
-  {
-    text: '记录单号',
-    value: 'environmentCode',
-    align: 'center',
-  },
-  {
-    text: '房间号',
-    value: 'roomNumber',
-    align: 'center',
-  },
-  {
-    text: '记录人',
-    value: 'recorder',
-    align: 'center',
-  },
-  {
-    text: '记录时间',
-    value: 'recordTime',
-    width: '180',
-    align: 'center',
-  },
-  {
-    text: '温度(℃)',
-    value: 'temperature',
-    align: 'center',
-  },
-  {
-    text: '湿度(%)',
-    value: 'humidity',
-    align: 'center',
-  },
-  {
-    text: '输出电压(V)',
-    value: 'outputVoltage',
-    align: 'center',
-  },
-  {
-    text: '零地电压(V)',
-    value: 'zeroGroundVoltage',
-    align: 'center',
-  },
+  { text: '记录单号', value: 'environmentCode', align: 'center', width: '160' },
+  { text: '房间号', value: 'roomNumber', align: 'center' },
+  { text: '记录人', value: 'recorder', align: 'center' },
+  { text: '记录时间', value: 'recordTime', width: '180', align: 'center' },
+  { text: '温度(℃)', value: 'temperature', align: 'center' },
+  { text: '湿度(%)', value: 'humidity', align: 'center' },
+  { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
+  { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
 ])
 // 搜索
 const searchList = () => {
@@ -104,38 +72,44 @@
   trainTime.value = ''
   fetchData(true)
 }
+
 // 导出
-const exportExcelBtn = () => {
+const exportAll = () => {
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  // if (list.value.length > 0) {
-  // }
-  // else {
-  //   ElMessage.warning('无数据可导出数据')
-  // }
+  if (list.value.length > 0) {
+    const params = {
+      environmentCode: '', // 记录单编号
+      roomNumber: '', // 房间号
+      beginTime: '', // 记录开始时间
+      endTime: '', // 记录结束时间
+      offset: 1, // 当前页
+      limit: 20, // 多少条
+      ids: checkoutList.value,
+    }
+    exportEnvironmentRecord(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '环境记录单列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
   loading.close()
 }
-// 关闭编辑
-const close = () => {
-  show.value = true
-  fetchData(true)
-}
-// 点击编辑id和删除row类型
-interface rowReturn {
-  id: string
-  environmentCode: string
-}
+
 // 点击编辑/详情
-const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+const handleEdit = (row: IEnvironmental, pageType: 'edit' | 'detail') => {
   $router.push(`/lab/environmentalList/${pageType}/${row.id}`)
 }
+
 // 点击删除
-const handleDelete = (index: string, row: rowReturn) => {
+const handleDelete = (row: IEnvironmental) => {
   ElMessageBox.confirm(
-    `确认删除${row.environmentCode}吗？`,
+    `确认删除单号${row.environmentCode}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -144,12 +118,9 @@
     },
   )
     .then(() => {
-      getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
+      getEnvironmentRecordDelete({ id: row.id }).then((res) => {
         if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
+          ElMessage.success('已删除')
           fetchData(true)
         }
       })
@@ -160,14 +131,12 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
+
 // 点击新增
 const add = () => {
   $router.push('/lab/environmentalList/add')
 }
-// 点击导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -178,12 +147,12 @@
   }
   fetchData(true)
 }
-// 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([])
+
 // 获取下拉框数据
 getTypeSelect('roomNumber').then((res) => {
-  selectionList.value = res.data
+  roomNumberList.value = res.data
 })
+
 // 打印列表
 function printList() {
   // 打印列
@@ -225,7 +194,7 @@
           size="default"
         >
           <el-option
-            v-for="item in selectionList"
+            v-for="item in roomNumberList"
             :key="item.value"
             :label="item.name"
             :value="item.value"
@@ -238,7 +207,7 @@
           type="datetimerange"
           range-separator="到"
           format="YYYY-MM-DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="记录时间开始时间"
           end-placeholder="记录时间结束时间"
         />
@@ -247,21 +216,21 @@
     <table-container>
       <template #btns-right>
         <icon-button
-          v-if="proxy.hasPerm('/measure/train/plan/add')"
+          v-if="proxy.hasPerm('/lab/environmentalList/add')"
           icon="icon-add"
           title="新建"
           type="primary"
           @click="add"
         />
         <icon-button
-          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          v-if="proxy.hasPerm('/lab/environmentalList/export')"
           icon="icon-export"
           title="导出"
           type="primary"
           @click="exportAll"
         />
         <icon-button
-          v-if="proxy.hasPerm('/measure/train/plan/print')"
+          v-if="proxy.hasPerm('/lab/environmentalList/print')"
           icon="icon-print"
           title="打印"
           type="primary"
@@ -278,8 +247,15 @@
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="160">
+          <el-table-column label="操作" align="center" width="130" fixed="right">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/measure/train/plan/edit')"
@@ -303,7 +279,7 @@
                 size="small"
                 link
                 type="danger"
-                @click="handleDelete(row.$index, row)"
+                @click="handleDelete(row)"
               >
                 删除
               </el-button>
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 955af81..e1dc2a2 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -1,3 +1,13 @@
+// 查询参数
+export interface IListQuery {
+  environmentCode: string // 记录单编号
+  roomNumber: string // 房间号
+  beginTime: string // 记录开始时间
+  endTime: string // 记录结束时间
+  offset: number // 当前页
+  limit: number // 多少条
+}
+
 // 环境记录单list类型
 export interface IEnvironmental {
   environmentCode: string // 记录单编号
@@ -12,9 +22,27 @@
   createUser: string // 创建人
   id: string // 主键id
 }
+
 // 房间号模拟下拉框数据类型
-export interface selectionListItem {
+export interface IRoomNumber {
   value: string // 值
   name: string // lable
   id: string
 }
+
+// 环境记录单详情表单
+export interface IEnvironmentalDetail {
+  environmentCode: string // 环境记录单编号
+  roomNumber: string // 房间编号
+  recorder: string // 用户名
+  temperature: string // 温度
+  humidity: string // 湿度
+  outputVoltage: string // 输出电压
+  zeroGroundVoltage: string // 零地电压
+  remark: string // 备注
+  recordTime: string // 记录时间
+  createUser: string // 记录人id
+  createTime: string // 创建时间
+  id: string // 主键
+  updateTime: string // 更新时间
+}
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 98c4257..5105a76 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -294,6 +294,13 @@
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
           <el-table-column label="操作" align="center" width="130" fixed="right">
             <template #default="{ row }">
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index ae53f44..a0aee10 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -371,6 +371,13 @@
           :data="list" :total="total" :columns="columns" :query="listQuery"
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
         >
+          <template #preColumns>
+            <el-table-column label="序号" width="55" align="center">
+              <template #default="scope">
+                {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
           <template #columns>
             <el-table-column label="操作" align="center" :width="operationWidth">
               <template #default="{ row }">
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 21350ac..2ebcf8b 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -458,6 +458,13 @@
         :data="list" :total="total" :columns="currentMenu === '待收入' ? columnsTaking : columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
           <el-table-column
             label="操作" align="center" fixed="right" :width="currentMenu === '待收入' ? 270 : (currentMenu === '已收入' || currentMenu === '待归还') ? 210
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index ed11f7e..026fd77 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -87,7 +87,7 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
   { text: '外观', value: 'appearance', align: 'center' },
-  { text: '检定要求', value: 'measureRequire', align: 'center' },
+  { text: '检定要求', value: 'specialRequire', align: 'center' },
 ])
 
 // 签章查询数据
@@ -238,6 +238,10 @@
 // ------------------------样品-----------------------------
 // 点击批量增加
 const multiAdd = () => {
+  if (!dataForm.value.customerNo) {
+    ElMessage.warning('请先选择委托方')
+    return
+  }
   sampleVisible.value = true
 }
 // 修改委托方对话框显隐
@@ -318,6 +322,11 @@
   getAutographList()
 }
 
+// 表格双击行
+const rowDblclick = (row: ISampleList) => {
+  row.isEdit = true
+}
+
 onMounted(async () => {
   if (pageType.value === 'add') {
     dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
@@ -592,7 +601,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="24" class="marg">
+            <!-- <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="样品外观:">
                   <el-input
@@ -605,7 +614,7 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
+            </el-row> -->
             <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="依据文件:">
@@ -642,6 +651,7 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
+          @row-dblclick="rowDblclick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -653,7 +663,17 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          />
+          >
+            <template v-if="item.value === 'specialRequire' && (pageType === 'add' || pageType === 'edit')" #default="scope">
+              <el-input
+                v-if="scope.row.isEdit"
+                v-model="scope.row.specialRequire"
+                placeholder="请输入检定要求"
+                class="input"
+              />
+              <span v-else>{{ scope.row.specialRequire }}</span>
+            </template>
+          </el-table-column>
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index 3decec5..2d1c1ff 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -60,6 +60,7 @@
   appendixDescn: string // 附件说明
   appearance: string // 外观
   measureRequire: string // 检定要求
+  isEdit?: boolean // 是否可编辑
 }
 
 // 字典
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index b090632..7622ab0 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -326,6 +326,13 @@
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
           <el-table-column label="操作" align="center" fixed="right" width="170">
             <template #default="{ row }">
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 6dc9628..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" apply-type="1" />
+    <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 b863728..c17034c 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -2,7 +2,10 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { borrowDeviceType } from '../borrow-interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import { deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
+import { cancelApproval, deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
+import {
+  submitReceiveApplyList,
+} from '@/api/device/receive'
 import type{ searchType } from '@/views/device/borrow/borrow-interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
@@ -36,7 +39,7 @@
   ids: [] as string[],
   limit: 20,
   offset: 1,
-  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+  formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
 }) // 查询参数
 watch(() => time.value, (newVal) => {
   if (newVal) {
@@ -252,6 +255,7 @@
     query: {
       title: '新建',
       name: '设备借用申请',
+      applyType: props.applyType,
     },
   })
 }
@@ -277,7 +281,6 @@
   exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '设备借用申请')
     loading.close()
-    // searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -333,7 +336,17 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
+  ).then((res) => {
+    cancelApproval({ processInstanceId: row.processId, comments: '' }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        getList()
+      }
+    })
+  })
 }
 // 提交
 const submit = (row: any) => {
@@ -346,11 +359,11 @@
       type: 'warning',
     },
   ).then((res) => {
-    submitApply({ id: row.id }).then((res) => {
+    submitReceiveApplyList({ formId: SCHEDULE.DEVICE_BORROW_APPROVAL, id: row.id }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
-          message: '提交',
+          message: '提交成功',
         })
         getList()
       }
@@ -468,7 +481,7 @@
                     拒绝
                   </el-button>
                 </temaplte>
-                <el-button size="small" type="primary" link @click="cancel(row)">
+                <el-button size="small" type="primary" link :disabled="!['2', '3'].includes(row.approvalStatus)" @click="cancel(row)">
                   取消
                 </el-button>
                 <el-button size="small" type="danger" link @click="remove(row)">
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index 293be0c..b277758 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -23,9 +23,9 @@
   applyNo: '', // 申请编号
   applyPerson: '', // 	申请人
   applyUnit: '', // 	申请单位
-  approvalStatus: '0', // 	审批状态
+  approvalStatus: '4', // 	审批状态
   createUser: '', // 	创建人
-  processResult: '', // 	处置结果
+  processResult: '0', // 	处置结果
   applyType: props.applyType,
   time: '', // 	申请日期
   ids: [] as string[],

diff --git "a/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js" "b/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
index 4c9b127..633c7a9 100644
--- "a/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
+++ "b/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
@@ -11,6 +11,7 @@
       },
       "directorMaxLevel": 4,//审批主管最大层级
       "flowPermission": [],//发起人
+      "decisionItem": 1, //1同意驳回拒绝、2同意驳回、3拒绝
       "nodeConfig": {
           "nodeName": "发起人",//节点名称
           "type": 0,// 0 发起人 1审批 2抄送 3条件 4路由
diff --git a/src/api/business/environmentRecord/environmentRecord.ts b/src/api/business/environmentRecord/environmentRecord.ts
deleted file mode 100644
index 1a575eb..0000000
--- a/src/api/business/environmentRecord/environmentRecord.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import request from '../../index'
-
-// 环境记录单列表查询-分页
-export function getenvironmentRecordList(data: { offset: number; limit: number }) {
-  return request({
-    url: `/business/environmentRecord/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 环境记录单删除
-export function getenvironmentRecordDelete(data: object) {
-  return request({
-    url: '/business/environmentRecord/delete',
-    method: 'post',
-    data,
-  })
-}
-
-// 新增环境记录单
-export function getenvironmentRecordAdd(data: object) {
-  return request({
-    url: '/business/environmentRecord/add',
-    method: 'post',
-    data,
-  })
-}
-
-// 环境监测记录单-详情
-export function getenvironmentRecordDetail(data: object) {
-  return request({
-    url: '/business/environmentRecord/detail',
-    method: 'post',
-    data,
-  })
-}
-
-// 环境监测记录单-编辑
-export function getenvironmentRecordUpdate(data: object) {
-  return request({
-    url: '/business/environmentRecord/update',
-    method: 'post',
-    data,
-  })
-}
diff --git a/src/api/business/lab/environmentRecord.ts b/src/api/business/lab/environmentRecord.ts
new file mode 100644
index 0000000..f76a9ce
--- /dev/null
+++ b/src/api/business/lab/environmentRecord.ts
@@ -0,0 +1,58 @@
+import request from '../../index'
+import type { IEnvironmentalDetail, IListQuery } from '@/views/business/lab/environmental/environmentalList_interface'
+const prefix = '/business/environmentRecord'
+
+// 环境记录单列表查询-分页
+export function getEnvironmentRecordList(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 环境记录单删除
+export function getEnvironmentRecordDelete(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新增环境记录单
+export function getEnvironmentRecordAdd(data: IEnvironmentalDetail) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 环境监测记录单-详情
+export function getEnvironmentRecordDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 环境监测记录单-编辑
+export function getEnvironmentRecordUpdate(data: IEnvironmentalDetail) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportEnvironmentRecord(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/export`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index 47a713e..94a4246 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -17,6 +17,16 @@
     data,
   })
 }
+
+// 设备借用取消审批
+export function cancelApproval(data: { processInstanceId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
+
 // 设备借用申请详情
 export function detailApply(data: object) {
   return request({
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 9887075..8fa5759 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -1,15 +1,16 @@
-<script lang="ts" setup name="PlanAdd">
+<!-- 环境记录单详情 -->
+<script lang="ts" setup name="EnvironmentalList">
 import type { FormInstance } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
-import type { selectionListItem } from './environmentalList_interface'
+import type { IEnvironmentalDetail, IRoomNumber } from './environmentalList_interface'
 import { getTypeSelect } from '@/api/system/price'
-import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
+import { getEnvironmentRecordAdd, getEnvironmentRecordDetail, getEnvironmentRecordUpdate } from '@/api/business/lab/environmentRecord'
 import useUserStore from '@/store/modules/user'
+const { proxy } = getCurrentInstance() as any
 const infoId = ref('') // id
-const { name, id } = useUserStore()
+const { name, id } = useUserStore() // 用户名、id
 const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
@@ -23,7 +24,8 @@
     infoId.value = $route.params.id as string
   }
 }
-const formInline = ref({
+// 表单
+const formInline = ref<IEnvironmentalDetail>({
   environmentCode: '', // 环境记录单编号
   roomNumber: '', // 房间编号
   recorder: name || '', // 用户名
@@ -38,10 +40,10 @@
   id: '', // 主键
   updateTime: '', // 更新时间
 })
-const ruleFormRef = ref<FormInstance>()
+const ruleFormRef = ref<FormInstance>() // 表单ref
 
 // 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([])
+const selectionList = ref<IRoomNumber[]>([])
 // 获取下拉框数据
 getTypeSelect('roomNumber').then((res) => {
   selectionList.value = res.data
@@ -73,39 +75,38 @@
   $router.back()
 }
 
+// 获取详情信息
 if (infoId.value && infoId.value !== '') {
-  getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
+  getEnvironmentRecordDetail({ id: infoId.value }).then((res) => {
     if (res.code === 200) {
       formInline.value = res.data
     }
   })
 }
 // 点击保存
-const preserve = async (formEl: FormInstance | undefined) => {
-  if (!formEl) {
-    return
-  }
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      ElMessageBox.confirm('确认提交吗？', '提示', {
+      ElMessageBox.confirm('确认保存吗？', '提示', {
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         type: 'warning',
       }).then(() => {
-        // 是否是新增
+        // 新增
         if (pageType.value === 'add') {
-          getenvironmentRecordAdd(formInline.value).then((res) => {
+          getEnvironmentRecordAdd(formInline.value).then((res) => {
             if (res.code === 200) {
-              ElMessage.success('提交成功!')
+              ElMessage.success('保存成功!')
               close()
             }
           })
         }
-        // 是否是编辑
-        else {
-          getenvironmentRecordUpdate(formInline.value).then((res) => {
+        // 编辑
+        else if (pageType.value === 'edit') {
+          getEnvironmentRecordUpdate(formInline.value).then((res) => {
             if (res.code === 200) {
-              ElMessage.success('提交成功!')
+              ElMessage.success('保存成功!')
               close()
             }
           })
@@ -117,8 +118,8 @@
 // 打印
 const printObj = ref({
   id: 'form', // 需要打印元素的id
-  popTitle: '环境记录单模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '环境记录单详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>环境记录单详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
@@ -130,15 +131,17 @@
     <detail-page :title="`环境记录单-${textMap[pageType]}`">
       <template #btns>
         <el-button
-          v-if="pageType !== 'detail'"
+          v-if="proxy.hasPerm('/lab/environmentalList/add') && pageType !== 'detail'"
           type="primary"
-          @click="
-            preserve(ruleFormRef)
-          "
+          @click="saveForm(ruleFormRef)"
         >
-          提交
+          保存
         </el-button>
-        <el-button v-else v-print="printObj" type="primary">
+        <el-button
+          v-if="proxy.hasPerm('/lab/environmentalList/add') && pageType === 'detail'"
+          v-print="printObj"
+          type="primary"
+        >
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -199,7 +202,7 @@
                 type="datetime"
                 :placeholder="pageType === 'detail' ? '无' : '请选择记录时间'"
                 format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                value-format="YYYY-MM-DD HH:mm:ss"
                 clearable
                 :disabled="pageType === 'detail'"
               />
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 90110ee..63a0849 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -1,13 +1,18 @@
+<!-- 环境记录单列表 -->
 <script lang="ts" setup name="EnvironmentalList">
-import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
+import type { IEnvironmental, IListQuery, IRoomNumber } from './environmentalList_interface'
 import { getTypeSelect } from '@/api/system/price'
-import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
+import { exportEnvironmentRecord, getEnvironmentRecordDelete, getEnvironmentRecordList } from '@/api/business/lab/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-const listQuery = ref({
+import { exportFile } from '@/utils/exportUtils'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+
+// 查询参数
+const listQuery = ref<IListQuery>({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
   beginTime: '', // 记录开始时间
@@ -15,17 +20,14 @@
   offset: 1, // 当前页
   limit: 20, // 多少条
 })
-const checkoutList = ref<string[]>([])
-const list = ref<IEnvironmental[]>([])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+const list = ref<IEnvironmental[]>([]) // 表格参数
 const total = ref(0)
-const show = ref(true)
+const loadingTable = ref(false) // 表格loading
+const trainTime = ref('') // 记录时间数组
+const roomNumberList = ref<IRoomNumber[]>([]) // 房间号
 
-const loadingTable = ref(false)
-// 初始化路由
-// 培训时间数组
-const trainTime = ref('')
-
-const $router = useRouter()
+// 查询列表
 const fetchData = (isNowPage: boolean) => {
   listQuery.value.beginTime = trainTime.value[0] || ''
   listQuery.value.endTime = trainTime.value[1] || ''
@@ -34,57 +36,23 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getenvironmentRecordList(listQuery.value).then((res) => {
+  getEnvironmentRecordList(listQuery.value).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
   })
   loadingTable.value = false
 }
 fetchData(true)
-const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref<TableColumn[]>([
-  {
-    text: '记录单号',
-    value: 'environmentCode',
-    align: 'center',
-  },
-  {
-    text: '房间号',
-    value: 'roomNumber',
-    align: 'center',
-  },
-  {
-    text: '记录人',
-    value: 'recorder',
-    align: 'center',
-  },
-  {
-    text: '记录时间',
-    value: 'recordTime',
-    width: '180',
-    align: 'center',
-  },
-  {
-    text: '温度(℃)',
-    value: 'temperature',
-    align: 'center',
-  },
-  {
-    text: '湿度(%)',
-    value: 'humidity',
-    align: 'center',
-  },
-  {
-    text: '输出电压(V)',
-    value: 'outputVoltage',
-    align: 'center',
-  },
-  {
-    text: '零地电压(V)',
-    value: 'zeroGroundVoltage',
-    align: 'center',
-  },
+  { text: '记录单号', value: 'environmentCode', align: 'center', width: '160' },
+  { text: '房间号', value: 'roomNumber', align: 'center' },
+  { text: '记录人', value: 'recorder', align: 'center' },
+  { text: '记录时间', value: 'recordTime', width: '180', align: 'center' },
+  { text: '温度(℃)', value: 'temperature', align: 'center' },
+  { text: '湿度(%)', value: 'humidity', align: 'center' },
+  { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
+  { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
 ])
 // 搜索
 const searchList = () => {
@@ -104,38 +72,44 @@
   trainTime.value = ''
   fetchData(true)
 }
+
 // 导出
-const exportExcelBtn = () => {
+const exportAll = () => {
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  // if (list.value.length > 0) {
-  // }
-  // else {
-  //   ElMessage.warning('无数据可导出数据')
-  // }
+  if (list.value.length > 0) {
+    const params = {
+      environmentCode: '', // 记录单编号
+      roomNumber: '', // 房间号
+      beginTime: '', // 记录开始时间
+      endTime: '', // 记录结束时间
+      offset: 1, // 当前页
+      limit: 20, // 多少条
+      ids: checkoutList.value,
+    }
+    exportEnvironmentRecord(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '环境记录单列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
   loading.close()
 }
-// 关闭编辑
-const close = () => {
-  show.value = true
-  fetchData(true)
-}
-// 点击编辑id和删除row类型
-interface rowReturn {
-  id: string
-  environmentCode: string
-}
+
 // 点击编辑/详情
-const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+const handleEdit = (row: IEnvironmental, pageType: 'edit' | 'detail') => {
   $router.push(`/lab/environmentalList/${pageType}/${row.id}`)
 }
+
 // 点击删除
-const handleDelete = (index: string, row: rowReturn) => {
+const handleDelete = (row: IEnvironmental) => {
   ElMessageBox.confirm(
-    `确认删除${row.environmentCode}吗？`,
+    `确认删除单号${row.environmentCode}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -144,12 +118,9 @@
     },
   )
     .then(() => {
-      getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
+      getEnvironmentRecordDelete({ id: row.id }).then((res) => {
         if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
+          ElMessage.success('已删除')
           fetchData(true)
         }
       })
@@ -160,14 +131,12 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
+
 // 点击新增
 const add = () => {
   $router.push('/lab/environmentalList/add')
 }
-// 点击导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -178,12 +147,12 @@
   }
   fetchData(true)
 }
-// 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([])
+
 // 获取下拉框数据
 getTypeSelect('roomNumber').then((res) => {
-  selectionList.value = res.data
+  roomNumberList.value = res.data
 })
+
 // 打印列表
 function printList() {
   // 打印列
@@ -225,7 +194,7 @@
           size="default"
         >
           <el-option
-            v-for="item in selectionList"
+            v-for="item in roomNumberList"
             :key="item.value"
             :label="item.name"
             :value="item.value"
@@ -238,7 +207,7 @@
           type="datetimerange"
           range-separator="到"
           format="YYYY-MM-DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="记录时间开始时间"
           end-placeholder="记录时间结束时间"
         />
@@ -247,21 +216,21 @@
     <table-container>
       <template #btns-right>
         <icon-button
-          v-if="proxy.hasPerm('/measure/train/plan/add')"
+          v-if="proxy.hasPerm('/lab/environmentalList/add')"
           icon="icon-add"
           title="新建"
           type="primary"
           @click="add"
         />
         <icon-button
-          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          v-if="proxy.hasPerm('/lab/environmentalList/export')"
           icon="icon-export"
           title="导出"
           type="primary"
           @click="exportAll"
         />
         <icon-button
-          v-if="proxy.hasPerm('/measure/train/plan/print')"
+          v-if="proxy.hasPerm('/lab/environmentalList/print')"
           icon="icon-print"
           title="打印"
           type="primary"
@@ -278,8 +247,15 @@
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="160">
+          <el-table-column label="操作" align="center" width="130" fixed="right">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/measure/train/plan/edit')"
@@ -303,7 +279,7 @@
                 size="small"
                 link
                 type="danger"
-                @click="handleDelete(row.$index, row)"
+                @click="handleDelete(row)"
               >
                 删除
               </el-button>
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 955af81..e1dc2a2 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -1,3 +1,13 @@
+// 查询参数
+export interface IListQuery {
+  environmentCode: string // 记录单编号
+  roomNumber: string // 房间号
+  beginTime: string // 记录开始时间
+  endTime: string // 记录结束时间
+  offset: number // 当前页
+  limit: number // 多少条
+}
+
 // 环境记录单list类型
 export interface IEnvironmental {
   environmentCode: string // 记录单编号
@@ -12,9 +22,27 @@
   createUser: string // 创建人
   id: string // 主键id
 }
+
 // 房间号模拟下拉框数据类型
-export interface selectionListItem {
+export interface IRoomNumber {
   value: string // 值
   name: string // lable
   id: string
 }
+
+// 环境记录单详情表单
+export interface IEnvironmentalDetail {
+  environmentCode: string // 环境记录单编号
+  roomNumber: string // 房间编号
+  recorder: string // 用户名
+  temperature: string // 温度
+  humidity: string // 湿度
+  outputVoltage: string // 输出电压
+  zeroGroundVoltage: string // 零地电压
+  remark: string // 备注
+  recordTime: string // 记录时间
+  createUser: string // 记录人id
+  createTime: string // 创建时间
+  id: string // 主键
+  updateTime: string // 更新时间
+}
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 98c4257..5105a76 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -294,6 +294,13 @@
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
           <el-table-column label="操作" align="center" width="130" fixed="right">
             <template #default="{ row }">
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index ae53f44..a0aee10 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -371,6 +371,13 @@
           :data="list" :total="total" :columns="columns" :query="listQuery"
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
         >
+          <template #preColumns>
+            <el-table-column label="序号" width="55" align="center">
+              <template #default="scope">
+                {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
           <template #columns>
             <el-table-column label="操作" align="center" :width="operationWidth">
               <template #default="{ row }">
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 21350ac..2ebcf8b 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -458,6 +458,13 @@
         :data="list" :total="total" :columns="currentMenu === '待收入' ? columnsTaking : columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
           <el-table-column
             label="操作" align="center" fixed="right" :width="currentMenu === '待收入' ? 270 : (currentMenu === '已收入' || currentMenu === '待归还') ? 210
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index ed11f7e..026fd77 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -87,7 +87,7 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
   { text: '外观', value: 'appearance', align: 'center' },
-  { text: '检定要求', value: 'measureRequire', align: 'center' },
+  { text: '检定要求', value: 'specialRequire', align: 'center' },
 ])
 
 // 签章查询数据
@@ -238,6 +238,10 @@
 // ------------------------样品-----------------------------
 // 点击批量增加
 const multiAdd = () => {
+  if (!dataForm.value.customerNo) {
+    ElMessage.warning('请先选择委托方')
+    return
+  }
   sampleVisible.value = true
 }
 // 修改委托方对话框显隐
@@ -318,6 +322,11 @@
   getAutographList()
 }
 
+// 表格双击行
+const rowDblclick = (row: ISampleList) => {
+  row.isEdit = true
+}
+
 onMounted(async () => {
   if (pageType.value === 'add') {
     dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
@@ -592,7 +601,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="24" class="marg">
+            <!-- <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="样品外观:">
                   <el-input
@@ -605,7 +614,7 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
+            </el-row> -->
             <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="依据文件:">
@@ -642,6 +651,7 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
+          @row-dblclick="rowDblclick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -653,7 +663,17 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          />
+          >
+            <template v-if="item.value === 'specialRequire' && (pageType === 'add' || pageType === 'edit')" #default="scope">
+              <el-input
+                v-if="scope.row.isEdit"
+                v-model="scope.row.specialRequire"
+                placeholder="请输入检定要求"
+                class="input"
+              />
+              <span v-else>{{ scope.row.specialRequire }}</span>
+            </template>
+          </el-table-column>
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index 3decec5..2d1c1ff 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -60,6 +60,7 @@
   appendixDescn: string // 附件说明
   appearance: string // 外观
   measureRequire: string // 检定要求
+  isEdit?: boolean // 是否可编辑
 }
 
 // 字典
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index b090632..7622ab0 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -326,6 +326,13 @@
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
           <el-table-column label="操作" align="center" fixed="right" width="170">
             <template #default="{ row }">
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 6dc9628..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" apply-type="1" />
+    <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 b863728..c17034c 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -2,7 +2,10 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { borrowDeviceType } from '../borrow-interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import { deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
+import { cancelApproval, deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
+import {
+  submitReceiveApplyList,
+} from '@/api/device/receive'
 import type{ searchType } from '@/views/device/borrow/borrow-interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
@@ -36,7 +39,7 @@
   ids: [] as string[],
   limit: 20,
   offset: 1,
-  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+  formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
 }) // 查询参数
 watch(() => time.value, (newVal) => {
   if (newVal) {
@@ -252,6 +255,7 @@
     query: {
       title: '新建',
       name: '设备借用申请',
+      applyType: props.applyType,
     },
   })
 }
@@ -277,7 +281,6 @@
   exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '设备借用申请')
     loading.close()
-    // searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -333,7 +336,17 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
+  ).then((res) => {
+    cancelApproval({ processInstanceId: row.processId, comments: '' }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        getList()
+      }
+    })
+  })
 }
 // 提交
 const submit = (row: any) => {
@@ -346,11 +359,11 @@
       type: 'warning',
     },
   ).then((res) => {
-    submitApply({ id: row.id }).then((res) => {
+    submitReceiveApplyList({ formId: SCHEDULE.DEVICE_BORROW_APPROVAL, id: row.id }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
-          message: '提交',
+          message: '提交成功',
         })
         getList()
       }
@@ -468,7 +481,7 @@
                     拒绝
                   </el-button>
                 </temaplte>
-                <el-button size="small" type="primary" link @click="cancel(row)">
+                <el-button size="small" type="primary" link :disabled="!['2', '3'].includes(row.approvalStatus)" @click="cancel(row)">
                   取消
                 </el-button>
                 <el-button size="small" type="danger" link @click="remove(row)">
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index 293be0c..b277758 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -23,9 +23,9 @@
   applyNo: '', // 申请编号
   applyPerson: '', // 	申请人
   applyUnit: '', // 	申请单位
-  approvalStatus: '0', // 	审批状态
+  approvalStatus: '4', // 	审批状态
   createUser: '', // 	创建人
-  processResult: '', // 	处置结果
+  processResult: '0', // 	处置结果
   applyType: props.applyType,
   time: '', // 	申请日期
   ids: [] as string[],
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 612b3b4..71c8ed8 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -4,8 +4,7 @@
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { useRouter } from 'vue-router'
-import type { IMenu } from '../receive'
-import type { IlistQuery, IlistType } from '@/views/device/receive/receive'
+import type { IlistQuery, IlistType, dictType } from '@/views/device/receive/receive'
 import ButtonBox from '@/components/buttonBox/buttonBox.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { exportFile } from '@/utils/exportUtils'
@@ -24,24 +23,19 @@
 import type { userType } from '@/views/system/user/user-interface'
 import type { deptType } from '@/views/device/standingBook/standingBook-interface'
 import { getUserList } from '@/api/system/user'
+import { getDictByCode } from '@/api/system/dict'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
 
+const { proxy } = getCurrentInstance() as any
 const loadingTable = ref(false) // 表格loading
 const active = ref('') // 选中的按钮
+const activeTitle = ref('') // active对应的审批状态名字
 const approvalDialog = ref() // 审批对话框显隐
 const useDeptList = ref<deptType[]>([]) // 部门列表
 const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
 const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
 const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
-
-const menu = ref<IMenu[]>([
-  { name: '全部', id: '0' },
-  { name: '草稿箱', id: '1' },
-  { name: '待审批', id: '2' },
-  { name: '审批中', id: '3' },
-  { name: '已通过', id: '4' },
-  { name: '未通过', id: '5' },
-  { name: '已取消', id: '6' },
-])
+const menu = ref<IMenu[]>([]) // 右上角审批状态按钮组合
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
   applyNo: '', // 申请编号
@@ -60,40 +54,17 @@
   offset: 1,
   limit: 20,
 })
-// 审批状态字典
-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 list = ref<IlistType[]>([])
-const { proxy } = getCurrentInstance() as any
-// 总数
-const total = ref(20)
+const approvalStatusMap = ref({}) as any// 审批状态字典{1：草稿箱}
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
+const list = ref<IlistType[]>([])// 表格数据
+const total = ref(20)// 页码总数
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '申请编号', value: 'applyNo', align: 'center' },
+  { text: '申请编号', value: 'applyNo', align: 'center', width: '180' },
   { text: '申请名称', value: 'applyName', align: 'center' },
   { text: '申请部门', value: 'applyUnitName', align: 'center' },
   { text: '申请人', value: 'applyPersonName', align: 'center' },
-  { text: '领用时间', value: 'time', align: 'center' },
+  { text: '领用时间', value: 'time', align: 'center', width: '160' },
   { text: '申请说明', value: 'applyDesc', align: 'center' },
   { text: '审批状态', value: 'approvalStatus', align: 'center' },
 ])
@@ -102,6 +73,33 @@
 // 筛选时间段数据
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {1：草稿箱}
+  res.data.forEach((item: any) => {
+    approvalStatusMap.value[`${item.value}`] = item.name
+  })
+
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+}
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -116,7 +114,7 @@
     list.value = response.data.rows.map((item: IlistType) => {
       return {
         ...item,
-        approvalStatus: approvalStatusMap[item.approvalStatus],
+        approvalStatus: approvalStatusMap.value[item.approvalStatus],
       }
     })
     total.value = parseInt(response.data.total)
@@ -317,9 +315,11 @@
     })
   }
 }
+
 // 按钮切换
 const changeCurrentButton = (val: string) => {
   active.value = val
+  activeTitle.value = menu.value.find(item => item.id === val)!.name
   window.sessionStorage.setItem('buttonBoxActive', val)
   clearList()
 }
@@ -362,20 +362,24 @@
   })
 }
 
-onMounted(() => {
-  if (window.sessionStorage.getItem('buttonBoxActive')) {
+onMounted(async () => {
+  await getDict() // 获取字典-审批状态
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
     active.value = window.sessionStorage.getItem('buttonBoxActive')!
   }
   else {
-    active.value = '0' // 全部
+    active.value = menu.value.find(item => item.name === '全部')!.id // 全部
+    activeTitle.value === '全部'
   }
   nextTick(() => {
     fetchData(true) // 获取表格数据
-    // 获取使用部门
     fetchDeptTreeList() // 获取使用部门
     fetchUserList() // 获取人员列表
   })
 })
+onUnmounted(() => {
+  window.sessionStorage.setItem('buttonBoxActive', '') // 清除
+})
 </script>
 
 <template>
@@ -446,7 +450,12 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="220" fixed="right">
+          <el-table-column
+            label="操作"
+            align="center"
+            :width="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 70 : 200"
+            fixed="right"
+          >
             <template #default="{ row }">
               <el-button
                 size="small"
@@ -457,37 +466,37 @@
                 查看
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (active === '0' || active === '2')"
+                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (activeTitle === '全部' || activeTitle === '待审批')"
                 size="small"
                 link
                 type="primary"
-                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 3"
                 @click="handleEdit(row, '同意')"
               >
                 同意
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (active === '0' || active === '2')"
+                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (activeTitle === '全部' || activeTitle === '待审批')"
                 size="small"
                 link
                 type="primary"
-                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 3"
                 @click="handleEdit(row, '驳回')"
               >
                 驳回
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (active === '0' || active === '2')"
+                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (activeTitle === '全部' || activeTitle === '待审批')"
                 size="small"
                 link
                 type="danger"
-                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 1 || row.decisionItem === 2"
                 @click="handleEdit(row, '拒绝')"
               >
                 拒绝
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
                 size="small"
                 link
                 type="primary"
@@ -496,7 +505,7 @@
                 编辑
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
                 size="small"
                 link
                 type="primary"
@@ -506,7 +515,7 @@
               </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (active === '0' || active === '3')"
+                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (activeTitle === '全部' || activeTitle === '审批中')"
                 size="small"
                 link
                 type="info"
@@ -517,7 +526,7 @@
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (active !== '4' && active !== '5')"
+                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (activeTitle !== '已通过' && activeTitle !== '未通过')"
                 size="small"
                 link
                 type="danger"

diff --git "a/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js" "b/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
index 4c9b127..633c7a9 100644
--- "a/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
+++ "b/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
@@ -11,6 +11,7 @@
       },
       "directorMaxLevel": 4,//审批主管最大层级
       "flowPermission": [],//发起人
+      "decisionItem": 1, //1同意驳回拒绝、2同意驳回、3拒绝
       "nodeConfig": {
           "nodeName": "发起人",//节点名称
           "type": 0,// 0 发起人 1审批 2抄送 3条件 4路由
diff --git a/src/api/business/environmentRecord/environmentRecord.ts b/src/api/business/environmentRecord/environmentRecord.ts
deleted file mode 100644
index 1a575eb..0000000
--- a/src/api/business/environmentRecord/environmentRecord.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import request from '../../index'
-
-// 环境记录单列表查询-分页
-export function getenvironmentRecordList(data: { offset: number; limit: number }) {
-  return request({
-    url: `/business/environmentRecord/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 环境记录单删除
-export function getenvironmentRecordDelete(data: object) {
-  return request({
-    url: '/business/environmentRecord/delete',
-    method: 'post',
-    data,
-  })
-}
-
-// 新增环境记录单
-export function getenvironmentRecordAdd(data: object) {
-  return request({
-    url: '/business/environmentRecord/add',
-    method: 'post',
-    data,
-  })
-}
-
-// 环境监测记录单-详情
-export function getenvironmentRecordDetail(data: object) {
-  return request({
-    url: '/business/environmentRecord/detail',
-    method: 'post',
-    data,
-  })
-}
-
-// 环境监测记录单-编辑
-export function getenvironmentRecordUpdate(data: object) {
-  return request({
-    url: '/business/environmentRecord/update',
-    method: 'post',
-    data,
-  })
-}
diff --git a/src/api/business/lab/environmentRecord.ts b/src/api/business/lab/environmentRecord.ts
new file mode 100644
index 0000000..f76a9ce
--- /dev/null
+++ b/src/api/business/lab/environmentRecord.ts
@@ -0,0 +1,58 @@
+import request from '../../index'
+import type { IEnvironmentalDetail, IListQuery } from '@/views/business/lab/environmental/environmentalList_interface'
+const prefix = '/business/environmentRecord'
+
+// 环境记录单列表查询-分页
+export function getEnvironmentRecordList(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 环境记录单删除
+export function getEnvironmentRecordDelete(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新增环境记录单
+export function getEnvironmentRecordAdd(data: IEnvironmentalDetail) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 环境监测记录单-详情
+export function getEnvironmentRecordDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 环境监测记录单-编辑
+export function getEnvironmentRecordUpdate(data: IEnvironmentalDetail) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportEnvironmentRecord(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/export`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index 47a713e..94a4246 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -17,6 +17,16 @@
     data,
   })
 }
+
+// 设备借用取消审批
+export function cancelApproval(data: { processInstanceId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
+
 // 设备借用申请详情
 export function detailApply(data: object) {
   return request({
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 9887075..8fa5759 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -1,15 +1,16 @@
-<script lang="ts" setup name="PlanAdd">
+<!-- 环境记录单详情 -->
+<script lang="ts" setup name="EnvironmentalList">
 import type { FormInstance } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
-import type { selectionListItem } from './environmentalList_interface'
+import type { IEnvironmentalDetail, IRoomNumber } from './environmentalList_interface'
 import { getTypeSelect } from '@/api/system/price'
-import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
+import { getEnvironmentRecordAdd, getEnvironmentRecordDetail, getEnvironmentRecordUpdate } from '@/api/business/lab/environmentRecord'
 import useUserStore from '@/store/modules/user'
+const { proxy } = getCurrentInstance() as any
 const infoId = ref('') // id
-const { name, id } = useUserStore()
+const { name, id } = useUserStore() // 用户名、id
 const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
@@ -23,7 +24,8 @@
     infoId.value = $route.params.id as string
   }
 }
-const formInline = ref({
+// 表单
+const formInline = ref<IEnvironmentalDetail>({
   environmentCode: '', // 环境记录单编号
   roomNumber: '', // 房间编号
   recorder: name || '', // 用户名
@@ -38,10 +40,10 @@
   id: '', // 主键
   updateTime: '', // 更新时间
 })
-const ruleFormRef = ref<FormInstance>()
+const ruleFormRef = ref<FormInstance>() // 表单ref
 
 // 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([])
+const selectionList = ref<IRoomNumber[]>([])
 // 获取下拉框数据
 getTypeSelect('roomNumber').then((res) => {
   selectionList.value = res.data
@@ -73,39 +75,38 @@
   $router.back()
 }
 
+// 获取详情信息
 if (infoId.value && infoId.value !== '') {
-  getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
+  getEnvironmentRecordDetail({ id: infoId.value }).then((res) => {
     if (res.code === 200) {
       formInline.value = res.data
     }
   })
 }
 // 点击保存
-const preserve = async (formEl: FormInstance | undefined) => {
-  if (!formEl) {
-    return
-  }
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      ElMessageBox.confirm('确认提交吗？', '提示', {
+      ElMessageBox.confirm('确认保存吗？', '提示', {
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         type: 'warning',
       }).then(() => {
-        // 是否是新增
+        // 新增
         if (pageType.value === 'add') {
-          getenvironmentRecordAdd(formInline.value).then((res) => {
+          getEnvironmentRecordAdd(formInline.value).then((res) => {
             if (res.code === 200) {
-              ElMessage.success('提交成功!')
+              ElMessage.success('保存成功!')
               close()
             }
           })
         }
-        // 是否是编辑
-        else {
-          getenvironmentRecordUpdate(formInline.value).then((res) => {
+        // 编辑
+        else if (pageType.value === 'edit') {
+          getEnvironmentRecordUpdate(formInline.value).then((res) => {
             if (res.code === 200) {
-              ElMessage.success('提交成功!')
+              ElMessage.success('保存成功!')
               close()
             }
           })
@@ -117,8 +118,8 @@
 // 打印
 const printObj = ref({
   id: 'form', // 需要打印元素的id
-  popTitle: '环境记录单模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '环境记录单详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>环境记录单详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
@@ -130,15 +131,17 @@
     <detail-page :title="`环境记录单-${textMap[pageType]}`">
       <template #btns>
         <el-button
-          v-if="pageType !== 'detail'"
+          v-if="proxy.hasPerm('/lab/environmentalList/add') && pageType !== 'detail'"
           type="primary"
-          @click="
-            preserve(ruleFormRef)
-          "
+          @click="saveForm(ruleFormRef)"
         >
-          提交
+          保存
         </el-button>
-        <el-button v-else v-print="printObj" type="primary">
+        <el-button
+          v-if="proxy.hasPerm('/lab/environmentalList/add') && pageType === 'detail'"
+          v-print="printObj"
+          type="primary"
+        >
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -199,7 +202,7 @@
                 type="datetime"
                 :placeholder="pageType === 'detail' ? '无' : '请选择记录时间'"
                 format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                value-format="YYYY-MM-DD HH:mm:ss"
                 clearable
                 :disabled="pageType === 'detail'"
               />
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 90110ee..63a0849 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -1,13 +1,18 @@
+<!-- 环境记录单列表 -->
 <script lang="ts" setup name="EnvironmentalList">
-import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
+import type { IEnvironmental, IListQuery, IRoomNumber } from './environmentalList_interface'
 import { getTypeSelect } from '@/api/system/price'
-import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
+import { exportEnvironmentRecord, getEnvironmentRecordDelete, getEnvironmentRecordList } from '@/api/business/lab/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-const listQuery = ref({
+import { exportFile } from '@/utils/exportUtils'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+
+// 查询参数
+const listQuery = ref<IListQuery>({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
   beginTime: '', // 记录开始时间
@@ -15,17 +20,14 @@
   offset: 1, // 当前页
   limit: 20, // 多少条
 })
-const checkoutList = ref<string[]>([])
-const list = ref<IEnvironmental[]>([])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+const list = ref<IEnvironmental[]>([]) // 表格参数
 const total = ref(0)
-const show = ref(true)
+const loadingTable = ref(false) // 表格loading
+const trainTime = ref('') // 记录时间数组
+const roomNumberList = ref<IRoomNumber[]>([]) // 房间号
 
-const loadingTable = ref(false)
-// 初始化路由
-// 培训时间数组
-const trainTime = ref('')
-
-const $router = useRouter()
+// 查询列表
 const fetchData = (isNowPage: boolean) => {
   listQuery.value.beginTime = trainTime.value[0] || ''
   listQuery.value.endTime = trainTime.value[1] || ''
@@ -34,57 +36,23 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getenvironmentRecordList(listQuery.value).then((res) => {
+  getEnvironmentRecordList(listQuery.value).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
   })
   loadingTable.value = false
 }
 fetchData(true)
-const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref<TableColumn[]>([
-  {
-    text: '记录单号',
-    value: 'environmentCode',
-    align: 'center',
-  },
-  {
-    text: '房间号',
-    value: 'roomNumber',
-    align: 'center',
-  },
-  {
-    text: '记录人',
-    value: 'recorder',
-    align: 'center',
-  },
-  {
-    text: '记录时间',
-    value: 'recordTime',
-    width: '180',
-    align: 'center',
-  },
-  {
-    text: '温度(℃)',
-    value: 'temperature',
-    align: 'center',
-  },
-  {
-    text: '湿度(%)',
-    value: 'humidity',
-    align: 'center',
-  },
-  {
-    text: '输出电压(V)',
-    value: 'outputVoltage',
-    align: 'center',
-  },
-  {
-    text: '零地电压(V)',
-    value: 'zeroGroundVoltage',
-    align: 'center',
-  },
+  { text: '记录单号', value: 'environmentCode', align: 'center', width: '160' },
+  { text: '房间号', value: 'roomNumber', align: 'center' },
+  { text: '记录人', value: 'recorder', align: 'center' },
+  { text: '记录时间', value: 'recordTime', width: '180', align: 'center' },
+  { text: '温度(℃)', value: 'temperature', align: 'center' },
+  { text: '湿度(%)', value: 'humidity', align: 'center' },
+  { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
+  { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
 ])
 // 搜索
 const searchList = () => {
@@ -104,38 +72,44 @@
   trainTime.value = ''
   fetchData(true)
 }
+
 // 导出
-const exportExcelBtn = () => {
+const exportAll = () => {
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  // if (list.value.length > 0) {
-  // }
-  // else {
-  //   ElMessage.warning('无数据可导出数据')
-  // }
+  if (list.value.length > 0) {
+    const params = {
+      environmentCode: '', // 记录单编号
+      roomNumber: '', // 房间号
+      beginTime: '', // 记录开始时间
+      endTime: '', // 记录结束时间
+      offset: 1, // 当前页
+      limit: 20, // 多少条
+      ids: checkoutList.value,
+    }
+    exportEnvironmentRecord(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '环境记录单列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
   loading.close()
 }
-// 关闭编辑
-const close = () => {
-  show.value = true
-  fetchData(true)
-}
-// 点击编辑id和删除row类型
-interface rowReturn {
-  id: string
-  environmentCode: string
-}
+
 // 点击编辑/详情
-const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+const handleEdit = (row: IEnvironmental, pageType: 'edit' | 'detail') => {
   $router.push(`/lab/environmentalList/${pageType}/${row.id}`)
 }
+
 // 点击删除
-const handleDelete = (index: string, row: rowReturn) => {
+const handleDelete = (row: IEnvironmental) => {
   ElMessageBox.confirm(
-    `确认删除${row.environmentCode}吗？`,
+    `确认删除单号${row.environmentCode}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -144,12 +118,9 @@
     },
   )
     .then(() => {
-      getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
+      getEnvironmentRecordDelete({ id: row.id }).then((res) => {
         if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
+          ElMessage.success('已删除')
           fetchData(true)
         }
       })
@@ -160,14 +131,12 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
+
 // 点击新增
 const add = () => {
   $router.push('/lab/environmentalList/add')
 }
-// 点击导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -178,12 +147,12 @@
   }
   fetchData(true)
 }
-// 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([])
+
 // 获取下拉框数据
 getTypeSelect('roomNumber').then((res) => {
-  selectionList.value = res.data
+  roomNumberList.value = res.data
 })
+
 // 打印列表
 function printList() {
   // 打印列
@@ -225,7 +194,7 @@
           size="default"
         >
           <el-option
-            v-for="item in selectionList"
+            v-for="item in roomNumberList"
             :key="item.value"
             :label="item.name"
             :value="item.value"
@@ -238,7 +207,7 @@
           type="datetimerange"
           range-separator="到"
           format="YYYY-MM-DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="记录时间开始时间"
           end-placeholder="记录时间结束时间"
         />
@@ -247,21 +216,21 @@
     <table-container>
       <template #btns-right>
         <icon-button
-          v-if="proxy.hasPerm('/measure/train/plan/add')"
+          v-if="proxy.hasPerm('/lab/environmentalList/add')"
           icon="icon-add"
           title="新建"
           type="primary"
           @click="add"
         />
         <icon-button
-          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          v-if="proxy.hasPerm('/lab/environmentalList/export')"
           icon="icon-export"
           title="导出"
           type="primary"
           @click="exportAll"
         />
         <icon-button
-          v-if="proxy.hasPerm('/measure/train/plan/print')"
+          v-if="proxy.hasPerm('/lab/environmentalList/print')"
           icon="icon-print"
           title="打印"
           type="primary"
@@ -278,8 +247,15 @@
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="160">
+          <el-table-column label="操作" align="center" width="130" fixed="right">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/measure/train/plan/edit')"
@@ -303,7 +279,7 @@
                 size="small"
                 link
                 type="danger"
-                @click="handleDelete(row.$index, row)"
+                @click="handleDelete(row)"
               >
                 删除
               </el-button>
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 955af81..e1dc2a2 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -1,3 +1,13 @@
+// 查询参数
+export interface IListQuery {
+  environmentCode: string // 记录单编号
+  roomNumber: string // 房间号
+  beginTime: string // 记录开始时间
+  endTime: string // 记录结束时间
+  offset: number // 当前页
+  limit: number // 多少条
+}
+
 // 环境记录单list类型
 export interface IEnvironmental {
   environmentCode: string // 记录单编号
@@ -12,9 +22,27 @@
   createUser: string // 创建人
   id: string // 主键id
 }
+
 // 房间号模拟下拉框数据类型
-export interface selectionListItem {
+export interface IRoomNumber {
   value: string // 值
   name: string // lable
   id: string
 }
+
+// 环境记录单详情表单
+export interface IEnvironmentalDetail {
+  environmentCode: string // 环境记录单编号
+  roomNumber: string // 房间编号
+  recorder: string // 用户名
+  temperature: string // 温度
+  humidity: string // 湿度
+  outputVoltage: string // 输出电压
+  zeroGroundVoltage: string // 零地电压
+  remark: string // 备注
+  recordTime: string // 记录时间
+  createUser: string // 记录人id
+  createTime: string // 创建时间
+  id: string // 主键
+  updateTime: string // 更新时间
+}
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 98c4257..5105a76 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -294,6 +294,13 @@
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
           <el-table-column label="操作" align="center" width="130" fixed="right">
             <template #default="{ row }">
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index ae53f44..a0aee10 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -371,6 +371,13 @@
           :data="list" :total="total" :columns="columns" :query="listQuery"
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
         >
+          <template #preColumns>
+            <el-table-column label="序号" width="55" align="center">
+              <template #default="scope">
+                {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
           <template #columns>
             <el-table-column label="操作" align="center" :width="operationWidth">
               <template #default="{ row }">
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 21350ac..2ebcf8b 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -458,6 +458,13 @@
         :data="list" :total="total" :columns="currentMenu === '待收入' ? columnsTaking : columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
           <el-table-column
             label="操作" align="center" fixed="right" :width="currentMenu === '待收入' ? 270 : (currentMenu === '已收入' || currentMenu === '待归还') ? 210
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index ed11f7e..026fd77 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -87,7 +87,7 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
   { text: '外观', value: 'appearance', align: 'center' },
-  { text: '检定要求', value: 'measureRequire', align: 'center' },
+  { text: '检定要求', value: 'specialRequire', align: 'center' },
 ])
 
 // 签章查询数据
@@ -238,6 +238,10 @@
 // ------------------------样品-----------------------------
 // 点击批量增加
 const multiAdd = () => {
+  if (!dataForm.value.customerNo) {
+    ElMessage.warning('请先选择委托方')
+    return
+  }
   sampleVisible.value = true
 }
 // 修改委托方对话框显隐
@@ -318,6 +322,11 @@
   getAutographList()
 }
 
+// 表格双击行
+const rowDblclick = (row: ISampleList) => {
+  row.isEdit = true
+}
+
 onMounted(async () => {
   if (pageType.value === 'add') {
     dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
@@ -592,7 +601,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="24" class="marg">
+            <!-- <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="样品外观:">
                   <el-input
@@ -605,7 +614,7 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
+            </el-row> -->
             <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="依据文件:">
@@ -642,6 +651,7 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
+          @row-dblclick="rowDblclick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -653,7 +663,17 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          />
+          >
+            <template v-if="item.value === 'specialRequire' && (pageType === 'add' || pageType === 'edit')" #default="scope">
+              <el-input
+                v-if="scope.row.isEdit"
+                v-model="scope.row.specialRequire"
+                placeholder="请输入检定要求"
+                class="input"
+              />
+              <span v-else>{{ scope.row.specialRequire }}</span>
+            </template>
+          </el-table-column>
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index 3decec5..2d1c1ff 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -60,6 +60,7 @@
   appendixDescn: string // 附件说明
   appearance: string // 外观
   measureRequire: string // 检定要求
+  isEdit?: boolean // 是否可编辑
 }
 
 // 字典
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index b090632..7622ab0 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -326,6 +326,13 @@
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
           <el-table-column label="操作" align="center" fixed="right" width="170">
             <template #default="{ row }">
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 6dc9628..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" apply-type="1" />
+    <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 b863728..c17034c 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -2,7 +2,10 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { borrowDeviceType } from '../borrow-interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import { deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
+import { cancelApproval, deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
+import {
+  submitReceiveApplyList,
+} from '@/api/device/receive'
 import type{ searchType } from '@/views/device/borrow/borrow-interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
@@ -36,7 +39,7 @@
   ids: [] as string[],
   limit: 20,
   offset: 1,
-  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+  formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
 }) // 查询参数
 watch(() => time.value, (newVal) => {
   if (newVal) {
@@ -252,6 +255,7 @@
     query: {
       title: '新建',
       name: '设备借用申请',
+      applyType: props.applyType,
     },
   })
 }
@@ -277,7 +281,6 @@
   exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '设备借用申请')
     loading.close()
-    // searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -333,7 +336,17 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
+  ).then((res) => {
+    cancelApproval({ processInstanceId: row.processId, comments: '' }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        getList()
+      }
+    })
+  })
 }
 // 提交
 const submit = (row: any) => {
@@ -346,11 +359,11 @@
       type: 'warning',
     },
   ).then((res) => {
-    submitApply({ id: row.id }).then((res) => {
+    submitReceiveApplyList({ formId: SCHEDULE.DEVICE_BORROW_APPROVAL, id: row.id }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
-          message: '提交',
+          message: '提交成功',
         })
         getList()
       }
@@ -468,7 +481,7 @@
                     拒绝
                   </el-button>
                 </temaplte>
-                <el-button size="small" type="primary" link @click="cancel(row)">
+                <el-button size="small" type="primary" link :disabled="!['2', '3'].includes(row.approvalStatus)" @click="cancel(row)">
                   取消
                 </el-button>
                 <el-button size="small" type="danger" link @click="remove(row)">
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index 293be0c..b277758 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -23,9 +23,9 @@
   applyNo: '', // 申请编号
   applyPerson: '', // 	申请人
   applyUnit: '', // 	申请单位
-  approvalStatus: '0', // 	审批状态
+  approvalStatus: '4', // 	审批状态
   createUser: '', // 	创建人
-  processResult: '', // 	处置结果
+  processResult: '0', // 	处置结果
   applyType: props.applyType,
   time: '', // 	申请日期
   ids: [] as string[],
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 612b3b4..71c8ed8 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -4,8 +4,7 @@
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { useRouter } from 'vue-router'
-import type { IMenu } from '../receive'
-import type { IlistQuery, IlistType } from '@/views/device/receive/receive'
+import type { IlistQuery, IlistType, dictType } from '@/views/device/receive/receive'
 import ButtonBox from '@/components/buttonBox/buttonBox.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { exportFile } from '@/utils/exportUtils'
@@ -24,24 +23,19 @@
 import type { userType } from '@/views/system/user/user-interface'
 import type { deptType } from '@/views/device/standingBook/standingBook-interface'
 import { getUserList } from '@/api/system/user'
+import { getDictByCode } from '@/api/system/dict'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
 
+const { proxy } = getCurrentInstance() as any
 const loadingTable = ref(false) // 表格loading
 const active = ref('') // 选中的按钮
+const activeTitle = ref('') // active对应的审批状态名字
 const approvalDialog = ref() // 审批对话框显隐
 const useDeptList = ref<deptType[]>([]) // 部门列表
 const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
 const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
 const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
-
-const menu = ref<IMenu[]>([
-  { name: '全部', id: '0' },
-  { name: '草稿箱', id: '1' },
-  { name: '待审批', id: '2' },
-  { name: '审批中', id: '3' },
-  { name: '已通过', id: '4' },
-  { name: '未通过', id: '5' },
-  { name: '已取消', id: '6' },
-])
+const menu = ref<IMenu[]>([]) // 右上角审批状态按钮组合
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
   applyNo: '', // 申请编号
@@ -60,40 +54,17 @@
   offset: 1,
   limit: 20,
 })
-// 审批状态字典
-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 list = ref<IlistType[]>([])
-const { proxy } = getCurrentInstance() as any
-// 总数
-const total = ref(20)
+const approvalStatusMap = ref({}) as any// 审批状态字典{1：草稿箱}
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
+const list = ref<IlistType[]>([])// 表格数据
+const total = ref(20)// 页码总数
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '申请编号', value: 'applyNo', align: 'center' },
+  { text: '申请编号', value: 'applyNo', align: 'center', width: '180' },
   { text: '申请名称', value: 'applyName', align: 'center' },
   { text: '申请部门', value: 'applyUnitName', align: 'center' },
   { text: '申请人', value: 'applyPersonName', align: 'center' },
-  { text: '领用时间', value: 'time', align: 'center' },
+  { text: '领用时间', value: 'time', align: 'center', width: '160' },
   { text: '申请说明', value: 'applyDesc', align: 'center' },
   { text: '审批状态', value: 'approvalStatus', align: 'center' },
 ])
@@ -102,6 +73,33 @@
 // 筛选时间段数据
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {1：草稿箱}
+  res.data.forEach((item: any) => {
+    approvalStatusMap.value[`${item.value}`] = item.name
+  })
+
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+}
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -116,7 +114,7 @@
     list.value = response.data.rows.map((item: IlistType) => {
       return {
         ...item,
-        approvalStatus: approvalStatusMap[item.approvalStatus],
+        approvalStatus: approvalStatusMap.value[item.approvalStatus],
       }
     })
     total.value = parseInt(response.data.total)
@@ -317,9 +315,11 @@
     })
   }
 }
+
 // 按钮切换
 const changeCurrentButton = (val: string) => {
   active.value = val
+  activeTitle.value = menu.value.find(item => item.id === val)!.name
   window.sessionStorage.setItem('buttonBoxActive', val)
   clearList()
 }
@@ -362,20 +362,24 @@
   })
 }
 
-onMounted(() => {
-  if (window.sessionStorage.getItem('buttonBoxActive')) {
+onMounted(async () => {
+  await getDict() // 获取字典-审批状态
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
     active.value = window.sessionStorage.getItem('buttonBoxActive')!
   }
   else {
-    active.value = '0' // 全部
+    active.value = menu.value.find(item => item.name === '全部')!.id // 全部
+    activeTitle.value === '全部'
   }
   nextTick(() => {
     fetchData(true) // 获取表格数据
-    // 获取使用部门
     fetchDeptTreeList() // 获取使用部门
     fetchUserList() // 获取人员列表
   })
 })
+onUnmounted(() => {
+  window.sessionStorage.setItem('buttonBoxActive', '') // 清除
+})
 </script>
 
 <template>
@@ -446,7 +450,12 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="220" fixed="right">
+          <el-table-column
+            label="操作"
+            align="center"
+            :width="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 70 : 200"
+            fixed="right"
+          >
             <template #default="{ row }">
               <el-button
                 size="small"
@@ -457,37 +466,37 @@
                 查看
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (active === '0' || active === '2')"
+                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (activeTitle === '全部' || activeTitle === '待审批')"
                 size="small"
                 link
                 type="primary"
-                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 3"
                 @click="handleEdit(row, '同意')"
               >
                 同意
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (active === '0' || active === '2')"
+                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (activeTitle === '全部' || activeTitle === '待审批')"
                 size="small"
                 link
                 type="primary"
-                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 3"
                 @click="handleEdit(row, '驳回')"
               >
                 驳回
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (active === '0' || active === '2')"
+                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (activeTitle === '全部' || activeTitle === '待审批')"
                 size="small"
                 link
                 type="danger"
-                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 1 || row.decisionItem === 2"
                 @click="handleEdit(row, '拒绝')"
               >
                 拒绝
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
                 size="small"
                 link
                 type="primary"
@@ -496,7 +505,7 @@
                 编辑
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
                 size="small"
                 link
                 type="primary"
@@ -506,7 +515,7 @@
               </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (active === '0' || active === '3')"
+                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (activeTitle === '全部' || activeTitle === '审批中')"
                 size="small"
                 link
                 type="info"
@@ -517,7 +526,7 @@
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (active !== '4' && active !== '5')"
+                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (activeTitle !== '已通过' && activeTitle !== '未通过')"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/receive/receive.ts b/src/views/device/receive/receive.ts
index ce3b533..d4ac6a6 100644
--- a/src/views/device/receive/receive.ts
+++ b/src/views/device/receive/receive.ts
@@ -83,3 +83,11 @@
   validDate: string // 有效日期
 }
 
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
+

diff --git "a/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js" "b/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
index 4c9b127..633c7a9 100644
--- "a/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
+++ "b/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
@@ -11,6 +11,7 @@
       },
       "directorMaxLevel": 4,//审批主管最大层级
       "flowPermission": [],//发起人
+      "decisionItem": 1, //1同意驳回拒绝、2同意驳回、3拒绝
       "nodeConfig": {
           "nodeName": "发起人",//节点名称
           "type": 0,// 0 发起人 1审批 2抄送 3条件 4路由
diff --git a/src/api/business/environmentRecord/environmentRecord.ts b/src/api/business/environmentRecord/environmentRecord.ts
deleted file mode 100644
index 1a575eb..0000000
--- a/src/api/business/environmentRecord/environmentRecord.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import request from '../../index'
-
-// 环境记录单列表查询-分页
-export function getenvironmentRecordList(data: { offset: number; limit: number }) {
-  return request({
-    url: `/business/environmentRecord/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 环境记录单删除
-export function getenvironmentRecordDelete(data: object) {
-  return request({
-    url: '/business/environmentRecord/delete',
-    method: 'post',
-    data,
-  })
-}
-
-// 新增环境记录单
-export function getenvironmentRecordAdd(data: object) {
-  return request({
-    url: '/business/environmentRecord/add',
-    method: 'post',
-    data,
-  })
-}
-
-// 环境监测记录单-详情
-export function getenvironmentRecordDetail(data: object) {
-  return request({
-    url: '/business/environmentRecord/detail',
-    method: 'post',
-    data,
-  })
-}
-
-// 环境监测记录单-编辑
-export function getenvironmentRecordUpdate(data: object) {
-  return request({
-    url: '/business/environmentRecord/update',
-    method: 'post',
-    data,
-  })
-}
diff --git a/src/api/business/lab/environmentRecord.ts b/src/api/business/lab/environmentRecord.ts
new file mode 100644
index 0000000..f76a9ce
--- /dev/null
+++ b/src/api/business/lab/environmentRecord.ts
@@ -0,0 +1,58 @@
+import request from '../../index'
+import type { IEnvironmentalDetail, IListQuery } from '@/views/business/lab/environmental/environmentalList_interface'
+const prefix = '/business/environmentRecord'
+
+// 环境记录单列表查询-分页
+export function getEnvironmentRecordList(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 环境记录单删除
+export function getEnvironmentRecordDelete(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新增环境记录单
+export function getEnvironmentRecordAdd(data: IEnvironmentalDetail) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 环境监测记录单-详情
+export function getEnvironmentRecordDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 环境监测记录单-编辑
+export function getEnvironmentRecordUpdate(data: IEnvironmentalDetail) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportEnvironmentRecord(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/export`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index 47a713e..94a4246 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -17,6 +17,16 @@
     data,
   })
 }
+
+// 设备借用取消审批
+export function cancelApproval(data: { processInstanceId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
+
 // 设备借用申请详情
 export function detailApply(data: object) {
   return request({
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 9887075..8fa5759 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -1,15 +1,16 @@
-<script lang="ts" setup name="PlanAdd">
+<!-- 环境记录单详情 -->
+<script lang="ts" setup name="EnvironmentalList">
 import type { FormInstance } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
-import type { selectionListItem } from './environmentalList_interface'
+import type { IEnvironmentalDetail, IRoomNumber } from './environmentalList_interface'
 import { getTypeSelect } from '@/api/system/price'
-import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
+import { getEnvironmentRecordAdd, getEnvironmentRecordDetail, getEnvironmentRecordUpdate } from '@/api/business/lab/environmentRecord'
 import useUserStore from '@/store/modules/user'
+const { proxy } = getCurrentInstance() as any
 const infoId = ref('') // id
-const { name, id } = useUserStore()
+const { name, id } = useUserStore() // 用户名、id
 const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
@@ -23,7 +24,8 @@
     infoId.value = $route.params.id as string
   }
 }
-const formInline = ref({
+// 表单
+const formInline = ref<IEnvironmentalDetail>({
   environmentCode: '', // 环境记录单编号
   roomNumber: '', // 房间编号
   recorder: name || '', // 用户名
@@ -38,10 +40,10 @@
   id: '', // 主键
   updateTime: '', // 更新时间
 })
-const ruleFormRef = ref<FormInstance>()
+const ruleFormRef = ref<FormInstance>() // 表单ref
 
 // 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([])
+const selectionList = ref<IRoomNumber[]>([])
 // 获取下拉框数据
 getTypeSelect('roomNumber').then((res) => {
   selectionList.value = res.data
@@ -73,39 +75,38 @@
   $router.back()
 }
 
+// 获取详情信息
 if (infoId.value && infoId.value !== '') {
-  getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
+  getEnvironmentRecordDetail({ id: infoId.value }).then((res) => {
     if (res.code === 200) {
       formInline.value = res.data
     }
   })
 }
 // 点击保存
-const preserve = async (formEl: FormInstance | undefined) => {
-  if (!formEl) {
-    return
-  }
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      ElMessageBox.confirm('确认提交吗？', '提示', {
+      ElMessageBox.confirm('确认保存吗？', '提示', {
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         type: 'warning',
       }).then(() => {
-        // 是否是新增
+        // 新增
         if (pageType.value === 'add') {
-          getenvironmentRecordAdd(formInline.value).then((res) => {
+          getEnvironmentRecordAdd(formInline.value).then((res) => {
             if (res.code === 200) {
-              ElMessage.success('提交成功!')
+              ElMessage.success('保存成功!')
               close()
             }
           })
         }
-        // 是否是编辑
-        else {
-          getenvironmentRecordUpdate(formInline.value).then((res) => {
+        // 编辑
+        else if (pageType.value === 'edit') {
+          getEnvironmentRecordUpdate(formInline.value).then((res) => {
             if (res.code === 200) {
-              ElMessage.success('提交成功!')
+              ElMessage.success('保存成功!')
               close()
             }
           })
@@ -117,8 +118,8 @@
 // 打印
 const printObj = ref({
   id: 'form', // 需要打印元素的id
-  popTitle: '环境记录单模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '环境记录单详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>环境记录单详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
@@ -130,15 +131,17 @@
     <detail-page :title="`环境记录单-${textMap[pageType]}`">
       <template #btns>
         <el-button
-          v-if="pageType !== 'detail'"
+          v-if="proxy.hasPerm('/lab/environmentalList/add') && pageType !== 'detail'"
           type="primary"
-          @click="
-            preserve(ruleFormRef)
-          "
+          @click="saveForm(ruleFormRef)"
         >
-          提交
+          保存
         </el-button>
-        <el-button v-else v-print="printObj" type="primary">
+        <el-button
+          v-if="proxy.hasPerm('/lab/environmentalList/add') && pageType === 'detail'"
+          v-print="printObj"
+          type="primary"
+        >
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -199,7 +202,7 @@
                 type="datetime"
                 :placeholder="pageType === 'detail' ? '无' : '请选择记录时间'"
                 format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                value-format="YYYY-MM-DD HH:mm:ss"
                 clearable
                 :disabled="pageType === 'detail'"
               />
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 90110ee..63a0849 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -1,13 +1,18 @@
+<!-- 环境记录单列表 -->
 <script lang="ts" setup name="EnvironmentalList">
-import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
+import type { IEnvironmental, IListQuery, IRoomNumber } from './environmentalList_interface'
 import { getTypeSelect } from '@/api/system/price'
-import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
+import { exportEnvironmentRecord, getEnvironmentRecordDelete, getEnvironmentRecordList } from '@/api/business/lab/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-const listQuery = ref({
+import { exportFile } from '@/utils/exportUtils'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+
+// 查询参数
+const listQuery = ref<IListQuery>({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
   beginTime: '', // 记录开始时间
@@ -15,17 +20,14 @@
   offset: 1, // 当前页
   limit: 20, // 多少条
 })
-const checkoutList = ref<string[]>([])
-const list = ref<IEnvironmental[]>([])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+const list = ref<IEnvironmental[]>([]) // 表格参数
 const total = ref(0)
-const show = ref(true)
+const loadingTable = ref(false) // 表格loading
+const trainTime = ref('') // 记录时间数组
+const roomNumberList = ref<IRoomNumber[]>([]) // 房间号
 
-const loadingTable = ref(false)
-// 初始化路由
-// 培训时间数组
-const trainTime = ref('')
-
-const $router = useRouter()
+// 查询列表
 const fetchData = (isNowPage: boolean) => {
   listQuery.value.beginTime = trainTime.value[0] || ''
   listQuery.value.endTime = trainTime.value[1] || ''
@@ -34,57 +36,23 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getenvironmentRecordList(listQuery.value).then((res) => {
+  getEnvironmentRecordList(listQuery.value).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
   })
   loadingTable.value = false
 }
 fetchData(true)
-const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref<TableColumn[]>([
-  {
-    text: '记录单号',
-    value: 'environmentCode',
-    align: 'center',
-  },
-  {
-    text: '房间号',
-    value: 'roomNumber',
-    align: 'center',
-  },
-  {
-    text: '记录人',
-    value: 'recorder',
-    align: 'center',
-  },
-  {
-    text: '记录时间',
-    value: 'recordTime',
-    width: '180',
-    align: 'center',
-  },
-  {
-    text: '温度(℃)',
-    value: 'temperature',
-    align: 'center',
-  },
-  {
-    text: '湿度(%)',
-    value: 'humidity',
-    align: 'center',
-  },
-  {
-    text: '输出电压(V)',
-    value: 'outputVoltage',
-    align: 'center',
-  },
-  {
-    text: '零地电压(V)',
-    value: 'zeroGroundVoltage',
-    align: 'center',
-  },
+  { text: '记录单号', value: 'environmentCode', align: 'center', width: '160' },
+  { text: '房间号', value: 'roomNumber', align: 'center' },
+  { text: '记录人', value: 'recorder', align: 'center' },
+  { text: '记录时间', value: 'recordTime', width: '180', align: 'center' },
+  { text: '温度(℃)', value: 'temperature', align: 'center' },
+  { text: '湿度(%)', value: 'humidity', align: 'center' },
+  { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
+  { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
 ])
 // 搜索
 const searchList = () => {
@@ -104,38 +72,44 @@
   trainTime.value = ''
   fetchData(true)
 }
+
 // 导出
-const exportExcelBtn = () => {
+const exportAll = () => {
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  // if (list.value.length > 0) {
-  // }
-  // else {
-  //   ElMessage.warning('无数据可导出数据')
-  // }
+  if (list.value.length > 0) {
+    const params = {
+      environmentCode: '', // 记录单编号
+      roomNumber: '', // 房间号
+      beginTime: '', // 记录开始时间
+      endTime: '', // 记录结束时间
+      offset: 1, // 当前页
+      limit: 20, // 多少条
+      ids: checkoutList.value,
+    }
+    exportEnvironmentRecord(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '环境记录单列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
   loading.close()
 }
-// 关闭编辑
-const close = () => {
-  show.value = true
-  fetchData(true)
-}
-// 点击编辑id和删除row类型
-interface rowReturn {
-  id: string
-  environmentCode: string
-}
+
 // 点击编辑/详情
-const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+const handleEdit = (row: IEnvironmental, pageType: 'edit' | 'detail') => {
   $router.push(`/lab/environmentalList/${pageType}/${row.id}`)
 }
+
 // 点击删除
-const handleDelete = (index: string, row: rowReturn) => {
+const handleDelete = (row: IEnvironmental) => {
   ElMessageBox.confirm(
-    `确认删除${row.environmentCode}吗？`,
+    `确认删除单号${row.environmentCode}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -144,12 +118,9 @@
     },
   )
     .then(() => {
-      getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
+      getEnvironmentRecordDelete({ id: row.id }).then((res) => {
         if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
+          ElMessage.success('已删除')
           fetchData(true)
         }
       })
@@ -160,14 +131,12 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
+
 // 点击新增
 const add = () => {
   $router.push('/lab/environmentalList/add')
 }
-// 点击导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -178,12 +147,12 @@
   }
   fetchData(true)
 }
-// 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([])
+
 // 获取下拉框数据
 getTypeSelect('roomNumber').then((res) => {
-  selectionList.value = res.data
+  roomNumberList.value = res.data
 })
+
 // 打印列表
 function printList() {
   // 打印列
@@ -225,7 +194,7 @@
           size="default"
         >
           <el-option
-            v-for="item in selectionList"
+            v-for="item in roomNumberList"
             :key="item.value"
             :label="item.name"
             :value="item.value"
@@ -238,7 +207,7 @@
           type="datetimerange"
           range-separator="到"
           format="YYYY-MM-DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="记录时间开始时间"
           end-placeholder="记录时间结束时间"
         />
@@ -247,21 +216,21 @@
     <table-container>
       <template #btns-right>
         <icon-button
-          v-if="proxy.hasPerm('/measure/train/plan/add')"
+          v-if="proxy.hasPerm('/lab/environmentalList/add')"
           icon="icon-add"
           title="新建"
           type="primary"
           @click="add"
         />
         <icon-button
-          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          v-if="proxy.hasPerm('/lab/environmentalList/export')"
           icon="icon-export"
           title="导出"
           type="primary"
           @click="exportAll"
         />
         <icon-button
-          v-if="proxy.hasPerm('/measure/train/plan/print')"
+          v-if="proxy.hasPerm('/lab/environmentalList/print')"
           icon="icon-print"
           title="打印"
           type="primary"
@@ -278,8 +247,15 @@
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="160">
+          <el-table-column label="操作" align="center" width="130" fixed="right">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/measure/train/plan/edit')"
@@ -303,7 +279,7 @@
                 size="small"
                 link
                 type="danger"
-                @click="handleDelete(row.$index, row)"
+                @click="handleDelete(row)"
               >
                 删除
               </el-button>
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 955af81..e1dc2a2 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -1,3 +1,13 @@
+// 查询参数
+export interface IListQuery {
+  environmentCode: string // 记录单编号
+  roomNumber: string // 房间号
+  beginTime: string // 记录开始时间
+  endTime: string // 记录结束时间
+  offset: number // 当前页
+  limit: number // 多少条
+}
+
 // 环境记录单list类型
 export interface IEnvironmental {
   environmentCode: string // 记录单编号
@@ -12,9 +22,27 @@
   createUser: string // 创建人
   id: string // 主键id
 }
+
 // 房间号模拟下拉框数据类型
-export interface selectionListItem {
+export interface IRoomNumber {
   value: string // 值
   name: string // lable
   id: string
 }
+
+// 环境记录单详情表单
+export interface IEnvironmentalDetail {
+  environmentCode: string // 环境记录单编号
+  roomNumber: string // 房间编号
+  recorder: string // 用户名
+  temperature: string // 温度
+  humidity: string // 湿度
+  outputVoltage: string // 输出电压
+  zeroGroundVoltage: string // 零地电压
+  remark: string // 备注
+  recordTime: string // 记录时间
+  createUser: string // 记录人id
+  createTime: string // 创建时间
+  id: string // 主键
+  updateTime: string // 更新时间
+}
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 98c4257..5105a76 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -294,6 +294,13 @@
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
           <el-table-column label="操作" align="center" width="130" fixed="right">
             <template #default="{ row }">
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index ae53f44..a0aee10 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -371,6 +371,13 @@
           :data="list" :total="total" :columns="columns" :query="listQuery"
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
         >
+          <template #preColumns>
+            <el-table-column label="序号" width="55" align="center">
+              <template #default="scope">
+                {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
           <template #columns>
             <el-table-column label="操作" align="center" :width="operationWidth">
               <template #default="{ row }">
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 21350ac..2ebcf8b 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -458,6 +458,13 @@
         :data="list" :total="total" :columns="currentMenu === '待收入' ? columnsTaking : columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
           <el-table-column
             label="操作" align="center" fixed="right" :width="currentMenu === '待收入' ? 270 : (currentMenu === '已收入' || currentMenu === '待归还') ? 210
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index ed11f7e..026fd77 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -87,7 +87,7 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
   { text: '外观', value: 'appearance', align: 'center' },
-  { text: '检定要求', value: 'measureRequire', align: 'center' },
+  { text: '检定要求', value: 'specialRequire', align: 'center' },
 ])
 
 // 签章查询数据
@@ -238,6 +238,10 @@
 // ------------------------样品-----------------------------
 // 点击批量增加
 const multiAdd = () => {
+  if (!dataForm.value.customerNo) {
+    ElMessage.warning('请先选择委托方')
+    return
+  }
   sampleVisible.value = true
 }
 // 修改委托方对话框显隐
@@ -318,6 +322,11 @@
   getAutographList()
 }
 
+// 表格双击行
+const rowDblclick = (row: ISampleList) => {
+  row.isEdit = true
+}
+
 onMounted(async () => {
   if (pageType.value === 'add') {
     dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
@@ -592,7 +601,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="24" class="marg">
+            <!-- <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="样品外观:">
                   <el-input
@@ -605,7 +614,7 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
+            </el-row> -->
             <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="依据文件:">
@@ -642,6 +651,7 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
+          @row-dblclick="rowDblclick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -653,7 +663,17 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          />
+          >
+            <template v-if="item.value === 'specialRequire' && (pageType === 'add' || pageType === 'edit')" #default="scope">
+              <el-input
+                v-if="scope.row.isEdit"
+                v-model="scope.row.specialRequire"
+                placeholder="请输入检定要求"
+                class="input"
+              />
+              <span v-else>{{ scope.row.specialRequire }}</span>
+            </template>
+          </el-table-column>
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index 3decec5..2d1c1ff 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -60,6 +60,7 @@
   appendixDescn: string // 附件说明
   appearance: string // 外观
   measureRequire: string // 检定要求
+  isEdit?: boolean // 是否可编辑
 }
 
 // 字典
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index b090632..7622ab0 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -326,6 +326,13 @@
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
           <el-table-column label="操作" align="center" fixed="right" width="170">
             <template #default="{ row }">
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 6dc9628..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" apply-type="1" />
+    <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 b863728..c17034c 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -2,7 +2,10 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { borrowDeviceType } from '../borrow-interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import { deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
+import { cancelApproval, deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
+import {
+  submitReceiveApplyList,
+} from '@/api/device/receive'
 import type{ searchType } from '@/views/device/borrow/borrow-interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
@@ -36,7 +39,7 @@
   ids: [] as string[],
   limit: 20,
   offset: 1,
-  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+  formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
 }) // 查询参数
 watch(() => time.value, (newVal) => {
   if (newVal) {
@@ -252,6 +255,7 @@
     query: {
       title: '新建',
       name: '设备借用申请',
+      applyType: props.applyType,
     },
   })
 }
@@ -277,7 +281,6 @@
   exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '设备借用申请')
     loading.close()
-    // searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -333,7 +336,17 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
+  ).then((res) => {
+    cancelApproval({ processInstanceId: row.processId, comments: '' }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        getList()
+      }
+    })
+  })
 }
 // 提交
 const submit = (row: any) => {
@@ -346,11 +359,11 @@
       type: 'warning',
     },
   ).then((res) => {
-    submitApply({ id: row.id }).then((res) => {
+    submitReceiveApplyList({ formId: SCHEDULE.DEVICE_BORROW_APPROVAL, id: row.id }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
-          message: '提交',
+          message: '提交成功',
         })
         getList()
       }
@@ -468,7 +481,7 @@
                     拒绝
                   </el-button>
                 </temaplte>
-                <el-button size="small" type="primary" link @click="cancel(row)">
+                <el-button size="small" type="primary" link :disabled="!['2', '3'].includes(row.approvalStatus)" @click="cancel(row)">
                   取消
                 </el-button>
                 <el-button size="small" type="danger" link @click="remove(row)">
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index 293be0c..b277758 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -23,9 +23,9 @@
   applyNo: '', // 申请编号
   applyPerson: '', // 	申请人
   applyUnit: '', // 	申请单位
-  approvalStatus: '0', // 	审批状态
+  approvalStatus: '4', // 	审批状态
   createUser: '', // 	创建人
-  processResult: '', // 	处置结果
+  processResult: '0', // 	处置结果
   applyType: props.applyType,
   time: '', // 	申请日期
   ids: [] as string[],
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 612b3b4..71c8ed8 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -4,8 +4,7 @@
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { useRouter } from 'vue-router'
-import type { IMenu } from '../receive'
-import type { IlistQuery, IlistType } from '@/views/device/receive/receive'
+import type { IlistQuery, IlistType, dictType } from '@/views/device/receive/receive'
 import ButtonBox from '@/components/buttonBox/buttonBox.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { exportFile } from '@/utils/exportUtils'
@@ -24,24 +23,19 @@
 import type { userType } from '@/views/system/user/user-interface'
 import type { deptType } from '@/views/device/standingBook/standingBook-interface'
 import { getUserList } from '@/api/system/user'
+import { getDictByCode } from '@/api/system/dict'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
 
+const { proxy } = getCurrentInstance() as any
 const loadingTable = ref(false) // 表格loading
 const active = ref('') // 选中的按钮
+const activeTitle = ref('') // active对应的审批状态名字
 const approvalDialog = ref() // 审批对话框显隐
 const useDeptList = ref<deptType[]>([]) // 部门列表
 const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
 const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
 const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
-
-const menu = ref<IMenu[]>([
-  { name: '全部', id: '0' },
-  { name: '草稿箱', id: '1' },
-  { name: '待审批', id: '2' },
-  { name: '审批中', id: '3' },
-  { name: '已通过', id: '4' },
-  { name: '未通过', id: '5' },
-  { name: '已取消', id: '6' },
-])
+const menu = ref<IMenu[]>([]) // 右上角审批状态按钮组合
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
   applyNo: '', // 申请编号
@@ -60,40 +54,17 @@
   offset: 1,
   limit: 20,
 })
-// 审批状态字典
-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 list = ref<IlistType[]>([])
-const { proxy } = getCurrentInstance() as any
-// 总数
-const total = ref(20)
+const approvalStatusMap = ref({}) as any// 审批状态字典{1：草稿箱}
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
+const list = ref<IlistType[]>([])// 表格数据
+const total = ref(20)// 页码总数
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '申请编号', value: 'applyNo', align: 'center' },
+  { text: '申请编号', value: 'applyNo', align: 'center', width: '180' },
   { text: '申请名称', value: 'applyName', align: 'center' },
   { text: '申请部门', value: 'applyUnitName', align: 'center' },
   { text: '申请人', value: 'applyPersonName', align: 'center' },
-  { text: '领用时间', value: 'time', align: 'center' },
+  { text: '领用时间', value: 'time', align: 'center', width: '160' },
   { text: '申请说明', value: 'applyDesc', align: 'center' },
   { text: '审批状态', value: 'approvalStatus', align: 'center' },
 ])
@@ -102,6 +73,33 @@
 // 筛选时间段数据
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {1：草稿箱}
+  res.data.forEach((item: any) => {
+    approvalStatusMap.value[`${item.value}`] = item.name
+  })
+
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+}
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -116,7 +114,7 @@
     list.value = response.data.rows.map((item: IlistType) => {
       return {
         ...item,
-        approvalStatus: approvalStatusMap[item.approvalStatus],
+        approvalStatus: approvalStatusMap.value[item.approvalStatus],
       }
     })
     total.value = parseInt(response.data.total)
@@ -317,9 +315,11 @@
     })
   }
 }
+
 // 按钮切换
 const changeCurrentButton = (val: string) => {
   active.value = val
+  activeTitle.value = menu.value.find(item => item.id === val)!.name
   window.sessionStorage.setItem('buttonBoxActive', val)
   clearList()
 }
@@ -362,20 +362,24 @@
   })
 }
 
-onMounted(() => {
-  if (window.sessionStorage.getItem('buttonBoxActive')) {
+onMounted(async () => {
+  await getDict() // 获取字典-审批状态
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
     active.value = window.sessionStorage.getItem('buttonBoxActive')!
   }
   else {
-    active.value = '0' // 全部
+    active.value = menu.value.find(item => item.name === '全部')!.id // 全部
+    activeTitle.value === '全部'
   }
   nextTick(() => {
     fetchData(true) // 获取表格数据
-    // 获取使用部门
     fetchDeptTreeList() // 获取使用部门
     fetchUserList() // 获取人员列表
   })
 })
+onUnmounted(() => {
+  window.sessionStorage.setItem('buttonBoxActive', '') // 清除
+})
 </script>
 
 <template>
@@ -446,7 +450,12 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="220" fixed="right">
+          <el-table-column
+            label="操作"
+            align="center"
+            :width="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 70 : 200"
+            fixed="right"
+          >
             <template #default="{ row }">
               <el-button
                 size="small"
@@ -457,37 +466,37 @@
                 查看
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (active === '0' || active === '2')"
+                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (activeTitle === '全部' || activeTitle === '待审批')"
                 size="small"
                 link
                 type="primary"
-                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 3"
                 @click="handleEdit(row, '同意')"
               >
                 同意
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (active === '0' || active === '2')"
+                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (activeTitle === '全部' || activeTitle === '待审批')"
                 size="small"
                 link
                 type="primary"
-                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 3"
                 @click="handleEdit(row, '驳回')"
               >
                 驳回
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (active === '0' || active === '2')"
+                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (activeTitle === '全部' || activeTitle === '待审批')"
                 size="small"
                 link
                 type="danger"
-                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 1 || row.decisionItem === 2"
                 @click="handleEdit(row, '拒绝')"
               >
                 拒绝
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
                 size="small"
                 link
                 type="primary"
@@ -496,7 +505,7 @@
                 编辑
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
                 size="small"
                 link
                 type="primary"
@@ -506,7 +515,7 @@
               </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (active === '0' || active === '3')"
+                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (activeTitle === '全部' || activeTitle === '审批中')"
                 size="small"
                 link
                 type="info"
@@ -517,7 +526,7 @@
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (active !== '4' && active !== '5')"
+                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (activeTitle !== '已通过' && activeTitle !== '未通过')"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/receive/receive.ts b/src/views/device/receive/receive.ts
index ce3b533..d4ac6a6 100644
--- a/src/views/device/receive/receive.ts
+++ b/src/views/device/receive/receive.ts
@@ -83,3 +83,11 @@
   validDate: string // 有效日期
 }
 
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
+
diff --git a/src/views/device/receive/solve/solveList.vue b/src/views/device/receive/solve/solveList.vue
index b541f35..cb4dba8 100644
--- a/src/views/device/receive/solve/solveList.vue
+++ b/src/views/device/receive/solve/solveList.vue
@@ -5,7 +5,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { useRouter } from 'vue-router'
 import ButtonBox from '@/components/buttonBox/buttonBox.vue'
-import type { IMenu, IlistQuery, IsolveListType } from '@/views/device/receive/receive'
+import type { IlistQuery, IsolveListType, dictType } from '@/views/device/receive/receive'
 import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -21,6 +21,8 @@
   getReceiveApplyList,
   updateProcessResult,
 } from '@/api/device/receive'
+import { getDictByCode } from '@/api/system/dict'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
 
 const useDeptList = ref<deptType[]>([]) // 部门列表
 const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
@@ -28,22 +30,9 @@
 const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
 const loadingTable = ref(false) // 表格loading
 const active = ref('') // 选中的按钮
-
-// 审批状态字典
-const approvalStatusMap: { [key: string]: string } = {
-  1: '草稿箱',
-  2: '待审批',
-  3: '审批中',
-  4: '已通过',
-  5: '未通过',
-  6: '已取消',
-  7: '非草稿',
-  8: '未通过-驳回',
-}
-const menu = ref<IMenu[]>([
-  { name: '未领用', id: '4' },
-  { name: '已领用', id: '5' },
-])
+const approvalStatusMap = ref({}) as any// 审批状态字典{1：草稿箱}
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
+const menu = ref<IMenu[]>([]) // 右上角按钮
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
   applyNo: '', // 申请编号
@@ -72,17 +61,44 @@
 const total = ref(20)
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '申请编号', value: 'applyNo', align: 'center' },
+  { text: '申请编号', value: 'applyNo', align: 'center', width: '180' },
   { text: '申请名称', value: 'applyName', align: 'center' },
   { text: '申请部门', value: 'applyUnitName', align: 'center' },
   { text: '申请人', value: 'applyPersonName', align: 'center' },
-  { text: '领用时间', value: 'time', align: 'center' },
+  { text: '领用时间', value: 'time', align: 'center', width: '160' },
   { text: '申请说明', value: 'applyDesc', align: 'center' },
   { text: '审批状态', value: 'approvalStatus', align: 'center' },
 ])
 // 选中的内容
 const checkoutList = ref<string[]>([])
 
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {1：草稿箱}
+  res.data.forEach((item: any) => {
+    approvalStatusMap.value[`${item.value}`] = item.name
+  })
+
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+
+  // 设备申请处理结果
+  const equipmentApplyProcessResultRes = await getDictByCode('equipmentApplyProcessResult')
+  // 制作右上角的菜单
+  equipmentApplyProcessResultRes.data.forEach((item: dictType) => {
+    if (item.name === '待领用' || item.name === '已领用') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+}
+
 // 重置
 const clearList = () => {
   listQuery.value = {
@@ -118,7 +134,7 @@
     list.value = response.data.rows.map((item: IsolveListType) => {
       return {
         ...item,
-        approvalStatus: approvalStatusMap[item.approvalStatus],
+        approvalStatus: approvalStatusMap.value[item.approvalStatus],
       }
     })
     total.value = parseInt(response.data.total)
@@ -288,12 +304,13 @@
   }
 }
 
-onMounted(() => {
-  if (window.sessionStorage.getItem('solveButtonBoxActive')) {
+onMounted(async () => {
+  await getDict()
+  if (window.sessionStorage.getItem('solveButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('solveButtonBoxActive') !== '') {
     active.value = window.sessionStorage.getItem('solveButtonBoxActive')!
   }
   else {
-    active.value = '4' // 未领用
+    active.value = menu.value.find(item => item.name === '待领用')!.id // 未领用
   }
   nextTick(() => {
     // 获取表格数据
@@ -380,12 +397,12 @@
         </template>
         <template #columns>
           <el-table-column label="操作" align="center" width="130" fixed="right">
-            <template #default="scope">
+            <template #default="{ row }">
               <el-button
                 size="small"
                 type="primary"
                 link
-                @click="handleEdit(scope.row, '查看')"
+                @click="handleEdit(row, '查看')"
               >
                 查看
               </el-button>
@@ -394,26 +411,26 @@
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(scope.row, '领用')"
+                @click="handleEdit(row, '领用')"
               >
                 领用
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="active === '4'"
+                v-if="row.approvalStatus === '已通过'"
                 size="small"
                 link
                 type="danger"
-                @click="handleEdit(scope.row, '删除')"
+                @click="handleEdit(row, '删除')"
               >
                 删除
               </el-button>
               <el-button
-                v-if="active === '5'"
+                v-if="row.approvalStatus === '未通过'"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(scope.row, '退领')"
+                @click="handleEdit(row, '退领')"
               >
                 退领
               </el-button>

diff --git "a/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js" "b/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
index 4c9b127..633c7a9 100644
--- "a/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
+++ "b/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
@@ -11,6 +11,7 @@
       },
       "directorMaxLevel": 4,//审批主管最大层级
       "flowPermission": [],//发起人
+      "decisionItem": 1, //1同意驳回拒绝、2同意驳回、3拒绝
       "nodeConfig": {
           "nodeName": "发起人",//节点名称
           "type": 0,// 0 发起人 1审批 2抄送 3条件 4路由
diff --git a/src/api/business/environmentRecord/environmentRecord.ts b/src/api/business/environmentRecord/environmentRecord.ts
deleted file mode 100644
index 1a575eb..0000000
--- a/src/api/business/environmentRecord/environmentRecord.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import request from '../../index'
-
-// 环境记录单列表查询-分页
-export function getenvironmentRecordList(data: { offset: number; limit: number }) {
-  return request({
-    url: `/business/environmentRecord/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 环境记录单删除
-export function getenvironmentRecordDelete(data: object) {
-  return request({
-    url: '/business/environmentRecord/delete',
-    method: 'post',
-    data,
-  })
-}
-
-// 新增环境记录单
-export function getenvironmentRecordAdd(data: object) {
-  return request({
-    url: '/business/environmentRecord/add',
-    method: 'post',
-    data,
-  })
-}
-
-// 环境监测记录单-详情
-export function getenvironmentRecordDetail(data: object) {
-  return request({
-    url: '/business/environmentRecord/detail',
-    method: 'post',
-    data,
-  })
-}
-
-// 环境监测记录单-编辑
-export function getenvironmentRecordUpdate(data: object) {
-  return request({
-    url: '/business/environmentRecord/update',
-    method: 'post',
-    data,
-  })
-}
diff --git a/src/api/business/lab/environmentRecord.ts b/src/api/business/lab/environmentRecord.ts
new file mode 100644
index 0000000..f76a9ce
--- /dev/null
+++ b/src/api/business/lab/environmentRecord.ts
@@ -0,0 +1,58 @@
+import request from '../../index'
+import type { IEnvironmentalDetail, IListQuery } from '@/views/business/lab/environmental/environmentalList_interface'
+const prefix = '/business/environmentRecord'
+
+// 环境记录单列表查询-分页
+export function getEnvironmentRecordList(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 环境记录单删除
+export function getEnvironmentRecordDelete(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新增环境记录单
+export function getEnvironmentRecordAdd(data: IEnvironmentalDetail) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 环境监测记录单-详情
+export function getEnvironmentRecordDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 环境监测记录单-编辑
+export function getEnvironmentRecordUpdate(data: IEnvironmentalDetail) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportEnvironmentRecord(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/export`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index 47a713e..94a4246 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -17,6 +17,16 @@
     data,
   })
 }
+
+// 设备借用取消审批
+export function cancelApproval(data: { processInstanceId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
+
 // 设备借用申请详情
 export function detailApply(data: object) {
   return request({
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 9887075..8fa5759 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -1,15 +1,16 @@
-<script lang="ts" setup name="PlanAdd">
+<!-- 环境记录单详情 -->
+<script lang="ts" setup name="EnvironmentalList">
 import type { FormInstance } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
-import type { selectionListItem } from './environmentalList_interface'
+import type { IEnvironmentalDetail, IRoomNumber } from './environmentalList_interface'
 import { getTypeSelect } from '@/api/system/price'
-import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
+import { getEnvironmentRecordAdd, getEnvironmentRecordDetail, getEnvironmentRecordUpdate } from '@/api/business/lab/environmentRecord'
 import useUserStore from '@/store/modules/user'
+const { proxy } = getCurrentInstance() as any
 const infoId = ref('') // id
-const { name, id } = useUserStore()
+const { name, id } = useUserStore() // 用户名、id
 const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
@@ -23,7 +24,8 @@
     infoId.value = $route.params.id as string
   }
 }
-const formInline = ref({
+// 表单
+const formInline = ref<IEnvironmentalDetail>({
   environmentCode: '', // 环境记录单编号
   roomNumber: '', // 房间编号
   recorder: name || '', // 用户名
@@ -38,10 +40,10 @@
   id: '', // 主键
   updateTime: '', // 更新时间
 })
-const ruleFormRef = ref<FormInstance>()
+const ruleFormRef = ref<FormInstance>() // 表单ref
 
 // 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([])
+const selectionList = ref<IRoomNumber[]>([])
 // 获取下拉框数据
 getTypeSelect('roomNumber').then((res) => {
   selectionList.value = res.data
@@ -73,39 +75,38 @@
   $router.back()
 }
 
+// 获取详情信息
 if (infoId.value && infoId.value !== '') {
-  getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
+  getEnvironmentRecordDetail({ id: infoId.value }).then((res) => {
     if (res.code === 200) {
       formInline.value = res.data
     }
   })
 }
 // 点击保存
-const preserve = async (formEl: FormInstance | undefined) => {
-  if (!formEl) {
-    return
-  }
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      ElMessageBox.confirm('确认提交吗？', '提示', {
+      ElMessageBox.confirm('确认保存吗？', '提示', {
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         type: 'warning',
       }).then(() => {
-        // 是否是新增
+        // 新增
         if (pageType.value === 'add') {
-          getenvironmentRecordAdd(formInline.value).then((res) => {
+          getEnvironmentRecordAdd(formInline.value).then((res) => {
             if (res.code === 200) {
-              ElMessage.success('提交成功!')
+              ElMessage.success('保存成功!')
               close()
             }
           })
         }
-        // 是否是编辑
-        else {
-          getenvironmentRecordUpdate(formInline.value).then((res) => {
+        // 编辑
+        else if (pageType.value === 'edit') {
+          getEnvironmentRecordUpdate(formInline.value).then((res) => {
             if (res.code === 200) {
-              ElMessage.success('提交成功!')
+              ElMessage.success('保存成功!')
               close()
             }
           })
@@ -117,8 +118,8 @@
 // 打印
 const printObj = ref({
   id: 'form', // 需要打印元素的id
-  popTitle: '环境记录单模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '环境记录单详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>环境记录单详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
@@ -130,15 +131,17 @@
     <detail-page :title="`环境记录单-${textMap[pageType]}`">
       <template #btns>
         <el-button
-          v-if="pageType !== 'detail'"
+          v-if="proxy.hasPerm('/lab/environmentalList/add') && pageType !== 'detail'"
           type="primary"
-          @click="
-            preserve(ruleFormRef)
-          "
+          @click="saveForm(ruleFormRef)"
         >
-          提交
+          保存
         </el-button>
-        <el-button v-else v-print="printObj" type="primary">
+        <el-button
+          v-if="proxy.hasPerm('/lab/environmentalList/add') && pageType === 'detail'"
+          v-print="printObj"
+          type="primary"
+        >
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -199,7 +202,7 @@
                 type="datetime"
                 :placeholder="pageType === 'detail' ? '无' : '请选择记录时间'"
                 format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                value-format="YYYY-MM-DD HH:mm:ss"
                 clearable
                 :disabled="pageType === 'detail'"
               />
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 90110ee..63a0849 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -1,13 +1,18 @@
+<!-- 环境记录单列表 -->
 <script lang="ts" setup name="EnvironmentalList">
-import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
+import type { IEnvironmental, IListQuery, IRoomNumber } from './environmentalList_interface'
 import { getTypeSelect } from '@/api/system/price'
-import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
+import { exportEnvironmentRecord, getEnvironmentRecordDelete, getEnvironmentRecordList } from '@/api/business/lab/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-const listQuery = ref({
+import { exportFile } from '@/utils/exportUtils'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+
+// 查询参数
+const listQuery = ref<IListQuery>({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
   beginTime: '', // 记录开始时间
@@ -15,17 +20,14 @@
   offset: 1, // 当前页
   limit: 20, // 多少条
 })
-const checkoutList = ref<string[]>([])
-const list = ref<IEnvironmental[]>([])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+const list = ref<IEnvironmental[]>([]) // 表格参数
 const total = ref(0)
-const show = ref(true)
+const loadingTable = ref(false) // 表格loading
+const trainTime = ref('') // 记录时间数组
+const roomNumberList = ref<IRoomNumber[]>([]) // 房间号
 
-const loadingTable = ref(false)
-// 初始化路由
-// 培训时间数组
-const trainTime = ref('')
-
-const $router = useRouter()
+// 查询列表
 const fetchData = (isNowPage: boolean) => {
   listQuery.value.beginTime = trainTime.value[0] || ''
   listQuery.value.endTime = trainTime.value[1] || ''
@@ -34,57 +36,23 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getenvironmentRecordList(listQuery.value).then((res) => {
+  getEnvironmentRecordList(listQuery.value).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
   })
   loadingTable.value = false
 }
 fetchData(true)
-const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref<TableColumn[]>([
-  {
-    text: '记录单号',
-    value: 'environmentCode',
-    align: 'center',
-  },
-  {
-    text: '房间号',
-    value: 'roomNumber',
-    align: 'center',
-  },
-  {
-    text: '记录人',
-    value: 'recorder',
-    align: 'center',
-  },
-  {
-    text: '记录时间',
-    value: 'recordTime',
-    width: '180',
-    align: 'center',
-  },
-  {
-    text: '温度(℃)',
-    value: 'temperature',
-    align: 'center',
-  },
-  {
-    text: '湿度(%)',
-    value: 'humidity',
-    align: 'center',
-  },
-  {
-    text: '输出电压(V)',
-    value: 'outputVoltage',
-    align: 'center',
-  },
-  {
-    text: '零地电压(V)',
-    value: 'zeroGroundVoltage',
-    align: 'center',
-  },
+  { text: '记录单号', value: 'environmentCode', align: 'center', width: '160' },
+  { text: '房间号', value: 'roomNumber', align: 'center' },
+  { text: '记录人', value: 'recorder', align: 'center' },
+  { text: '记录时间', value: 'recordTime', width: '180', align: 'center' },
+  { text: '温度(℃)', value: 'temperature', align: 'center' },
+  { text: '湿度(%)', value: 'humidity', align: 'center' },
+  { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
+  { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
 ])
 // 搜索
 const searchList = () => {
@@ -104,38 +72,44 @@
   trainTime.value = ''
   fetchData(true)
 }
+
 // 导出
-const exportExcelBtn = () => {
+const exportAll = () => {
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  // if (list.value.length > 0) {
-  // }
-  // else {
-  //   ElMessage.warning('无数据可导出数据')
-  // }
+  if (list.value.length > 0) {
+    const params = {
+      environmentCode: '', // 记录单编号
+      roomNumber: '', // 房间号
+      beginTime: '', // 记录开始时间
+      endTime: '', // 记录结束时间
+      offset: 1, // 当前页
+      limit: 20, // 多少条
+      ids: checkoutList.value,
+    }
+    exportEnvironmentRecord(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '环境记录单列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
   loading.close()
 }
-// 关闭编辑
-const close = () => {
-  show.value = true
-  fetchData(true)
-}
-// 点击编辑id和删除row类型
-interface rowReturn {
-  id: string
-  environmentCode: string
-}
+
 // 点击编辑/详情
-const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+const handleEdit = (row: IEnvironmental, pageType: 'edit' | 'detail') => {
   $router.push(`/lab/environmentalList/${pageType}/${row.id}`)
 }
+
 // 点击删除
-const handleDelete = (index: string, row: rowReturn) => {
+const handleDelete = (row: IEnvironmental) => {
   ElMessageBox.confirm(
-    `确认删除${row.environmentCode}吗？`,
+    `确认删除单号${row.environmentCode}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -144,12 +118,9 @@
     },
   )
     .then(() => {
-      getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
+      getEnvironmentRecordDelete({ id: row.id }).then((res) => {
         if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
+          ElMessage.success('已删除')
           fetchData(true)
         }
       })
@@ -160,14 +131,12 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
+
 // 点击新增
 const add = () => {
   $router.push('/lab/environmentalList/add')
 }
-// 点击导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -178,12 +147,12 @@
   }
   fetchData(true)
 }
-// 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([])
+
 // 获取下拉框数据
 getTypeSelect('roomNumber').then((res) => {
-  selectionList.value = res.data
+  roomNumberList.value = res.data
 })
+
 // 打印列表
 function printList() {
   // 打印列
@@ -225,7 +194,7 @@
           size="default"
         >
           <el-option
-            v-for="item in selectionList"
+            v-for="item in roomNumberList"
             :key="item.value"
             :label="item.name"
             :value="item.value"
@@ -238,7 +207,7 @@
           type="datetimerange"
           range-separator="到"
           format="YYYY-MM-DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="记录时间开始时间"
           end-placeholder="记录时间结束时间"
         />
@@ -247,21 +216,21 @@
     <table-container>
       <template #btns-right>
         <icon-button
-          v-if="proxy.hasPerm('/measure/train/plan/add')"
+          v-if="proxy.hasPerm('/lab/environmentalList/add')"
           icon="icon-add"
           title="新建"
           type="primary"
           @click="add"
         />
         <icon-button
-          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          v-if="proxy.hasPerm('/lab/environmentalList/export')"
           icon="icon-export"
           title="导出"
           type="primary"
           @click="exportAll"
         />
         <icon-button
-          v-if="proxy.hasPerm('/measure/train/plan/print')"
+          v-if="proxy.hasPerm('/lab/environmentalList/print')"
           icon="icon-print"
           title="打印"
           type="primary"
@@ -278,8 +247,15 @@
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="160">
+          <el-table-column label="操作" align="center" width="130" fixed="right">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/measure/train/plan/edit')"
@@ -303,7 +279,7 @@
                 size="small"
                 link
                 type="danger"
-                @click="handleDelete(row.$index, row)"
+                @click="handleDelete(row)"
               >
                 删除
               </el-button>
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 955af81..e1dc2a2 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -1,3 +1,13 @@
+// 查询参数
+export interface IListQuery {
+  environmentCode: string // 记录单编号
+  roomNumber: string // 房间号
+  beginTime: string // 记录开始时间
+  endTime: string // 记录结束时间
+  offset: number // 当前页
+  limit: number // 多少条
+}
+
 // 环境记录单list类型
 export interface IEnvironmental {
   environmentCode: string // 记录单编号
@@ -12,9 +22,27 @@
   createUser: string // 创建人
   id: string // 主键id
 }
+
 // 房间号模拟下拉框数据类型
-export interface selectionListItem {
+export interface IRoomNumber {
   value: string // 值
   name: string // lable
   id: string
 }
+
+// 环境记录单详情表单
+export interface IEnvironmentalDetail {
+  environmentCode: string // 环境记录单编号
+  roomNumber: string // 房间编号
+  recorder: string // 用户名
+  temperature: string // 温度
+  humidity: string // 湿度
+  outputVoltage: string // 输出电压
+  zeroGroundVoltage: string // 零地电压
+  remark: string // 备注
+  recordTime: string // 记录时间
+  createUser: string // 记录人id
+  createTime: string // 创建时间
+  id: string // 主键
+  updateTime: string // 更新时间
+}
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 98c4257..5105a76 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -294,6 +294,13 @@
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
           <el-table-column label="操作" align="center" width="130" fixed="right">
             <template #default="{ row }">
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index ae53f44..a0aee10 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -371,6 +371,13 @@
           :data="list" :total="total" :columns="columns" :query="listQuery"
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
         >
+          <template #preColumns>
+            <el-table-column label="序号" width="55" align="center">
+              <template #default="scope">
+                {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
           <template #columns>
             <el-table-column label="操作" align="center" :width="operationWidth">
               <template #default="{ row }">
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 21350ac..2ebcf8b 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -458,6 +458,13 @@
         :data="list" :total="total" :columns="currentMenu === '待收入' ? columnsTaking : columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
           <el-table-column
             label="操作" align="center" fixed="right" :width="currentMenu === '待收入' ? 270 : (currentMenu === '已收入' || currentMenu === '待归还') ? 210
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index ed11f7e..026fd77 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -87,7 +87,7 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
   { text: '外观', value: 'appearance', align: 'center' },
-  { text: '检定要求', value: 'measureRequire', align: 'center' },
+  { text: '检定要求', value: 'specialRequire', align: 'center' },
 ])
 
 // 签章查询数据
@@ -238,6 +238,10 @@
 // ------------------------样品-----------------------------
 // 点击批量增加
 const multiAdd = () => {
+  if (!dataForm.value.customerNo) {
+    ElMessage.warning('请先选择委托方')
+    return
+  }
   sampleVisible.value = true
 }
 // 修改委托方对话框显隐
@@ -318,6 +322,11 @@
   getAutographList()
 }
 
+// 表格双击行
+const rowDblclick = (row: ISampleList) => {
+  row.isEdit = true
+}
+
 onMounted(async () => {
   if (pageType.value === 'add') {
     dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
@@ -592,7 +601,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="24" class="marg">
+            <!-- <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="样品外观:">
                   <el-input
@@ -605,7 +614,7 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
+            </el-row> -->
             <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="依据文件:">
@@ -642,6 +651,7 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
+          @row-dblclick="rowDblclick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -653,7 +663,17 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          />
+          >
+            <template v-if="item.value === 'specialRequire' && (pageType === 'add' || pageType === 'edit')" #default="scope">
+              <el-input
+                v-if="scope.row.isEdit"
+                v-model="scope.row.specialRequire"
+                placeholder="请输入检定要求"
+                class="input"
+              />
+              <span v-else>{{ scope.row.specialRequire }}</span>
+            </template>
+          </el-table-column>
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index 3decec5..2d1c1ff 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -60,6 +60,7 @@
   appendixDescn: string // 附件说明
   appearance: string // 外观
   measureRequire: string // 检定要求
+  isEdit?: boolean // 是否可编辑
 }
 
 // 字典
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index b090632..7622ab0 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -326,6 +326,13 @@
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
           <el-table-column label="操作" align="center" fixed="right" width="170">
             <template #default="{ row }">
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 6dc9628..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" apply-type="1" />
+    <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 b863728..c17034c 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -2,7 +2,10 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { borrowDeviceType } from '../borrow-interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import { deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
+import { cancelApproval, deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
+import {
+  submitReceiveApplyList,
+} from '@/api/device/receive'
 import type{ searchType } from '@/views/device/borrow/borrow-interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
@@ -36,7 +39,7 @@
   ids: [] as string[],
   limit: 20,
   offset: 1,
-  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+  formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
 }) // 查询参数
 watch(() => time.value, (newVal) => {
   if (newVal) {
@@ -252,6 +255,7 @@
     query: {
       title: '新建',
       name: '设备借用申请',
+      applyType: props.applyType,
     },
   })
 }
@@ -277,7 +281,6 @@
   exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '设备借用申请')
     loading.close()
-    // searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -333,7 +336,17 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
+  ).then((res) => {
+    cancelApproval({ processInstanceId: row.processId, comments: '' }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        getList()
+      }
+    })
+  })
 }
 // 提交
 const submit = (row: any) => {
@@ -346,11 +359,11 @@
       type: 'warning',
     },
   ).then((res) => {
-    submitApply({ id: row.id }).then((res) => {
+    submitReceiveApplyList({ formId: SCHEDULE.DEVICE_BORROW_APPROVAL, id: row.id }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
-          message: '提交',
+          message: '提交成功',
         })
         getList()
       }
@@ -468,7 +481,7 @@
                     拒绝
                   </el-button>
                 </temaplte>
-                <el-button size="small" type="primary" link @click="cancel(row)">
+                <el-button size="small" type="primary" link :disabled="!['2', '3'].includes(row.approvalStatus)" @click="cancel(row)">
                   取消
                 </el-button>
                 <el-button size="small" type="danger" link @click="remove(row)">
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index 293be0c..b277758 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -23,9 +23,9 @@
   applyNo: '', // 申请编号
   applyPerson: '', // 	申请人
   applyUnit: '', // 	申请单位
-  approvalStatus: '0', // 	审批状态
+  approvalStatus: '4', // 	审批状态
   createUser: '', // 	创建人
-  processResult: '', // 	处置结果
+  processResult: '0', // 	处置结果
   applyType: props.applyType,
   time: '', // 	申请日期
   ids: [] as string[],
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 612b3b4..71c8ed8 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -4,8 +4,7 @@
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { useRouter } from 'vue-router'
-import type { IMenu } from '../receive'
-import type { IlistQuery, IlistType } from '@/views/device/receive/receive'
+import type { IlistQuery, IlistType, dictType } from '@/views/device/receive/receive'
 import ButtonBox from '@/components/buttonBox/buttonBox.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { exportFile } from '@/utils/exportUtils'
@@ -24,24 +23,19 @@
 import type { userType } from '@/views/system/user/user-interface'
 import type { deptType } from '@/views/device/standingBook/standingBook-interface'
 import { getUserList } from '@/api/system/user'
+import { getDictByCode } from '@/api/system/dict'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
 
+const { proxy } = getCurrentInstance() as any
 const loadingTable = ref(false) // 表格loading
 const active = ref('') // 选中的按钮
+const activeTitle = ref('') // active对应的审批状态名字
 const approvalDialog = ref() // 审批对话框显隐
 const useDeptList = ref<deptType[]>([]) // 部门列表
 const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
 const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
 const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
-
-const menu = ref<IMenu[]>([
-  { name: '全部', id: '0' },
-  { name: '草稿箱', id: '1' },
-  { name: '待审批', id: '2' },
-  { name: '审批中', id: '3' },
-  { name: '已通过', id: '4' },
-  { name: '未通过', id: '5' },
-  { name: '已取消', id: '6' },
-])
+const menu = ref<IMenu[]>([]) // 右上角审批状态按钮组合
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
   applyNo: '', // 申请编号
@@ -60,40 +54,17 @@
   offset: 1,
   limit: 20,
 })
-// 审批状态字典
-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 list = ref<IlistType[]>([])
-const { proxy } = getCurrentInstance() as any
-// 总数
-const total = ref(20)
+const approvalStatusMap = ref({}) as any// 审批状态字典{1：草稿箱}
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
+const list = ref<IlistType[]>([])// 表格数据
+const total = ref(20)// 页码总数
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '申请编号', value: 'applyNo', align: 'center' },
+  { text: '申请编号', value: 'applyNo', align: 'center', width: '180' },
   { text: '申请名称', value: 'applyName', align: 'center' },
   { text: '申请部门', value: 'applyUnitName', align: 'center' },
   { text: '申请人', value: 'applyPersonName', align: 'center' },
-  { text: '领用时间', value: 'time', align: 'center' },
+  { text: '领用时间', value: 'time', align: 'center', width: '160' },
   { text: '申请说明', value: 'applyDesc', align: 'center' },
   { text: '审批状态', value: 'approvalStatus', align: 'center' },
 ])
@@ -102,6 +73,33 @@
 // 筛选时间段数据
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {1：草稿箱}
+  res.data.forEach((item: any) => {
+    approvalStatusMap.value[`${item.value}`] = item.name
+  })
+
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+}
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -116,7 +114,7 @@
     list.value = response.data.rows.map((item: IlistType) => {
       return {
         ...item,
-        approvalStatus: approvalStatusMap[item.approvalStatus],
+        approvalStatus: approvalStatusMap.value[item.approvalStatus],
       }
     })
     total.value = parseInt(response.data.total)
@@ -317,9 +315,11 @@
     })
   }
 }
+
 // 按钮切换
 const changeCurrentButton = (val: string) => {
   active.value = val
+  activeTitle.value = menu.value.find(item => item.id === val)!.name
   window.sessionStorage.setItem('buttonBoxActive', val)
   clearList()
 }
@@ -362,20 +362,24 @@
   })
 }
 
-onMounted(() => {
-  if (window.sessionStorage.getItem('buttonBoxActive')) {
+onMounted(async () => {
+  await getDict() // 获取字典-审批状态
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
     active.value = window.sessionStorage.getItem('buttonBoxActive')!
   }
   else {
-    active.value = '0' // 全部
+    active.value = menu.value.find(item => item.name === '全部')!.id // 全部
+    activeTitle.value === '全部'
   }
   nextTick(() => {
     fetchData(true) // 获取表格数据
-    // 获取使用部门
     fetchDeptTreeList() // 获取使用部门
     fetchUserList() // 获取人员列表
   })
 })
+onUnmounted(() => {
+  window.sessionStorage.setItem('buttonBoxActive', '') // 清除
+})
 </script>
 
 <template>
@@ -446,7 +450,12 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="220" fixed="right">
+          <el-table-column
+            label="操作"
+            align="center"
+            :width="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 70 : 200"
+            fixed="right"
+          >
             <template #default="{ row }">
               <el-button
                 size="small"
@@ -457,37 +466,37 @@
                 查看
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (active === '0' || active === '2')"
+                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (activeTitle === '全部' || activeTitle === '待审批')"
                 size="small"
                 link
                 type="primary"
-                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 3"
                 @click="handleEdit(row, '同意')"
               >
                 同意
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (active === '0' || active === '2')"
+                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (activeTitle === '全部' || activeTitle === '待审批')"
                 size="small"
                 link
                 type="primary"
-                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 3"
                 @click="handleEdit(row, '驳回')"
               >
                 驳回
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (active === '0' || active === '2')"
+                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (activeTitle === '全部' || activeTitle === '待审批')"
                 size="small"
                 link
                 type="danger"
-                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 1 || row.decisionItem === 2"
                 @click="handleEdit(row, '拒绝')"
               >
                 拒绝
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
                 size="small"
                 link
                 type="primary"
@@ -496,7 +505,7 @@
                 编辑
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
                 size="small"
                 link
                 type="primary"
@@ -506,7 +515,7 @@
               </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (active === '0' || active === '3')"
+                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (activeTitle === '全部' || activeTitle === '审批中')"
                 size="small"
                 link
                 type="info"
@@ -517,7 +526,7 @@
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (active !== '4' && active !== '5')"
+                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (activeTitle !== '已通过' && activeTitle !== '未通过')"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/receive/receive.ts b/src/views/device/receive/receive.ts
index ce3b533..d4ac6a6 100644
--- a/src/views/device/receive/receive.ts
+++ b/src/views/device/receive/receive.ts
@@ -83,3 +83,11 @@
   validDate: string // 有效日期
 }
 
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
+
diff --git a/src/views/device/receive/solve/solveList.vue b/src/views/device/receive/solve/solveList.vue
index b541f35..cb4dba8 100644
--- a/src/views/device/receive/solve/solveList.vue
+++ b/src/views/device/receive/solve/solveList.vue
@@ -5,7 +5,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { useRouter } from 'vue-router'
 import ButtonBox from '@/components/buttonBox/buttonBox.vue'
-import type { IMenu, IlistQuery, IsolveListType } from '@/views/device/receive/receive'
+import type { IlistQuery, IsolveListType, dictType } from '@/views/device/receive/receive'
 import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -21,6 +21,8 @@
   getReceiveApplyList,
   updateProcessResult,
 } from '@/api/device/receive'
+import { getDictByCode } from '@/api/system/dict'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
 
 const useDeptList = ref<deptType[]>([]) // 部门列表
 const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
@@ -28,22 +30,9 @@
 const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
 const loadingTable = ref(false) // 表格loading
 const active = ref('') // 选中的按钮
-
-// 审批状态字典
-const approvalStatusMap: { [key: string]: string } = {
-  1: '草稿箱',
-  2: '待审批',
-  3: '审批中',
-  4: '已通过',
-  5: '未通过',
-  6: '已取消',
-  7: '非草稿',
-  8: '未通过-驳回',
-}
-const menu = ref<IMenu[]>([
-  { name: '未领用', id: '4' },
-  { name: '已领用', id: '5' },
-])
+const approvalStatusMap = ref({}) as any// 审批状态字典{1：草稿箱}
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
+const menu = ref<IMenu[]>([]) // 右上角按钮
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
   applyNo: '', // 申请编号
@@ -72,17 +61,44 @@
 const total = ref(20)
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '申请编号', value: 'applyNo', align: 'center' },
+  { text: '申请编号', value: 'applyNo', align: 'center', width: '180' },
   { text: '申请名称', value: 'applyName', align: 'center' },
   { text: '申请部门', value: 'applyUnitName', align: 'center' },
   { text: '申请人', value: 'applyPersonName', align: 'center' },
-  { text: '领用时间', value: 'time', align: 'center' },
+  { text: '领用时间', value: 'time', align: 'center', width: '160' },
   { text: '申请说明', value: 'applyDesc', align: 'center' },
   { text: '审批状态', value: 'approvalStatus', align: 'center' },
 ])
 // 选中的内容
 const checkoutList = ref<string[]>([])
 
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {1：草稿箱}
+  res.data.forEach((item: any) => {
+    approvalStatusMap.value[`${item.value}`] = item.name
+  })
+
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+
+  // 设备申请处理结果
+  const equipmentApplyProcessResultRes = await getDictByCode('equipmentApplyProcessResult')
+  // 制作右上角的菜单
+  equipmentApplyProcessResultRes.data.forEach((item: dictType) => {
+    if (item.name === '待领用' || item.name === '已领用') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+}
+
 // 重置
 const clearList = () => {
   listQuery.value = {
@@ -118,7 +134,7 @@
     list.value = response.data.rows.map((item: IsolveListType) => {
       return {
         ...item,
-        approvalStatus: approvalStatusMap[item.approvalStatus],
+        approvalStatus: approvalStatusMap.value[item.approvalStatus],
       }
     })
     total.value = parseInt(response.data.total)
@@ -288,12 +304,13 @@
   }
 }
 
-onMounted(() => {
-  if (window.sessionStorage.getItem('solveButtonBoxActive')) {
+onMounted(async () => {
+  await getDict()
+  if (window.sessionStorage.getItem('solveButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('solveButtonBoxActive') !== '') {
     active.value = window.sessionStorage.getItem('solveButtonBoxActive')!
   }
   else {
-    active.value = '4' // 未领用
+    active.value = menu.value.find(item => item.name === '待领用')!.id // 未领用
   }
   nextTick(() => {
     // 获取表格数据
@@ -380,12 +397,12 @@
         </template>
         <template #columns>
           <el-table-column label="操作" align="center" width="130" fixed="right">
-            <template #default="scope">
+            <template #default="{ row }">
               <el-button
                 size="small"
                 type="primary"
                 link
-                @click="handleEdit(scope.row, '查看')"
+                @click="handleEdit(row, '查看')"
               >
                 查看
               </el-button>
@@ -394,26 +411,26 @@
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(scope.row, '领用')"
+                @click="handleEdit(row, '领用')"
               >
                 领用
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="active === '4'"
+                v-if="row.approvalStatus === '已通过'"
                 size="small"
                 link
                 type="danger"
-                @click="handleEdit(scope.row, '删除')"
+                @click="handleEdit(row, '删除')"
               >
                 删除
               </el-button>
               <el-button
-                v-if="active === '5'"
+                v-if="row.approvalStatus === '未通过'"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(scope.row, '退领')"
+                @click="handleEdit(row, '退领')"
               >
                 退领
               </el-button>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 0d33dfb..3c64594 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -50,6 +50,7 @@
   applyPerson: '', // 申请人
   time: '', // 借用时间
   applyDesc: '', // 申请说明
+  applyType: '', // 申请类型
   applyName: '', // 申请名称
   createUser: userInfo.$state.id,
   createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
@@ -227,6 +228,36 @@
 const close = () => {
   $router.go(-1)
 }
+
+// 保存
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      if (borrowList.value.length) {
+        // 整理数据
+        delete ruleForm2.value.equipmentInfoList // 去除显示的列表
+        ruleForm2.value.applyType = '2'
+        const params = {
+          ...ruleForm2.value,
+          equipmentList: borrowList.value.map(item => ({
+            id: ruleForm2.value.id,
+            equipmentId: item.id,
+          })),
+          // applyType: $route.query.applyType,
+        }
+        editApply(params).then((res) => {
+          if (res.code === 200) {
+            // 成功
+            ElMessage.success('操作成功')
+            $router.go(-1)
+          }
+        })
+      }
+    }
+  })
+}
+
 // 提交
 const submitForm = async (formEl1: FormInstance | undefined, formEl2: FormInstance | undefined) => {
   if (isDevice.value) {
@@ -252,7 +283,7 @@
                 id: ruleForm2.value.id,
                 equipmentId: item.id,
               })),
-              applyType: '1',
+              applyType: $route.query.applyType || '1',
             }
             // title.value === '新建'
 
@@ -604,10 +635,13 @@
     <approve-action ref="approveRef" />
     <detail-page :title="`${name}-${title}`">
       <template #btns>
-        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
+        <el-button v-if="title !== '详情' && name.search('借用') === -1" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
           提交
         </el-button>
-        <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
+        <el-button v-if="title !== '详情' && name.search('借用') !== -1" type="primary" @click="saveForm(ruleFormRef2)">
+          保存
+        </el-button>
+        <!-- <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
           同意
         </el-button>
         <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'reject' })">
@@ -615,20 +649,20 @@
         </el-button>
         <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'refuse' })">
           拒绝
-        </el-button>
+        </el-button> -->
         <el-button v-if="title === '详情' && isPrint" type="primary">
           打印
         </el-button>
         <!-- <el-button v-if="title === '详情' && isCancel" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
           提交
         </el-button> -->
-        <el-button v-if="title === '详情' && isCancel" type="primary" @click="editForm">
+        <!-- <el-button v-if="$route.query?.approvalStatus !== '草稿箱' && isCancel" type="primary" @click="editForm">
+          编辑
+        </el-button> -->
+        <el-button v-if="(title === '详情' && $route.query?.approvalStatusName === '草稿箱' && isCancel)" type="primary" @click="editForm">
           编辑
         </el-button>
-        <el-button v-if="(title === '详情' && $route.query?.approvalStatus === '1') || (title === '详情' && $route.query?.approvalStatusName === '草稿箱')" type="primary" @click="editForm">
-          编辑
-        </el-button>
-        <el-button v-if="(title === '详情' && isCancel) || (title === '详情' && $route.query?.approvalStatus === '1') || (title === '详情' && $route.query?.approvalStatusName === '草稿箱')" type="primary" @click="deleteForm">
+        <el-button v-if="isCancel" type="primary" @click="deleteForm">
           删除
         </el-button>
         <el-button type="info" @click="resetForm()">

diff --git "a/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js" "b/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
index 4c9b127..633c7a9 100644
--- "a/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
+++ "b/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
@@ -11,6 +11,7 @@
       },
       "directorMaxLevel": 4,//审批主管最大层级
       "flowPermission": [],//发起人
+      "decisionItem": 1, //1同意驳回拒绝、2同意驳回、3拒绝
       "nodeConfig": {
           "nodeName": "发起人",//节点名称
           "type": 0,// 0 发起人 1审批 2抄送 3条件 4路由
diff --git a/src/api/business/environmentRecord/environmentRecord.ts b/src/api/business/environmentRecord/environmentRecord.ts
deleted file mode 100644
index 1a575eb..0000000
--- a/src/api/business/environmentRecord/environmentRecord.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import request from '../../index'
-
-// 环境记录单列表查询-分页
-export function getenvironmentRecordList(data: { offset: number; limit: number }) {
-  return request({
-    url: `/business/environmentRecord/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 环境记录单删除
-export function getenvironmentRecordDelete(data: object) {
-  return request({
-    url: '/business/environmentRecord/delete',
-    method: 'post',
-    data,
-  })
-}
-
-// 新增环境记录单
-export function getenvironmentRecordAdd(data: object) {
-  return request({
-    url: '/business/environmentRecord/add',
-    method: 'post',
-    data,
-  })
-}
-
-// 环境监测记录单-详情
-export function getenvironmentRecordDetail(data: object) {
-  return request({
-    url: '/business/environmentRecord/detail',
-    method: 'post',
-    data,
-  })
-}
-
-// 环境监测记录单-编辑
-export function getenvironmentRecordUpdate(data: object) {
-  return request({
-    url: '/business/environmentRecord/update',
-    method: 'post',
-    data,
-  })
-}
diff --git a/src/api/business/lab/environmentRecord.ts b/src/api/business/lab/environmentRecord.ts
new file mode 100644
index 0000000..f76a9ce
--- /dev/null
+++ b/src/api/business/lab/environmentRecord.ts
@@ -0,0 +1,58 @@
+import request from '../../index'
+import type { IEnvironmentalDetail, IListQuery } from '@/views/business/lab/environmental/environmentalList_interface'
+const prefix = '/business/environmentRecord'
+
+// 环境记录单列表查询-分页
+export function getEnvironmentRecordList(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 环境记录单删除
+export function getEnvironmentRecordDelete(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新增环境记录单
+export function getEnvironmentRecordAdd(data: IEnvironmentalDetail) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 环境监测记录单-详情
+export function getEnvironmentRecordDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 环境监测记录单-编辑
+export function getEnvironmentRecordUpdate(data: IEnvironmentalDetail) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportEnvironmentRecord(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/export`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index 47a713e..94a4246 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -17,6 +17,16 @@
     data,
   })
 }
+
+// 设备借用取消审批
+export function cancelApproval(data: { processInstanceId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
+
 // 设备借用申请详情
 export function detailApply(data: object) {
   return request({
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 9887075..8fa5759 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -1,15 +1,16 @@
-<script lang="ts" setup name="PlanAdd">
+<!-- 环境记录单详情 -->
+<script lang="ts" setup name="EnvironmentalList">
 import type { FormInstance } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
-import type { selectionListItem } from './environmentalList_interface'
+import type { IEnvironmentalDetail, IRoomNumber } from './environmentalList_interface'
 import { getTypeSelect } from '@/api/system/price'
-import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
+import { getEnvironmentRecordAdd, getEnvironmentRecordDetail, getEnvironmentRecordUpdate } from '@/api/business/lab/environmentRecord'
 import useUserStore from '@/store/modules/user'
+const { proxy } = getCurrentInstance() as any
 const infoId = ref('') // id
-const { name, id } = useUserStore()
+const { name, id } = useUserStore() // 用户名、id
 const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
@@ -23,7 +24,8 @@
     infoId.value = $route.params.id as string
   }
 }
-const formInline = ref({
+// 表单
+const formInline = ref<IEnvironmentalDetail>({
   environmentCode: '', // 环境记录单编号
   roomNumber: '', // 房间编号
   recorder: name || '', // 用户名
@@ -38,10 +40,10 @@
   id: '', // 主键
   updateTime: '', // 更新时间
 })
-const ruleFormRef = ref<FormInstance>()
+const ruleFormRef = ref<FormInstance>() // 表单ref
 
 // 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([])
+const selectionList = ref<IRoomNumber[]>([])
 // 获取下拉框数据
 getTypeSelect('roomNumber').then((res) => {
   selectionList.value = res.data
@@ -73,39 +75,38 @@
   $router.back()
 }
 
+// 获取详情信息
 if (infoId.value && infoId.value !== '') {
-  getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
+  getEnvironmentRecordDetail({ id: infoId.value }).then((res) => {
     if (res.code === 200) {
       formInline.value = res.data
     }
   })
 }
 // 点击保存
-const preserve = async (formEl: FormInstance | undefined) => {
-  if (!formEl) {
-    return
-  }
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      ElMessageBox.confirm('确认提交吗？', '提示', {
+      ElMessageBox.confirm('确认保存吗？', '提示', {
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         type: 'warning',
       }).then(() => {
-        // 是否是新增
+        // 新增
         if (pageType.value === 'add') {
-          getenvironmentRecordAdd(formInline.value).then((res) => {
+          getEnvironmentRecordAdd(formInline.value).then((res) => {
             if (res.code === 200) {
-              ElMessage.success('提交成功!')
+              ElMessage.success('保存成功!')
               close()
             }
           })
         }
-        // 是否是编辑
-        else {
-          getenvironmentRecordUpdate(formInline.value).then((res) => {
+        // 编辑
+        else if (pageType.value === 'edit') {
+          getEnvironmentRecordUpdate(formInline.value).then((res) => {
             if (res.code === 200) {
-              ElMessage.success('提交成功!')
+              ElMessage.success('保存成功!')
               close()
             }
           })
@@ -117,8 +118,8 @@
 // 打印
 const printObj = ref({
   id: 'form', // 需要打印元素的id
-  popTitle: '环境记录单模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '环境记录单详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>环境记录单详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
@@ -130,15 +131,17 @@
     <detail-page :title="`环境记录单-${textMap[pageType]}`">
       <template #btns>
         <el-button
-          v-if="pageType !== 'detail'"
+          v-if="proxy.hasPerm('/lab/environmentalList/add') && pageType !== 'detail'"
           type="primary"
-          @click="
-            preserve(ruleFormRef)
-          "
+          @click="saveForm(ruleFormRef)"
         >
-          提交
+          保存
         </el-button>
-        <el-button v-else v-print="printObj" type="primary">
+        <el-button
+          v-if="proxy.hasPerm('/lab/environmentalList/add') && pageType === 'detail'"
+          v-print="printObj"
+          type="primary"
+        >
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -199,7 +202,7 @@
                 type="datetime"
                 :placeholder="pageType === 'detail' ? '无' : '请选择记录时间'"
                 format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                value-format="YYYY-MM-DD HH:mm:ss"
                 clearable
                 :disabled="pageType === 'detail'"
               />
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 90110ee..63a0849 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -1,13 +1,18 @@
+<!-- 环境记录单列表 -->
 <script lang="ts" setup name="EnvironmentalList">
-import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
+import type { IEnvironmental, IListQuery, IRoomNumber } from './environmentalList_interface'
 import { getTypeSelect } from '@/api/system/price'
-import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
+import { exportEnvironmentRecord, getEnvironmentRecordDelete, getEnvironmentRecordList } from '@/api/business/lab/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-const listQuery = ref({
+import { exportFile } from '@/utils/exportUtils'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+
+// 查询参数
+const listQuery = ref<IListQuery>({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
   beginTime: '', // 记录开始时间
@@ -15,17 +20,14 @@
   offset: 1, // 当前页
   limit: 20, // 多少条
 })
-const checkoutList = ref<string[]>([])
-const list = ref<IEnvironmental[]>([])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+const list = ref<IEnvironmental[]>([]) // 表格参数
 const total = ref(0)
-const show = ref(true)
+const loadingTable = ref(false) // 表格loading
+const trainTime = ref('') // 记录时间数组
+const roomNumberList = ref<IRoomNumber[]>([]) // 房间号
 
-const loadingTable = ref(false)
-// 初始化路由
-// 培训时间数组
-const trainTime = ref('')
-
-const $router = useRouter()
+// 查询列表
 const fetchData = (isNowPage: boolean) => {
   listQuery.value.beginTime = trainTime.value[0] || ''
   listQuery.value.endTime = trainTime.value[1] || ''
@@ -34,57 +36,23 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getenvironmentRecordList(listQuery.value).then((res) => {
+  getEnvironmentRecordList(listQuery.value).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
   })
   loadingTable.value = false
 }
 fetchData(true)
-const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref<TableColumn[]>([
-  {
-    text: '记录单号',
-    value: 'environmentCode',
-    align: 'center',
-  },
-  {
-    text: '房间号',
-    value: 'roomNumber',
-    align: 'center',
-  },
-  {
-    text: '记录人',
-    value: 'recorder',
-    align: 'center',
-  },
-  {
-    text: '记录时间',
-    value: 'recordTime',
-    width: '180',
-    align: 'center',
-  },
-  {
-    text: '温度(℃)',
-    value: 'temperature',
-    align: 'center',
-  },
-  {
-    text: '湿度(%)',
-    value: 'humidity',
-    align: 'center',
-  },
-  {
-    text: '输出电压(V)',
-    value: 'outputVoltage',
-    align: 'center',
-  },
-  {
-    text: '零地电压(V)',
-    value: 'zeroGroundVoltage',
-    align: 'center',
-  },
+  { text: '记录单号', value: 'environmentCode', align: 'center', width: '160' },
+  { text: '房间号', value: 'roomNumber', align: 'center' },
+  { text: '记录人', value: 'recorder', align: 'center' },
+  { text: '记录时间', value: 'recordTime', width: '180', align: 'center' },
+  { text: '温度(℃)', value: 'temperature', align: 'center' },
+  { text: '湿度(%)', value: 'humidity', align: 'center' },
+  { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
+  { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
 ])
 // 搜索
 const searchList = () => {
@@ -104,38 +72,44 @@
   trainTime.value = ''
   fetchData(true)
 }
+
 // 导出
-const exportExcelBtn = () => {
+const exportAll = () => {
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  // if (list.value.length > 0) {
-  // }
-  // else {
-  //   ElMessage.warning('无数据可导出数据')
-  // }
+  if (list.value.length > 0) {
+    const params = {
+      environmentCode: '', // 记录单编号
+      roomNumber: '', // 房间号
+      beginTime: '', // 记录开始时间
+      endTime: '', // 记录结束时间
+      offset: 1, // 当前页
+      limit: 20, // 多少条
+      ids: checkoutList.value,
+    }
+    exportEnvironmentRecord(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '环境记录单列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
   loading.close()
 }
-// 关闭编辑
-const close = () => {
-  show.value = true
-  fetchData(true)
-}
-// 点击编辑id和删除row类型
-interface rowReturn {
-  id: string
-  environmentCode: string
-}
+
 // 点击编辑/详情
-const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+const handleEdit = (row: IEnvironmental, pageType: 'edit' | 'detail') => {
   $router.push(`/lab/environmentalList/${pageType}/${row.id}`)
 }
+
 // 点击删除
-const handleDelete = (index: string, row: rowReturn) => {
+const handleDelete = (row: IEnvironmental) => {
   ElMessageBox.confirm(
-    `确认删除${row.environmentCode}吗？`,
+    `确认删除单号${row.environmentCode}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -144,12 +118,9 @@
     },
   )
     .then(() => {
-      getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
+      getEnvironmentRecordDelete({ id: row.id }).then((res) => {
         if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
+          ElMessage.success('已删除')
           fetchData(true)
         }
       })
@@ -160,14 +131,12 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
+
 // 点击新增
 const add = () => {
   $router.push('/lab/environmentalList/add')
 }
-// 点击导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -178,12 +147,12 @@
   }
   fetchData(true)
 }
-// 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([])
+
 // 获取下拉框数据
 getTypeSelect('roomNumber').then((res) => {
-  selectionList.value = res.data
+  roomNumberList.value = res.data
 })
+
 // 打印列表
 function printList() {
   // 打印列
@@ -225,7 +194,7 @@
           size="default"
         >
           <el-option
-            v-for="item in selectionList"
+            v-for="item in roomNumberList"
             :key="item.value"
             :label="item.name"
             :value="item.value"
@@ -238,7 +207,7 @@
           type="datetimerange"
           range-separator="到"
           format="YYYY-MM-DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="记录时间开始时间"
           end-placeholder="记录时间结束时间"
         />
@@ -247,21 +216,21 @@
     <table-container>
       <template #btns-right>
         <icon-button
-          v-if="proxy.hasPerm('/measure/train/plan/add')"
+          v-if="proxy.hasPerm('/lab/environmentalList/add')"
           icon="icon-add"
           title="新建"
           type="primary"
           @click="add"
         />
         <icon-button
-          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          v-if="proxy.hasPerm('/lab/environmentalList/export')"
           icon="icon-export"
           title="导出"
           type="primary"
           @click="exportAll"
         />
         <icon-button
-          v-if="proxy.hasPerm('/measure/train/plan/print')"
+          v-if="proxy.hasPerm('/lab/environmentalList/print')"
           icon="icon-print"
           title="打印"
           type="primary"
@@ -278,8 +247,15 @@
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="160">
+          <el-table-column label="操作" align="center" width="130" fixed="right">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/measure/train/plan/edit')"
@@ -303,7 +279,7 @@
                 size="small"
                 link
                 type="danger"
-                @click="handleDelete(row.$index, row)"
+                @click="handleDelete(row)"
               >
                 删除
               </el-button>
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 955af81..e1dc2a2 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -1,3 +1,13 @@
+// 查询参数
+export interface IListQuery {
+  environmentCode: string // 记录单编号
+  roomNumber: string // 房间号
+  beginTime: string // 记录开始时间
+  endTime: string // 记录结束时间
+  offset: number // 当前页
+  limit: number // 多少条
+}
+
 // 环境记录单list类型
 export interface IEnvironmental {
   environmentCode: string // 记录单编号
@@ -12,9 +22,27 @@
   createUser: string // 创建人
   id: string // 主键id
 }
+
 // 房间号模拟下拉框数据类型
-export interface selectionListItem {
+export interface IRoomNumber {
   value: string // 值
   name: string // lable
   id: string
 }
+
+// 环境记录单详情表单
+export interface IEnvironmentalDetail {
+  environmentCode: string // 环境记录单编号
+  roomNumber: string // 房间编号
+  recorder: string // 用户名
+  temperature: string // 温度
+  humidity: string // 湿度
+  outputVoltage: string // 输出电压
+  zeroGroundVoltage: string // 零地电压
+  remark: string // 备注
+  recordTime: string // 记录时间
+  createUser: string // 记录人id
+  createTime: string // 创建时间
+  id: string // 主键
+  updateTime: string // 更新时间
+}
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 98c4257..5105a76 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -294,6 +294,13 @@
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
           <el-table-column label="操作" align="center" width="130" fixed="right">
             <template #default="{ row }">
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index ae53f44..a0aee10 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -371,6 +371,13 @@
           :data="list" :total="total" :columns="columns" :query="listQuery"
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
         >
+          <template #preColumns>
+            <el-table-column label="序号" width="55" align="center">
+              <template #default="scope">
+                {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
           <template #columns>
             <el-table-column label="操作" align="center" :width="operationWidth">
               <template #default="{ row }">
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 21350ac..2ebcf8b 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -458,6 +458,13 @@
         :data="list" :total="total" :columns="currentMenu === '待收入' ? columnsTaking : columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
           <el-table-column
             label="操作" align="center" fixed="right" :width="currentMenu === '待收入' ? 270 : (currentMenu === '已收入' || currentMenu === '待归还') ? 210
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index ed11f7e..026fd77 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -87,7 +87,7 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
   { text: '外观', value: 'appearance', align: 'center' },
-  { text: '检定要求', value: 'measureRequire', align: 'center' },
+  { text: '检定要求', value: 'specialRequire', align: 'center' },
 ])
 
 // 签章查询数据
@@ -238,6 +238,10 @@
 // ------------------------样品-----------------------------
 // 点击批量增加
 const multiAdd = () => {
+  if (!dataForm.value.customerNo) {
+    ElMessage.warning('请先选择委托方')
+    return
+  }
   sampleVisible.value = true
 }
 // 修改委托方对话框显隐
@@ -318,6 +322,11 @@
   getAutographList()
 }
 
+// 表格双击行
+const rowDblclick = (row: ISampleList) => {
+  row.isEdit = true
+}
+
 onMounted(async () => {
   if (pageType.value === 'add') {
     dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
@@ -592,7 +601,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="24" class="marg">
+            <!-- <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="样品外观:">
                   <el-input
@@ -605,7 +614,7 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
+            </el-row> -->
             <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="依据文件:">
@@ -642,6 +651,7 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
+          @row-dblclick="rowDblclick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -653,7 +663,17 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          />
+          >
+            <template v-if="item.value === 'specialRequire' && (pageType === 'add' || pageType === 'edit')" #default="scope">
+              <el-input
+                v-if="scope.row.isEdit"
+                v-model="scope.row.specialRequire"
+                placeholder="请输入检定要求"
+                class="input"
+              />
+              <span v-else>{{ scope.row.specialRequire }}</span>
+            </template>
+          </el-table-column>
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index 3decec5..2d1c1ff 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -60,6 +60,7 @@
   appendixDescn: string // 附件说明
   appearance: string // 外观
   measureRequire: string // 检定要求
+  isEdit?: boolean // 是否可编辑
 }
 
 // 字典
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index b090632..7622ab0 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -326,6 +326,13 @@
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
           <el-table-column label="操作" align="center" fixed="right" width="170">
             <template #default="{ row }">
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 6dc9628..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" apply-type="1" />
+    <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 b863728..c17034c 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -2,7 +2,10 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { borrowDeviceType } from '../borrow-interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import { deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
+import { cancelApproval, deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
+import {
+  submitReceiveApplyList,
+} from '@/api/device/receive'
 import type{ searchType } from '@/views/device/borrow/borrow-interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
@@ -36,7 +39,7 @@
   ids: [] as string[],
   limit: 20,
   offset: 1,
-  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+  formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
 }) // 查询参数
 watch(() => time.value, (newVal) => {
   if (newVal) {
@@ -252,6 +255,7 @@
     query: {
       title: '新建',
       name: '设备借用申请',
+      applyType: props.applyType,
     },
   })
 }
@@ -277,7 +281,6 @@
   exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '设备借用申请')
     loading.close()
-    // searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -333,7 +336,17 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
+  ).then((res) => {
+    cancelApproval({ processInstanceId: row.processId, comments: '' }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        getList()
+      }
+    })
+  })
 }
 // 提交
 const submit = (row: any) => {
@@ -346,11 +359,11 @@
       type: 'warning',
     },
   ).then((res) => {
-    submitApply({ id: row.id }).then((res) => {
+    submitReceiveApplyList({ formId: SCHEDULE.DEVICE_BORROW_APPROVAL, id: row.id }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
-          message: '提交',
+          message: '提交成功',
         })
         getList()
       }
@@ -468,7 +481,7 @@
                     拒绝
                   </el-button>
                 </temaplte>
-                <el-button size="small" type="primary" link @click="cancel(row)">
+                <el-button size="small" type="primary" link :disabled="!['2', '3'].includes(row.approvalStatus)" @click="cancel(row)">
                   取消
                 </el-button>
                 <el-button size="small" type="danger" link @click="remove(row)">
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index 293be0c..b277758 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -23,9 +23,9 @@
   applyNo: '', // 申请编号
   applyPerson: '', // 	申请人
   applyUnit: '', // 	申请单位
-  approvalStatus: '0', // 	审批状态
+  approvalStatus: '4', // 	审批状态
   createUser: '', // 	创建人
-  processResult: '', // 	处置结果
+  processResult: '0', // 	处置结果
   applyType: props.applyType,
   time: '', // 	申请日期
   ids: [] as string[],
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 612b3b4..71c8ed8 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -4,8 +4,7 @@
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { useRouter } from 'vue-router'
-import type { IMenu } from '../receive'
-import type { IlistQuery, IlistType } from '@/views/device/receive/receive'
+import type { IlistQuery, IlistType, dictType } from '@/views/device/receive/receive'
 import ButtonBox from '@/components/buttonBox/buttonBox.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { exportFile } from '@/utils/exportUtils'
@@ -24,24 +23,19 @@
 import type { userType } from '@/views/system/user/user-interface'
 import type { deptType } from '@/views/device/standingBook/standingBook-interface'
 import { getUserList } from '@/api/system/user'
+import { getDictByCode } from '@/api/system/dict'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
 
+const { proxy } = getCurrentInstance() as any
 const loadingTable = ref(false) // 表格loading
 const active = ref('') // 选中的按钮
+const activeTitle = ref('') // active对应的审批状态名字
 const approvalDialog = ref() // 审批对话框显隐
 const useDeptList = ref<deptType[]>([]) // 部门列表
 const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
 const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
 const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
-
-const menu = ref<IMenu[]>([
-  { name: '全部', id: '0' },
-  { name: '草稿箱', id: '1' },
-  { name: '待审批', id: '2' },
-  { name: '审批中', id: '3' },
-  { name: '已通过', id: '4' },
-  { name: '未通过', id: '5' },
-  { name: '已取消', id: '6' },
-])
+const menu = ref<IMenu[]>([]) // 右上角审批状态按钮组合
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
   applyNo: '', // 申请编号
@@ -60,40 +54,17 @@
   offset: 1,
   limit: 20,
 })
-// 审批状态字典
-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 list = ref<IlistType[]>([])
-const { proxy } = getCurrentInstance() as any
-// 总数
-const total = ref(20)
+const approvalStatusMap = ref({}) as any// 审批状态字典{1：草稿箱}
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
+const list = ref<IlistType[]>([])// 表格数据
+const total = ref(20)// 页码总数
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '申请编号', value: 'applyNo', align: 'center' },
+  { text: '申请编号', value: 'applyNo', align: 'center', width: '180' },
   { text: '申请名称', value: 'applyName', align: 'center' },
   { text: '申请部门', value: 'applyUnitName', align: 'center' },
   { text: '申请人', value: 'applyPersonName', align: 'center' },
-  { text: '领用时间', value: 'time', align: 'center' },
+  { text: '领用时间', value: 'time', align: 'center', width: '160' },
   { text: '申请说明', value: 'applyDesc', align: 'center' },
   { text: '审批状态', value: 'approvalStatus', align: 'center' },
 ])
@@ -102,6 +73,33 @@
 // 筛选时间段数据
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {1：草稿箱}
+  res.data.forEach((item: any) => {
+    approvalStatusMap.value[`${item.value}`] = item.name
+  })
+
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+}
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -116,7 +114,7 @@
     list.value = response.data.rows.map((item: IlistType) => {
       return {
         ...item,
-        approvalStatus: approvalStatusMap[item.approvalStatus],
+        approvalStatus: approvalStatusMap.value[item.approvalStatus],
       }
     })
     total.value = parseInt(response.data.total)
@@ -317,9 +315,11 @@
     })
   }
 }
+
 // 按钮切换
 const changeCurrentButton = (val: string) => {
   active.value = val
+  activeTitle.value = menu.value.find(item => item.id === val)!.name
   window.sessionStorage.setItem('buttonBoxActive', val)
   clearList()
 }
@@ -362,20 +362,24 @@
   })
 }
 
-onMounted(() => {
-  if (window.sessionStorage.getItem('buttonBoxActive')) {
+onMounted(async () => {
+  await getDict() // 获取字典-审批状态
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
     active.value = window.sessionStorage.getItem('buttonBoxActive')!
   }
   else {
-    active.value = '0' // 全部
+    active.value = menu.value.find(item => item.name === '全部')!.id // 全部
+    activeTitle.value === '全部'
   }
   nextTick(() => {
     fetchData(true) // 获取表格数据
-    // 获取使用部门
     fetchDeptTreeList() // 获取使用部门
     fetchUserList() // 获取人员列表
   })
 })
+onUnmounted(() => {
+  window.sessionStorage.setItem('buttonBoxActive', '') // 清除
+})
 </script>
 
 <template>
@@ -446,7 +450,12 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="220" fixed="right">
+          <el-table-column
+            label="操作"
+            align="center"
+            :width="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 70 : 200"
+            fixed="right"
+          >
             <template #default="{ row }">
               <el-button
                 size="small"
@@ -457,37 +466,37 @@
                 查看
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (active === '0' || active === '2')"
+                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (activeTitle === '全部' || activeTitle === '待审批')"
                 size="small"
                 link
                 type="primary"
-                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 3"
                 @click="handleEdit(row, '同意')"
               >
                 同意
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (active === '0' || active === '2')"
+                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (activeTitle === '全部' || activeTitle === '待审批')"
                 size="small"
                 link
                 type="primary"
-                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 3"
                 @click="handleEdit(row, '驳回')"
               >
                 驳回
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (active === '0' || active === '2')"
+                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (activeTitle === '全部' || activeTitle === '待审批')"
                 size="small"
                 link
                 type="danger"
-                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 1 || row.decisionItem === 2"
                 @click="handleEdit(row, '拒绝')"
               >
                 拒绝
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
                 size="small"
                 link
                 type="primary"
@@ -496,7 +505,7 @@
                 编辑
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
                 size="small"
                 link
                 type="primary"
@@ -506,7 +515,7 @@
               </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (active === '0' || active === '3')"
+                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (activeTitle === '全部' || activeTitle === '审批中')"
                 size="small"
                 link
                 type="info"
@@ -517,7 +526,7 @@
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (active !== '4' && active !== '5')"
+                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (activeTitle !== '已通过' && activeTitle !== '未通过')"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/receive/receive.ts b/src/views/device/receive/receive.ts
index ce3b533..d4ac6a6 100644
--- a/src/views/device/receive/receive.ts
+++ b/src/views/device/receive/receive.ts
@@ -83,3 +83,11 @@
   validDate: string // 有效日期
 }
 
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
+
diff --git a/src/views/device/receive/solve/solveList.vue b/src/views/device/receive/solve/solveList.vue
index b541f35..cb4dba8 100644
--- a/src/views/device/receive/solve/solveList.vue
+++ b/src/views/device/receive/solve/solveList.vue
@@ -5,7 +5,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { useRouter } from 'vue-router'
 import ButtonBox from '@/components/buttonBox/buttonBox.vue'
-import type { IMenu, IlistQuery, IsolveListType } from '@/views/device/receive/receive'
+import type { IlistQuery, IsolveListType, dictType } from '@/views/device/receive/receive'
 import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -21,6 +21,8 @@
   getReceiveApplyList,
   updateProcessResult,
 } from '@/api/device/receive'
+import { getDictByCode } from '@/api/system/dict'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
 
 const useDeptList = ref<deptType[]>([]) // 部门列表
 const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
@@ -28,22 +30,9 @@
 const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
 const loadingTable = ref(false) // 表格loading
 const active = ref('') // 选中的按钮
-
-// 审批状态字典
-const approvalStatusMap: { [key: string]: string } = {
-  1: '草稿箱',
-  2: '待审批',
-  3: '审批中',
-  4: '已通过',
-  5: '未通过',
-  6: '已取消',
-  7: '非草稿',
-  8: '未通过-驳回',
-}
-const menu = ref<IMenu[]>([
-  { name: '未领用', id: '4' },
-  { name: '已领用', id: '5' },
-])
+const approvalStatusMap = ref({}) as any// 审批状态字典{1：草稿箱}
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
+const menu = ref<IMenu[]>([]) // 右上角按钮
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
   applyNo: '', // 申请编号
@@ -72,17 +61,44 @@
 const total = ref(20)
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '申请编号', value: 'applyNo', align: 'center' },
+  { text: '申请编号', value: 'applyNo', align: 'center', width: '180' },
   { text: '申请名称', value: 'applyName', align: 'center' },
   { text: '申请部门', value: 'applyUnitName', align: 'center' },
   { text: '申请人', value: 'applyPersonName', align: 'center' },
-  { text: '领用时间', value: 'time', align: 'center' },
+  { text: '领用时间', value: 'time', align: 'center', width: '160' },
   { text: '申请说明', value: 'applyDesc', align: 'center' },
   { text: '审批状态', value: 'approvalStatus', align: 'center' },
 ])
 // 选中的内容
 const checkoutList = ref<string[]>([])
 
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {1：草稿箱}
+  res.data.forEach((item: any) => {
+    approvalStatusMap.value[`${item.value}`] = item.name
+  })
+
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+
+  // 设备申请处理结果
+  const equipmentApplyProcessResultRes = await getDictByCode('equipmentApplyProcessResult')
+  // 制作右上角的菜单
+  equipmentApplyProcessResultRes.data.forEach((item: dictType) => {
+    if (item.name === '待领用' || item.name === '已领用') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+}
+
 // 重置
 const clearList = () => {
   listQuery.value = {
@@ -118,7 +134,7 @@
     list.value = response.data.rows.map((item: IsolveListType) => {
       return {
         ...item,
-        approvalStatus: approvalStatusMap[item.approvalStatus],
+        approvalStatus: approvalStatusMap.value[item.approvalStatus],
       }
     })
     total.value = parseInt(response.data.total)
@@ -288,12 +304,13 @@
   }
 }
 
-onMounted(() => {
-  if (window.sessionStorage.getItem('solveButtonBoxActive')) {
+onMounted(async () => {
+  await getDict()
+  if (window.sessionStorage.getItem('solveButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('solveButtonBoxActive') !== '') {
     active.value = window.sessionStorage.getItem('solveButtonBoxActive')!
   }
   else {
-    active.value = '4' // 未领用
+    active.value = menu.value.find(item => item.name === '待领用')!.id // 未领用
   }
   nextTick(() => {
     // 获取表格数据
@@ -380,12 +397,12 @@
         </template>
         <template #columns>
           <el-table-column label="操作" align="center" width="130" fixed="right">
-            <template #default="scope">
+            <template #default="{ row }">
               <el-button
                 size="small"
                 type="primary"
                 link
-                @click="handleEdit(scope.row, '查看')"
+                @click="handleEdit(row, '查看')"
               >
                 查看
               </el-button>
@@ -394,26 +411,26 @@
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(scope.row, '领用')"
+                @click="handleEdit(row, '领用')"
               >
                 领用
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="active === '4'"
+                v-if="row.approvalStatus === '已通过'"
                 size="small"
                 link
                 type="danger"
-                @click="handleEdit(scope.row, '删除')"
+                @click="handleEdit(row, '删除')"
               >
                 删除
               </el-button>
               <el-button
-                v-if="active === '5'"
+                v-if="row.approvalStatus === '未通过'"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(scope.row, '退领')"
+                @click="handleEdit(row, '退领')"
               >
                 退领
               </el-button>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 0d33dfb..3c64594 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -50,6 +50,7 @@
   applyPerson: '', // 申请人
   time: '', // 借用时间
   applyDesc: '', // 申请说明
+  applyType: '', // 申请类型
   applyName: '', // 申请名称
   createUser: userInfo.$state.id,
   createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
@@ -227,6 +228,36 @@
 const close = () => {
   $router.go(-1)
 }
+
+// 保存
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      if (borrowList.value.length) {
+        // 整理数据
+        delete ruleForm2.value.equipmentInfoList // 去除显示的列表
+        ruleForm2.value.applyType = '2'
+        const params = {
+          ...ruleForm2.value,
+          equipmentList: borrowList.value.map(item => ({
+            id: ruleForm2.value.id,
+            equipmentId: item.id,
+          })),
+          // applyType: $route.query.applyType,
+        }
+        editApply(params).then((res) => {
+          if (res.code === 200) {
+            // 成功
+            ElMessage.success('操作成功')
+            $router.go(-1)
+          }
+        })
+      }
+    }
+  })
+}
+
 // 提交
 const submitForm = async (formEl1: FormInstance | undefined, formEl2: FormInstance | undefined) => {
   if (isDevice.value) {
@@ -252,7 +283,7 @@
                 id: ruleForm2.value.id,
                 equipmentId: item.id,
               })),
-              applyType: '1',
+              applyType: $route.query.applyType || '1',
             }
             // title.value === '新建'
 
@@ -604,10 +635,13 @@
     <approve-action ref="approveRef" />
     <detail-page :title="`${name}-${title}`">
       <template #btns>
-        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
+        <el-button v-if="title !== '详情' && name.search('借用') === -1" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
           提交
         </el-button>
-        <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
+        <el-button v-if="title !== '详情' && name.search('借用') !== -1" type="primary" @click="saveForm(ruleFormRef2)">
+          保存
+        </el-button>
+        <!-- <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
           同意
         </el-button>
         <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'reject' })">
@@ -615,20 +649,20 @@
         </el-button>
         <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'refuse' })">
           拒绝
-        </el-button>
+        </el-button> -->
         <el-button v-if="title === '详情' && isPrint" type="primary">
           打印
         </el-button>
         <!-- <el-button v-if="title === '详情' && isCancel" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
           提交
         </el-button> -->
-        <el-button v-if="title === '详情' && isCancel" type="primary" @click="editForm">
+        <!-- <el-button v-if="$route.query?.approvalStatus !== '草稿箱' && isCancel" type="primary" @click="editForm">
+          编辑
+        </el-button> -->
+        <el-button v-if="(title === '详情' && $route.query?.approvalStatusName === '草稿箱' && isCancel)" type="primary" @click="editForm">
           编辑
         </el-button>
-        <el-button v-if="(title === '详情' && $route.query?.approvalStatus === '1') || (title === '详情' && $route.query?.approvalStatusName === '草稿箱')" type="primary" @click="editForm">
-          编辑
-        </el-button>
-        <el-button v-if="(title === '详情' && isCancel) || (title === '详情' && $route.query?.approvalStatus === '1') || (title === '详情' && $route.query?.approvalStatusName === '草稿箱')" type="primary" @click="deleteForm">
+        <el-button v-if="isCancel" type="primary" @click="deleteForm">
           删除
         </el-button>
         <el-button type="info" @click="resetForm()">
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 5a4aad6..58f6068 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -533,10 +533,7 @@
                   查看
                 </el-button>
                 <el-button
-                  v-if="
-                    props.type !== '0' && props.type !== '3'
-                      && props.type !== '6' && props.type !== '2'
-                  "
+                  v-if="!['0', '2', '3', '4', '5'].includes(props.type)"
                   size="small"
                   type="primary"
                   link
@@ -545,10 +542,7 @@
                   编辑
                 </el-button>
                 <el-button
-                  v-if="
-                    props.type !== '0' && props.type !== '3'
-                      && props.type !== '6' && props.type !== '2'
-                  "
+                  v-if="!['0', '2', '3', '4', '5'].includes(props.type)"
                   size="small"
                   type="primary"
                   link
@@ -557,7 +551,7 @@
                   提交
                 </el-button>
                 <el-button
-                  v-if="(props.type === '0' || props.type === '2')"
+                  v-if="['0', '2', '3'].includes(props.type)"
                   size="small"
                   type="primary"
                   link
@@ -570,7 +564,7 @@
                   同意
                 </el-button>
                 <el-button
-                  v-if="(props.type === '0' || props.type === '2')"
+                  v-if="['0', '2', '3'].includes(props.type)"
                   size="small"
                   type="primary"
                   link
@@ -583,7 +577,7 @@
                   驳回
                 </el-button>
                 <el-button
-                  v-if="(props.type === '0' || props.type === '2')"
+                  v-if="['0', '2', '3'].includes(props.type)"
                   size="small"
                   type="danger"
                   link
@@ -596,10 +590,7 @@
                   拒绝
                 </el-button>
                 <el-button
-                  v-if="
-                    props.type !== '1'
-                      && props.type !== '2'
-                  "
+                  v-if="!['1', '2', '4', '5', '6'].includes(props.type)"
                   size="small"
                   type="text"
                   link

diff --git "a/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js" "b/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
index 4c9b127..633c7a9 100644
--- "a/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
+++ "b/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
@@ -11,6 +11,7 @@
       },
       "directorMaxLevel": 4,//审批主管最大层级
       "flowPermission": [],//发起人
+      "decisionItem": 1, //1同意驳回拒绝、2同意驳回、3拒绝
       "nodeConfig": {
           "nodeName": "发起人",//节点名称
           "type": 0,// 0 发起人 1审批 2抄送 3条件 4路由
diff --git a/src/api/business/environmentRecord/environmentRecord.ts b/src/api/business/environmentRecord/environmentRecord.ts
deleted file mode 100644
index 1a575eb..0000000
--- a/src/api/business/environmentRecord/environmentRecord.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import request from '../../index'
-
-// 环境记录单列表查询-分页
-export function getenvironmentRecordList(data: { offset: number; limit: number }) {
-  return request({
-    url: `/business/environmentRecord/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 环境记录单删除
-export function getenvironmentRecordDelete(data: object) {
-  return request({
-    url: '/business/environmentRecord/delete',
-    method: 'post',
-    data,
-  })
-}
-
-// 新增环境记录单
-export function getenvironmentRecordAdd(data: object) {
-  return request({
-    url: '/business/environmentRecord/add',
-    method: 'post',
-    data,
-  })
-}
-
-// 环境监测记录单-详情
-export function getenvironmentRecordDetail(data: object) {
-  return request({
-    url: '/business/environmentRecord/detail',
-    method: 'post',
-    data,
-  })
-}
-
-// 环境监测记录单-编辑
-export function getenvironmentRecordUpdate(data: object) {
-  return request({
-    url: '/business/environmentRecord/update',
-    method: 'post',
-    data,
-  })
-}
diff --git a/src/api/business/lab/environmentRecord.ts b/src/api/business/lab/environmentRecord.ts
new file mode 100644
index 0000000..f76a9ce
--- /dev/null
+++ b/src/api/business/lab/environmentRecord.ts
@@ -0,0 +1,58 @@
+import request from '../../index'
+import type { IEnvironmentalDetail, IListQuery } from '@/views/business/lab/environmental/environmentalList_interface'
+const prefix = '/business/environmentRecord'
+
+// 环境记录单列表查询-分页
+export function getEnvironmentRecordList(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 环境记录单删除
+export function getEnvironmentRecordDelete(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新增环境记录单
+export function getEnvironmentRecordAdd(data: IEnvironmentalDetail) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 环境监测记录单-详情
+export function getEnvironmentRecordDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 环境监测记录单-编辑
+export function getEnvironmentRecordUpdate(data: IEnvironmentalDetail) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportEnvironmentRecord(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/export`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index 47a713e..94a4246 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -17,6 +17,16 @@
     data,
   })
 }
+
+// 设备借用取消审批
+export function cancelApproval(data: { processInstanceId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
+
 // 设备借用申请详情
 export function detailApply(data: object) {
   return request({
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 9887075..8fa5759 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -1,15 +1,16 @@
-<script lang="ts" setup name="PlanAdd">
+<!-- 环境记录单详情 -->
+<script lang="ts" setup name="EnvironmentalList">
 import type { FormInstance } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
-import type { selectionListItem } from './environmentalList_interface'
+import type { IEnvironmentalDetail, IRoomNumber } from './environmentalList_interface'
 import { getTypeSelect } from '@/api/system/price'
-import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
+import { getEnvironmentRecordAdd, getEnvironmentRecordDetail, getEnvironmentRecordUpdate } from '@/api/business/lab/environmentRecord'
 import useUserStore from '@/store/modules/user'
+const { proxy } = getCurrentInstance() as any
 const infoId = ref('') // id
-const { name, id } = useUserStore()
+const { name, id } = useUserStore() // 用户名、id
 const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
@@ -23,7 +24,8 @@
     infoId.value = $route.params.id as string
   }
 }
-const formInline = ref({
+// 表单
+const formInline = ref<IEnvironmentalDetail>({
   environmentCode: '', // 环境记录单编号
   roomNumber: '', // 房间编号
   recorder: name || '', // 用户名
@@ -38,10 +40,10 @@
   id: '', // 主键
   updateTime: '', // 更新时间
 })
-const ruleFormRef = ref<FormInstance>()
+const ruleFormRef = ref<FormInstance>() // 表单ref
 
 // 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([])
+const selectionList = ref<IRoomNumber[]>([])
 // 获取下拉框数据
 getTypeSelect('roomNumber').then((res) => {
   selectionList.value = res.data
@@ -73,39 +75,38 @@
   $router.back()
 }
 
+// 获取详情信息
 if (infoId.value && infoId.value !== '') {
-  getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
+  getEnvironmentRecordDetail({ id: infoId.value }).then((res) => {
     if (res.code === 200) {
       formInline.value = res.data
     }
   })
 }
 // 点击保存
-const preserve = async (formEl: FormInstance | undefined) => {
-  if (!formEl) {
-    return
-  }
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      ElMessageBox.confirm('确认提交吗？', '提示', {
+      ElMessageBox.confirm('确认保存吗？', '提示', {
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         type: 'warning',
       }).then(() => {
-        // 是否是新增
+        // 新增
         if (pageType.value === 'add') {
-          getenvironmentRecordAdd(formInline.value).then((res) => {
+          getEnvironmentRecordAdd(formInline.value).then((res) => {
             if (res.code === 200) {
-              ElMessage.success('提交成功!')
+              ElMessage.success('保存成功!')
               close()
             }
           })
         }
-        // 是否是编辑
-        else {
-          getenvironmentRecordUpdate(formInline.value).then((res) => {
+        // 编辑
+        else if (pageType.value === 'edit') {
+          getEnvironmentRecordUpdate(formInline.value).then((res) => {
             if (res.code === 200) {
-              ElMessage.success('提交成功!')
+              ElMessage.success('保存成功!')
               close()
             }
           })
@@ -117,8 +118,8 @@
 // 打印
 const printObj = ref({
   id: 'form', // 需要打印元素的id
-  popTitle: '环境记录单模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '环境记录单详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>环境记录单详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
@@ -130,15 +131,17 @@
     <detail-page :title="`环境记录单-${textMap[pageType]}`">
       <template #btns>
         <el-button
-          v-if="pageType !== 'detail'"
+          v-if="proxy.hasPerm('/lab/environmentalList/add') && pageType !== 'detail'"
           type="primary"
-          @click="
-            preserve(ruleFormRef)
-          "
+          @click="saveForm(ruleFormRef)"
         >
-          提交
+          保存
         </el-button>
-        <el-button v-else v-print="printObj" type="primary">
+        <el-button
+          v-if="proxy.hasPerm('/lab/environmentalList/add') && pageType === 'detail'"
+          v-print="printObj"
+          type="primary"
+        >
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -199,7 +202,7 @@
                 type="datetime"
                 :placeholder="pageType === 'detail' ? '无' : '请选择记录时间'"
                 format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                value-format="YYYY-MM-DD HH:mm:ss"
                 clearable
                 :disabled="pageType === 'detail'"
               />
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 90110ee..63a0849 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -1,13 +1,18 @@
+<!-- 环境记录单列表 -->
 <script lang="ts" setup name="EnvironmentalList">
-import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
+import type { IEnvironmental, IListQuery, IRoomNumber } from './environmentalList_interface'
 import { getTypeSelect } from '@/api/system/price'
-import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
+import { exportEnvironmentRecord, getEnvironmentRecordDelete, getEnvironmentRecordList } from '@/api/business/lab/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-const listQuery = ref({
+import { exportFile } from '@/utils/exportUtils'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+
+// 查询参数
+const listQuery = ref<IListQuery>({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
   beginTime: '', // 记录开始时间
@@ -15,17 +20,14 @@
   offset: 1, // 当前页
   limit: 20, // 多少条
 })
-const checkoutList = ref<string[]>([])
-const list = ref<IEnvironmental[]>([])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+const list = ref<IEnvironmental[]>([]) // 表格参数
 const total = ref(0)
-const show = ref(true)
+const loadingTable = ref(false) // 表格loading
+const trainTime = ref('') // 记录时间数组
+const roomNumberList = ref<IRoomNumber[]>([]) // 房间号
 
-const loadingTable = ref(false)
-// 初始化路由
-// 培训时间数组
-const trainTime = ref('')
-
-const $router = useRouter()
+// 查询列表
 const fetchData = (isNowPage: boolean) => {
   listQuery.value.beginTime = trainTime.value[0] || ''
   listQuery.value.endTime = trainTime.value[1] || ''
@@ -34,57 +36,23 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getenvironmentRecordList(listQuery.value).then((res) => {
+  getEnvironmentRecordList(listQuery.value).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
   })
   loadingTable.value = false
 }
 fetchData(true)
-const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref<TableColumn[]>([
-  {
-    text: '记录单号',
-    value: 'environmentCode',
-    align: 'center',
-  },
-  {
-    text: '房间号',
-    value: 'roomNumber',
-    align: 'center',
-  },
-  {
-    text: '记录人',
-    value: 'recorder',
-    align: 'center',
-  },
-  {
-    text: '记录时间',
-    value: 'recordTime',
-    width: '180',
-    align: 'center',
-  },
-  {
-    text: '温度(℃)',
-    value: 'temperature',
-    align: 'center',
-  },
-  {
-    text: '湿度(%)',
-    value: 'humidity',
-    align: 'center',
-  },
-  {
-    text: '输出电压(V)',
-    value: 'outputVoltage',
-    align: 'center',
-  },
-  {
-    text: '零地电压(V)',
-    value: 'zeroGroundVoltage',
-    align: 'center',
-  },
+  { text: '记录单号', value: 'environmentCode', align: 'center', width: '160' },
+  { text: '房间号', value: 'roomNumber', align: 'center' },
+  { text: '记录人', value: 'recorder', align: 'center' },
+  { text: '记录时间', value: 'recordTime', width: '180', align: 'center' },
+  { text: '温度(℃)', value: 'temperature', align: 'center' },
+  { text: '湿度(%)', value: 'humidity', align: 'center' },
+  { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
+  { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
 ])
 // 搜索
 const searchList = () => {
@@ -104,38 +72,44 @@
   trainTime.value = ''
   fetchData(true)
 }
+
 // 导出
-const exportExcelBtn = () => {
+const exportAll = () => {
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  // if (list.value.length > 0) {
-  // }
-  // else {
-  //   ElMessage.warning('无数据可导出数据')
-  // }
+  if (list.value.length > 0) {
+    const params = {
+      environmentCode: '', // 记录单编号
+      roomNumber: '', // 房间号
+      beginTime: '', // 记录开始时间
+      endTime: '', // 记录结束时间
+      offset: 1, // 当前页
+      limit: 20, // 多少条
+      ids: checkoutList.value,
+    }
+    exportEnvironmentRecord(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '环境记录单列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
   loading.close()
 }
-// 关闭编辑
-const close = () => {
-  show.value = true
-  fetchData(true)
-}
-// 点击编辑id和删除row类型
-interface rowReturn {
-  id: string
-  environmentCode: string
-}
+
 // 点击编辑/详情
-const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+const handleEdit = (row: IEnvironmental, pageType: 'edit' | 'detail') => {
   $router.push(`/lab/environmentalList/${pageType}/${row.id}`)
 }
+
 // 点击删除
-const handleDelete = (index: string, row: rowReturn) => {
+const handleDelete = (row: IEnvironmental) => {
   ElMessageBox.confirm(
-    `确认删除${row.environmentCode}吗？`,
+    `确认删除单号${row.environmentCode}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -144,12 +118,9 @@
     },
   )
     .then(() => {
-      getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
+      getEnvironmentRecordDelete({ id: row.id }).then((res) => {
         if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
+          ElMessage.success('已删除')
           fetchData(true)
         }
       })
@@ -160,14 +131,12 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
+
 // 点击新增
 const add = () => {
   $router.push('/lab/environmentalList/add')
 }
-// 点击导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -178,12 +147,12 @@
   }
   fetchData(true)
 }
-// 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([])
+
 // 获取下拉框数据
 getTypeSelect('roomNumber').then((res) => {
-  selectionList.value = res.data
+  roomNumberList.value = res.data
 })
+
 // 打印列表
 function printList() {
   // 打印列
@@ -225,7 +194,7 @@
           size="default"
         >
           <el-option
-            v-for="item in selectionList"
+            v-for="item in roomNumberList"
             :key="item.value"
             :label="item.name"
             :value="item.value"
@@ -238,7 +207,7 @@
           type="datetimerange"
           range-separator="到"
           format="YYYY-MM-DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="记录时间开始时间"
           end-placeholder="记录时间结束时间"
         />
@@ -247,21 +216,21 @@
     <table-container>
       <template #btns-right>
         <icon-button
-          v-if="proxy.hasPerm('/measure/train/plan/add')"
+          v-if="proxy.hasPerm('/lab/environmentalList/add')"
           icon="icon-add"
           title="新建"
           type="primary"
           @click="add"
         />
         <icon-button
-          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          v-if="proxy.hasPerm('/lab/environmentalList/export')"
           icon="icon-export"
           title="导出"
           type="primary"
           @click="exportAll"
         />
         <icon-button
-          v-if="proxy.hasPerm('/measure/train/plan/print')"
+          v-if="proxy.hasPerm('/lab/environmentalList/print')"
           icon="icon-print"
           title="打印"
           type="primary"
@@ -278,8 +247,15 @@
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="160">
+          <el-table-column label="操作" align="center" width="130" fixed="right">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/measure/train/plan/edit')"
@@ -303,7 +279,7 @@
                 size="small"
                 link
                 type="danger"
-                @click="handleDelete(row.$index, row)"
+                @click="handleDelete(row)"
               >
                 删除
               </el-button>
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 955af81..e1dc2a2 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -1,3 +1,13 @@
+// 查询参数
+export interface IListQuery {
+  environmentCode: string // 记录单编号
+  roomNumber: string // 房间号
+  beginTime: string // 记录开始时间
+  endTime: string // 记录结束时间
+  offset: number // 当前页
+  limit: number // 多少条
+}
+
 // 环境记录单list类型
 export interface IEnvironmental {
   environmentCode: string // 记录单编号
@@ -12,9 +22,27 @@
   createUser: string // 创建人
   id: string // 主键id
 }
+
 // 房间号模拟下拉框数据类型
-export interface selectionListItem {
+export interface IRoomNumber {
   value: string // 值
   name: string // lable
   id: string
 }
+
+// 环境记录单详情表单
+export interface IEnvironmentalDetail {
+  environmentCode: string // 环境记录单编号
+  roomNumber: string // 房间编号
+  recorder: string // 用户名
+  temperature: string // 温度
+  humidity: string // 湿度
+  outputVoltage: string // 输出电压
+  zeroGroundVoltage: string // 零地电压
+  remark: string // 备注
+  recordTime: string // 记录时间
+  createUser: string // 记录人id
+  createTime: string // 创建时间
+  id: string // 主键
+  updateTime: string // 更新时间
+}
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 98c4257..5105a76 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -294,6 +294,13 @@
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
           <el-table-column label="操作" align="center" width="130" fixed="right">
             <template #default="{ row }">
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index ae53f44..a0aee10 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -371,6 +371,13 @@
           :data="list" :total="total" :columns="columns" :query="listQuery"
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
         >
+          <template #preColumns>
+            <el-table-column label="序号" width="55" align="center">
+              <template #default="scope">
+                {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
           <template #columns>
             <el-table-column label="操作" align="center" :width="operationWidth">
               <template #default="{ row }">
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 21350ac..2ebcf8b 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -458,6 +458,13 @@
         :data="list" :total="total" :columns="currentMenu === '待收入' ? columnsTaking : columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
           <el-table-column
             label="操作" align="center" fixed="right" :width="currentMenu === '待收入' ? 270 : (currentMenu === '已收入' || currentMenu === '待归还') ? 210
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index ed11f7e..026fd77 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -87,7 +87,7 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
   { text: '外观', value: 'appearance', align: 'center' },
-  { text: '检定要求', value: 'measureRequire', align: 'center' },
+  { text: '检定要求', value: 'specialRequire', align: 'center' },
 ])
 
 // 签章查询数据
@@ -238,6 +238,10 @@
 // ------------------------样品-----------------------------
 // 点击批量增加
 const multiAdd = () => {
+  if (!dataForm.value.customerNo) {
+    ElMessage.warning('请先选择委托方')
+    return
+  }
   sampleVisible.value = true
 }
 // 修改委托方对话框显隐
@@ -318,6 +322,11 @@
   getAutographList()
 }
 
+// 表格双击行
+const rowDblclick = (row: ISampleList) => {
+  row.isEdit = true
+}
+
 onMounted(async () => {
   if (pageType.value === 'add') {
     dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
@@ -592,7 +601,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="24" class="marg">
+            <!-- <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="样品外观:">
                   <el-input
@@ -605,7 +614,7 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
+            </el-row> -->
             <el-row :gutter="24" class="marg">
               <el-col :span="12">
                 <el-form-item label="依据文件:">
@@ -642,6 +651,7 @@
           style="width: 100%;"
           max-height="600"
           @selection-change="handleSelectionChange"
+          @row-dblclick="rowDblclick"
         >
           <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
@@ -653,7 +663,17 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          />
+          >
+            <template v-if="item.value === 'specialRequire' && (pageType === 'add' || pageType === 'edit')" #default="scope">
+              <el-input
+                v-if="scope.row.isEdit"
+                v-model="scope.row.specialRequire"
+                placeholder="请输入检定要求"
+                class="input"
+              />
+              <span v-else>{{ scope.row.specialRequire }}</span>
+            </template>
+          </el-table-column>
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index 3decec5..2d1c1ff 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -60,6 +60,7 @@
   appendixDescn: string // 附件说明
   appearance: string // 外观
   measureRequire: string // 检定要求
+  isEdit?: boolean // 是否可编辑
 }
 
 // 字典
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index b090632..7622ab0 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -326,6 +326,13 @@
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
           <el-table-column label="操作" align="center" fixed="right" width="170">
             <template #default="{ row }">
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 6dc9628..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" apply-type="1" />
+    <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 b863728..c17034c 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -2,7 +2,10 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { borrowDeviceType } from '../borrow-interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import { deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
+import { cancelApproval, deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
+import {
+  submitReceiveApplyList,
+} from '@/api/device/receive'
 import type{ searchType } from '@/views/device/borrow/borrow-interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
@@ -36,7 +39,7 @@
   ids: [] as string[],
   limit: 20,
   offset: 1,
-  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+  formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
 }) // 查询参数
 watch(() => time.value, (newVal) => {
   if (newVal) {
@@ -252,6 +255,7 @@
     query: {
       title: '新建',
       name: '设备借用申请',
+      applyType: props.applyType,
     },
   })
 }
@@ -277,7 +281,6 @@
   exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '设备借用申请')
     loading.close()
-    // searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -333,7 +336,17 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
+  ).then((res) => {
+    cancelApproval({ processInstanceId: row.processId, comments: '' }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        getList()
+      }
+    })
+  })
 }
 // 提交
 const submit = (row: any) => {
@@ -346,11 +359,11 @@
       type: 'warning',
     },
   ).then((res) => {
-    submitApply({ id: row.id }).then((res) => {
+    submitReceiveApplyList({ formId: SCHEDULE.DEVICE_BORROW_APPROVAL, id: row.id }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
-          message: '提交',
+          message: '提交成功',
         })
         getList()
       }
@@ -468,7 +481,7 @@
                     拒绝
                   </el-button>
                 </temaplte>
-                <el-button size="small" type="primary" link @click="cancel(row)">
+                <el-button size="small" type="primary" link :disabled="!['2', '3'].includes(row.approvalStatus)" @click="cancel(row)">
                   取消
                 </el-button>
                 <el-button size="small" type="danger" link @click="remove(row)">
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index 293be0c..b277758 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -23,9 +23,9 @@
   applyNo: '', // 申请编号
   applyPerson: '', // 	申请人
   applyUnit: '', // 	申请单位
-  approvalStatus: '0', // 	审批状态
+  approvalStatus: '4', // 	审批状态
   createUser: '', // 	创建人
-  processResult: '', // 	处置结果
+  processResult: '0', // 	处置结果
   applyType: props.applyType,
   time: '', // 	申请日期
   ids: [] as string[],
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 612b3b4..71c8ed8 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -4,8 +4,7 @@
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { useRouter } from 'vue-router'
-import type { IMenu } from '../receive'
-import type { IlistQuery, IlistType } from '@/views/device/receive/receive'
+import type { IlistQuery, IlistType, dictType } from '@/views/device/receive/receive'
 import ButtonBox from '@/components/buttonBox/buttonBox.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { exportFile } from '@/utils/exportUtils'
@@ -24,24 +23,19 @@
 import type { userType } from '@/views/system/user/user-interface'
 import type { deptType } from '@/views/device/standingBook/standingBook-interface'
 import { getUserList } from '@/api/system/user'
+import { getDictByCode } from '@/api/system/dict'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
 
+const { proxy } = getCurrentInstance() as any
 const loadingTable = ref(false) // 表格loading
 const active = ref('') // 选中的按钮
+const activeTitle = ref('') // active对应的审批状态名字
 const approvalDialog = ref() // 审批对话框显隐
 const useDeptList = ref<deptType[]>([]) // 部门列表
 const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
 const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
 const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
-
-const menu = ref<IMenu[]>([
-  { name: '全部', id: '0' },
-  { name: '草稿箱', id: '1' },
-  { name: '待审批', id: '2' },
-  { name: '审批中', id: '3' },
-  { name: '已通过', id: '4' },
-  { name: '未通过', id: '5' },
-  { name: '已取消', id: '6' },
-])
+const menu = ref<IMenu[]>([]) // 右上角审批状态按钮组合
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
   applyNo: '', // 申请编号
@@ -60,40 +54,17 @@
   offset: 1,
   limit: 20,
 })
-// 审批状态字典
-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 list = ref<IlistType[]>([])
-const { proxy } = getCurrentInstance() as any
-// 总数
-const total = ref(20)
+const approvalStatusMap = ref({}) as any// 审批状态字典{1：草稿箱}
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
+const list = ref<IlistType[]>([])// 表格数据
+const total = ref(20)// 页码总数
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '申请编号', value: 'applyNo', align: 'center' },
+  { text: '申请编号', value: 'applyNo', align: 'center', width: '180' },
   { text: '申请名称', value: 'applyName', align: 'center' },
   { text: '申请部门', value: 'applyUnitName', align: 'center' },
   { text: '申请人', value: 'applyPersonName', align: 'center' },
-  { text: '领用时间', value: 'time', align: 'center' },
+  { text: '领用时间', value: 'time', align: 'center', width: '160' },
   { text: '申请说明', value: 'applyDesc', align: 'center' },
   { text: '审批状态', value: 'approvalStatus', align: 'center' },
 ])
@@ -102,6 +73,33 @@
 // 筛选时间段数据
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {1：草稿箱}
+  res.data.forEach((item: any) => {
+    approvalStatusMap.value[`${item.value}`] = item.name
+  })
+
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+}
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -116,7 +114,7 @@
     list.value = response.data.rows.map((item: IlistType) => {
       return {
         ...item,
-        approvalStatus: approvalStatusMap[item.approvalStatus],
+        approvalStatus: approvalStatusMap.value[item.approvalStatus],
       }
     })
     total.value = parseInt(response.data.total)
@@ -317,9 +315,11 @@
     })
   }
 }
+
 // 按钮切换
 const changeCurrentButton = (val: string) => {
   active.value = val
+  activeTitle.value = menu.value.find(item => item.id === val)!.name
   window.sessionStorage.setItem('buttonBoxActive', val)
   clearList()
 }
@@ -362,20 +362,24 @@
   })
 }
 
-onMounted(() => {
-  if (window.sessionStorage.getItem('buttonBoxActive')) {
+onMounted(async () => {
+  await getDict() // 获取字典-审批状态
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
     active.value = window.sessionStorage.getItem('buttonBoxActive')!
   }
   else {
-    active.value = '0' // 全部
+    active.value = menu.value.find(item => item.name === '全部')!.id // 全部
+    activeTitle.value === '全部'
   }
   nextTick(() => {
     fetchData(true) // 获取表格数据
-    // 获取使用部门
     fetchDeptTreeList() // 获取使用部门
     fetchUserList() // 获取人员列表
   })
 })
+onUnmounted(() => {
+  window.sessionStorage.setItem('buttonBoxActive', '') // 清除
+})
 </script>
 
 <template>
@@ -446,7 +450,12 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="220" fixed="right">
+          <el-table-column
+            label="操作"
+            align="center"
+            :width="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 70 : 200"
+            fixed="right"
+          >
             <template #default="{ row }">
               <el-button
                 size="small"
@@ -457,37 +466,37 @@
                 查看
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (active === '0' || active === '2')"
+                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (activeTitle === '全部' || activeTitle === '待审批')"
                 size="small"
                 link
                 type="primary"
-                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 3"
                 @click="handleEdit(row, '同意')"
               >
                 同意
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (active === '0' || active === '2')"
+                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (activeTitle === '全部' || activeTitle === '待审批')"
                 size="small"
                 link
                 type="primary"
-                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 3"
                 @click="handleEdit(row, '驳回')"
               >
                 驳回
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (active === '0' || active === '2')"
+                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (activeTitle === '全部' || activeTitle === '待审批')"
                 size="small"
                 link
                 type="danger"
-                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 1 || row.decisionItem === 2"
                 @click="handleEdit(row, '拒绝')"
               >
                 拒绝
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
                 size="small"
                 link
                 type="primary"
@@ -496,7 +505,7 @@
                 编辑
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
                 size="small"
                 link
                 type="primary"
@@ -506,7 +515,7 @@
               </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (active === '0' || active === '3')"
+                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (activeTitle === '全部' || activeTitle === '审批中')"
                 size="small"
                 link
                 type="info"
@@ -517,7 +526,7 @@
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (active !== '4' && active !== '5')"
+                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (activeTitle !== '已通过' && activeTitle !== '未通过')"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/receive/receive.ts b/src/views/device/receive/receive.ts
index ce3b533..d4ac6a6 100644
--- a/src/views/device/receive/receive.ts
+++ b/src/views/device/receive/receive.ts
@@ -83,3 +83,11 @@
   validDate: string // 有效日期
 }
 
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
+
diff --git a/src/views/device/receive/solve/solveList.vue b/src/views/device/receive/solve/solveList.vue
index b541f35..cb4dba8 100644
--- a/src/views/device/receive/solve/solveList.vue
+++ b/src/views/device/receive/solve/solveList.vue
@@ -5,7 +5,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { useRouter } from 'vue-router'
 import ButtonBox from '@/components/buttonBox/buttonBox.vue'
-import type { IMenu, IlistQuery, IsolveListType } from '@/views/device/receive/receive'
+import type { IlistQuery, IsolveListType, dictType } from '@/views/device/receive/receive'
 import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -21,6 +21,8 @@
   getReceiveApplyList,
   updateProcessResult,
 } from '@/api/device/receive'
+import { getDictByCode } from '@/api/system/dict'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
 
 const useDeptList = ref<deptType[]>([]) // 部门列表
 const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
@@ -28,22 +30,9 @@
 const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
 const loadingTable = ref(false) // 表格loading
 const active = ref('') // 选中的按钮
-
-// 审批状态字典
-const approvalStatusMap: { [key: string]: string } = {
-  1: '草稿箱',
-  2: '待审批',
-  3: '审批中',
-  4: '已通过',
-  5: '未通过',
-  6: '已取消',
-  7: '非草稿',
-  8: '未通过-驳回',
-}
-const menu = ref<IMenu[]>([
-  { name: '未领用', id: '4' },
-  { name: '已领用', id: '5' },
-])
+const approvalStatusMap = ref({}) as any// 审批状态字典{1：草稿箱}
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
+const menu = ref<IMenu[]>([]) // 右上角按钮
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
   applyNo: '', // 申请编号
@@ -72,17 +61,44 @@
 const total = ref(20)
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '申请编号', value: 'applyNo', align: 'center' },
+  { text: '申请编号', value: 'applyNo', align: 'center', width: '180' },
   { text: '申请名称', value: 'applyName', align: 'center' },
   { text: '申请部门', value: 'applyUnitName', align: 'center' },
   { text: '申请人', value: 'applyPersonName', align: 'center' },
-  { text: '领用时间', value: 'time', align: 'center' },
+  { text: '领用时间', value: 'time', align: 'center', width: '160' },
   { text: '申请说明', value: 'applyDesc', align: 'center' },
   { text: '审批状态', value: 'approvalStatus', align: 'center' },
 ])
 // 选中的内容
 const checkoutList = ref<string[]>([])
 
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {1：草稿箱}
+  res.data.forEach((item: any) => {
+    approvalStatusMap.value[`${item.value}`] = item.name
+  })
+
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+
+  // 设备申请处理结果
+  const equipmentApplyProcessResultRes = await getDictByCode('equipmentApplyProcessResult')
+  // 制作右上角的菜单
+  equipmentApplyProcessResultRes.data.forEach((item: dictType) => {
+    if (item.name === '待领用' || item.name === '已领用') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+}
+
 // 重置
 const clearList = () => {
   listQuery.value = {
@@ -118,7 +134,7 @@
     list.value = response.data.rows.map((item: IsolveListType) => {
       return {
         ...item,
-        approvalStatus: approvalStatusMap[item.approvalStatus],
+        approvalStatus: approvalStatusMap.value[item.approvalStatus],
       }
     })
     total.value = parseInt(response.data.total)
@@ -288,12 +304,13 @@
   }
 }
 
-onMounted(() => {
-  if (window.sessionStorage.getItem('solveButtonBoxActive')) {
+onMounted(async () => {
+  await getDict()
+  if (window.sessionStorage.getItem('solveButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('solveButtonBoxActive') !== '') {
     active.value = window.sessionStorage.getItem('solveButtonBoxActive')!
   }
   else {
-    active.value = '4' // 未领用
+    active.value = menu.value.find(item => item.name === '待领用')!.id // 未领用
   }
   nextTick(() => {
     // 获取表格数据
@@ -380,12 +397,12 @@
         </template>
         <template #columns>
           <el-table-column label="操作" align="center" width="130" fixed="right">
-            <template #default="scope">
+            <template #default="{ row }">
               <el-button
                 size="small"
                 type="primary"
                 link
-                @click="handleEdit(scope.row, '查看')"
+                @click="handleEdit(row, '查看')"
               >
                 查看
               </el-button>
@@ -394,26 +411,26 @@
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(scope.row, '领用')"
+                @click="handleEdit(row, '领用')"
               >
                 领用
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="active === '4'"
+                v-if="row.approvalStatus === '已通过'"
                 size="small"
                 link
                 type="danger"
-                @click="handleEdit(scope.row, '删除')"
+                @click="handleEdit(row, '删除')"
               >
                 删除
               </el-button>
               <el-button
-                v-if="active === '5'"
+                v-if="row.approvalStatus === '未通过'"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(scope.row, '退领')"
+                @click="handleEdit(row, '退领')"
               >
                 退领
               </el-button>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 0d33dfb..3c64594 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -50,6 +50,7 @@
   applyPerson: '', // 申请人
   time: '', // 借用时间
   applyDesc: '', // 申请说明
+  applyType: '', // 申请类型
   applyName: '', // 申请名称
   createUser: userInfo.$state.id,
   createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
@@ -227,6 +228,36 @@
 const close = () => {
   $router.go(-1)
 }
+
+// 保存
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      if (borrowList.value.length) {
+        // 整理数据
+        delete ruleForm2.value.equipmentInfoList // 去除显示的列表
+        ruleForm2.value.applyType = '2'
+        const params = {
+          ...ruleForm2.value,
+          equipmentList: borrowList.value.map(item => ({
+            id: ruleForm2.value.id,
+            equipmentId: item.id,
+          })),
+          // applyType: $route.query.applyType,
+        }
+        editApply(params).then((res) => {
+          if (res.code === 200) {
+            // 成功
+            ElMessage.success('操作成功')
+            $router.go(-1)
+          }
+        })
+      }
+    }
+  })
+}
+
 // 提交
 const submitForm = async (formEl1: FormInstance | undefined, formEl2: FormInstance | undefined) => {
   if (isDevice.value) {
@@ -252,7 +283,7 @@
                 id: ruleForm2.value.id,
                 equipmentId: item.id,
               })),
-              applyType: '1',
+              applyType: $route.query.applyType || '1',
             }
             // title.value === '新建'
 
@@ -604,10 +635,13 @@
     <approve-action ref="approveRef" />
     <detail-page :title="`${name}-${title}`">
       <template #btns>
-        <el-button v-if="title !== '详情'" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
+        <el-button v-if="title !== '详情' && name.search('借用') === -1" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
           提交
         </el-button>
-        <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
+        <el-button v-if="title !== '详情' && name.search('借用') !== -1" type="primary" @click="saveForm(ruleFormRef2)">
+          保存
+        </el-button>
+        <!-- <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'agree' })">
           同意
         </el-button>
         <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'reject' })">
@@ -615,20 +649,20 @@
         </el-button>
         <el-button v-if="title === '详情' && isApproval" type="primary" @click="approval({ id: ruleForm2.id, type: 'refuse' })">
           拒绝
-        </el-button>
+        </el-button> -->
         <el-button v-if="title === '详情' && isPrint" type="primary">
           打印
         </el-button>
         <!-- <el-button v-if="title === '详情' && isCancel" type="primary" @click="submitForm(ruleFormRef1, ruleFormRef2)">
           提交
         </el-button> -->
-        <el-button v-if="title === '详情' && isCancel" type="primary" @click="editForm">
+        <!-- <el-button v-if="$route.query?.approvalStatus !== '草稿箱' && isCancel" type="primary" @click="editForm">
+          编辑
+        </el-button> -->
+        <el-button v-if="(title === '详情' && $route.query?.approvalStatusName === '草稿箱' && isCancel)" type="primary" @click="editForm">
           编辑
         </el-button>
-        <el-button v-if="(title === '详情' && $route.query?.approvalStatus === '1') || (title === '详情' && $route.query?.approvalStatusName === '草稿箱')" type="primary" @click="editForm">
-          编辑
-        </el-button>
-        <el-button v-if="(title === '详情' && isCancel) || (title === '详情' && $route.query?.approvalStatus === '1') || (title === '详情' && $route.query?.approvalStatusName === '草稿箱')" type="primary" @click="deleteForm">
+        <el-button v-if="isCancel" type="primary" @click="deleteForm">
           删除
         </el-button>
         <el-button type="info" @click="resetForm()">
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 5a4aad6..58f6068 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -533,10 +533,7 @@
                   查看
                 </el-button>
                 <el-button
-                  v-if="
-                    props.type !== '0' && props.type !== '3'
-                      && props.type !== '6' && props.type !== '2'
-                  "
+                  v-if="!['0', '2', '3', '4', '5'].includes(props.type)"
                   size="small"
                   type="primary"
                   link
@@ -545,10 +542,7 @@
                   编辑
                 </el-button>
                 <el-button
-                  v-if="
-                    props.type !== '0' && props.type !== '3'
-                      && props.type !== '6' && props.type !== '2'
-                  "
+                  v-if="!['0', '2', '3', '4', '5'].includes(props.type)"
                   size="small"
                   type="primary"
                   link
@@ -557,7 +551,7 @@
                   提交
                 </el-button>
                 <el-button
-                  v-if="(props.type === '0' || props.type === '2')"
+                  v-if="['0', '2', '3'].includes(props.type)"
                   size="small"
                   type="primary"
                   link
@@ -570,7 +564,7 @@
                   同意
                 </el-button>
                 <el-button
-                  v-if="(props.type === '0' || props.type === '2')"
+                  v-if="['0', '2', '3'].includes(props.type)"
                   size="small"
                   type="primary"
                   link
@@ -583,7 +577,7 @@
                   驳回
                 </el-button>
                 <el-button
-                  v-if="(props.type === '0' || props.type === '2')"
+                  v-if="['0', '2', '3'].includes(props.type)"
                   size="small"
                   type="danger"
                   link
@@ -596,10 +590,7 @@
                   拒绝
                 </el-button>
                 <el-button
-                  v-if="
-                    props.type !== '1'
-                      && props.type !== '2'
-                  "
+                  v-if="!['1', '2', '4', '5', '6'].includes(props.type)"
                   size="small"
                   type="text"
                   link
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 912b24f..b1b7476 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -371,7 +371,7 @@
                 <el-button v-if="['1', '6'].includes(approvalStatus)" size="small" type="primary" link @click="edit(row)">
                   编辑
                 </el-button>
-                <el-button v-if="!['0', '2', '4', '5'].includes(approvalStatus)" size="small" type="primary" link @click="submit(row)">
+                <el-button v-if="!['0', '2', '3', '4', '5'].includes(approvalStatus)" size="small" type="primary" link @click="submit(row)">
                   提交
                 </el-button>
                 <template v-if="!['1', '3', '4', '5', '6'].includes(approvalStatus)">